[Feat] add diff supports for CLI (#36)

* [Chore] remove unused code

* [Feat] add `diff` supports for CLI

Author: mistricky

cli/src/code.rs

@@ -11,7 +11,11 @@ use codesnap::{
     utils::clipboard::Clipboard,
 };
 
-use crate::{range::Range, CLI, STDIN_CODE_DEFAULT_CHAR};
+use crate::{
+    highlight::{create_highlight_lines_by_opt_range, create_highlight_lines_by_ranges},
+    range::Range,
+    CLI, STDIN_CODE_DEFAULT_CHAR,
+};
 
 pub fn create_code(cli: &CLI, config_code: Code) -> anyhow::Result<Code> {
     let range = Range::from_opt_string(cli.range.clone())?;
@@ -48,20 +52,17 @@ fn create_highlight_lines(cli: &CLI, code_snippet: &str) -> anyhow::Result<Vec<H
         return Ok(highlight_lines);
     }
 
-    let highlight_lines = match cli.highlight_range {
-        Some(ref highlight_range) => {
-            let Range(start, end) = Range::from_str(&highlight_range)?.parse_range(code_snippet)?;
-
-            vec![HighlightLine::Range(
-                start as u32,
-                end as u32,
-                cli.highlight_range_color.clone(),
-            )]
-        }
-        None => vec![],
-    };
-
-    Ok(highlight_lines)
+    let highlight_lines = create_highlight_lines_by_opt_range(
+        &cli.highlight_range,
+        &cli.highlight_range_color,
+        code_snippet,
+    )?;
+    let delete_highlight_lines =
+        create_highlight_lines_by_ranges(&cli.delete_line, &cli.delete_line_color, code_snippet)?;
+    let new_highlight_lines =
+        create_highlight_lines_by_ranges(&cli.add_line, &cli.add_line_color, code_snippet)?;
+
+    Ok([highlight_lines, delete_highlight_lines, new_highlight_lines].concat())
 }
 
 fn create_breadcrumbs(cli: &CLI) -> Option<Breadcrumbs> {

cli/src/highlight.rs

@@ -0,0 +1,43 @@
+use codesnap::config::HighlightLine;
+
+use crate::range::Range;
+
+pub fn create_highlight_lines_by_range(
+    range: &str,
+    highlight_color: &str,
+    code_snippet: &str,
+) -> anyhow::Result<Vec<HighlightLine>> {
+    let Range(start, end) = Range::from_str(&range)?.parse_range(code_snippet)?;
+
+    Ok(vec![HighlightLine::Range(
+        start as u32,
+        end as u32,
+        highlight_color.to_string(),
+    )])
+}
+
+pub fn create_highlight_lines_by_opt_range(
+    range: &Option<String>,
+    highlight_color: &str,
+    code_snippet: &str,
+) -> anyhow::Result<Vec<HighlightLine>> {
+    match range {
+        Some(ref range) => create_highlight_lines_by_range(range, highlight_color, code_snippet),
+        None => Ok(vec![]),
+    }
+}
+
+pub fn create_highlight_lines_by_ranges(
+    ranges: &Vec<String>,
+    highlight_color: &str,
+    code_snippet: &str,
+) -> anyhow::Result<Vec<HighlightLine>> {
+    ranges.iter().try_fold(vec![], |mut acc, range| {
+        acc.extend(create_highlight_lines_by_range(
+            range,
+            highlight_color,
+            code_snippet,
+        )?);
+        Ok(acc)
+    })
+}

cli/src/main.rs

@@ -1,6 +1,7 @@
 mod code;
 mod config;
 mod egg;
+mod highlight;
 mod logger;
 mod range;
 mod watermark;
@@ -101,12 +102,29 @@ struct CLI {
     #[arg(long, default_value = "#495162")]
     line_number_color: String,
 
+    /// Delete lines will be marked with a red line
+    #[arg(long, short, num_args=0..)]
+    delete_line: Vec<String>,
+
+    /// Delete line color
+    #[arg(long, default_value = "#ff6b6b30")]
+    delete_line_color: String,
+
+    /// New lines will be marked with a green line
+    #[arg(long, short, num_args=0..)]
+    add_line: Vec<String>,
+
+    /// New line color
+    #[arg(long, default_value = "#2ecc7130")]
+    add_line_color: String,
+
     /// Convenient version of `--raw-highlight-lines` option, you can set the highlight range
     /// with a simple syntax, for example, highlight the 3rd to 5th lines:
     /// 3:5
     #[arg(long)]
     highlight_range: Option<String>,
 
+    /// Highlight color for the highlighted code lines
     #[arg(long, default_value = "#ffffff10")]
     highlight_range_color: String,
 

cli/src/range.rs

@@ -1,5 +1,3 @@
-use std::str::Lines;
-
 use anyhow::bail;
 
 const RANGE_SEPARATOR: &'static str = ":";

core/src/main.rs

@@ -0,0 +1,103 @@
+use config::{CodeBuilder, CodeSnap, HighlightLine, WatermarkBuilder};
+
+mod components;
+mod config;
+mod edges;
+mod preset_background;
+mod snapshot;
+mod utils;
+
+const CODE_SNIPPET: &'static str = r##"if not vim.g.neovide then
+	vim.api.nvim_create_autocmd({
+		"VimLeave",
+	}, {
+		pattern = "*",
+		callback = function()
+			os.execute("kitty @ set-spacing padding=10 margin=0")
+		end,
+	})
+
+	vim.api.nvim_create_autocmd({
+		"VimEnter",
+	}, {
+		pattern = "*",
+		callback = function()
+			os.execute("kitty @ set-spacing padding=0 margin=0")
+		end,
+	})
+end"##;
+
+const data: &'static str = r##"
+    {
+        "window": {
+            "macWindowBar": true,
+            "shadow": 20,
+            "margin": {
+                "x": 82,
+                "y": 82
+            }
+        },
+        "code": {
+            "fontFamily": "CaskaydiaCove Nerd Font",
+            "theme": "base16-ocean.light"
+        },
+        "watermark": {
+            "content": "CodeSnap",
+            "fontFamily": "Pacifico",
+            "color": "#ff0000"
+        },
+        "background":  {
+            "start": {
+                "x": 0,
+                "y": 0
+            },
+            "end": {
+                "x": "max",
+                "y": 0
+            },
+            "stops": [
+                {
+                    "position": 0,
+                    "color": "#6bcba5"
+                },
+                {
+                    "position": 1,
+                    "color": "#caf4c2"
+                }
+            ]
+        }
+    }
+"##;
+
+pub fn main() -> anyhow::Result<()> {
+    CodeSnap::default()
+        .code(
+            CodeBuilder::default()
+                .language("haskell")
+                .content(r#"print "Hello, CodeSnap!""#)
+                .highlight_lines(vec![HighlightLine::Range(1, 1, "#ff0000".to_string())])
+                .build()?,
+        )
+        .watermark(WatermarkBuilder::default().content("YYM").build()?)
+        .build()?
+        .create_snapshot()?
+        .raw_data()?
+        .copy()?;
+
+    Ok(())
+
+    // CodeSnap::default()
+    //     .themes_folder("/Users/zhanhaozhao/repositories/codesnap/assets/themes")
+    //     .code(
+    //         CodeBuilder::default()
+    //             .language("rust")
+    //             .theme("candy")
+    //             .content(CODE_SNIPPET)
+    //             .build()?,
+    //     )
+    //     .watermark(WatermarkBuilder::default().content("CodeSnap").build()?)
+    //     .background(BAMBOO.clone())
+    //     .build()?
+    //     .create_snapshot()?
+    //     .copy()
+}