[Perf] improve the performance of code snapshot generation

Author: mistricky

Cargo.lock

@@ -15,7 +15,7 @@ use codesnap::{
 
 use crate::{highlight::HighlightLineRange, range::Range, CLI, STDIN_CODE_DEFAULT_CHAR};
 
-pub fn create_code(cli: &CLI, code: Code) -> anyhow::Result<Content> {
+pub fn create_code(cli: &CLI, code_config: Code) -> anyhow::Result<Content> {
     let code = match cli.execute[..] {
         [] => {
             let range = Range::from_opt_string(cli.range.clone())?;
@@ -27,8 +27,8 @@ pub fn create_code(cli: &CLI, code: Code) -> anyhow::Result<Content> {
                 .start_line_number(parsed_range.0 as u32)
                 .build()?;
 
-            code.file_path = cli.from_file.clone().or(code.file_path);
-            code.language = cli.language.clone().or(code.language);
+            code.file_path = cli.from_file.clone().or(code_config.file_path);
+            code.language = cli.language.clone().or(code_config.language);
             code.highlight_lines = create_highlight_lines(&cli, parsed_range, &code_snippet)?;
 
             Content::Code(code)

cli/src/code.rs

@@ -3,7 +3,7 @@ use std::fs::{self, create_dir_all, read_to_string};
 
 use crate::logger;
 use anyhow::Context;
-use codesnap::config::{CodeSnap, SnapshotConfig};
+use codesnap::config::CodeSnap;
 
 const DEFAULT_CONFIG_CONTENT: &'static str = include_str!("../config.json");
 

cli/src/config.rs

@@ -2,14 +2,11 @@ use std::process;
 
 use ansi_term::{Colour, Style};
 
-fn pretty_print(bg: Colour, level: &str, content: &str) {
+fn pretty_print(color: Colour, level: &str, content: &str) {
     println!(
         "{} {}",
-        Style::new()
-            .on(bg)
-            .fg(Colour::RGB(255, 255, 255))
-            .paint(format!(" {} ", level)),
-        Style::new().fg(bg).paint(format!(" {}", content))
+        Style::new().fg(color).paint(format!("[{}]", level)),
+        content
     );
 }
 

cli/src/logger.rs

@@ -264,7 +264,7 @@ fn output_snapshot(cli: &CLI, snapshot: &SnapshotConfig) -> anyhow::Result<Strin
     Ok(format!("Snapshot saved to {} successful!", cli.output))
 }
 
-fn generate_snapshot_with_config(cli: &CLI, mut codesnap: CodeSnap) -> anyhow::Result<()> {
+fn generate_snapshot_with_config(cli: &CLI, codesnap: CodeSnap) -> anyhow::Result<()> {
     let snapshot = create_snapshot_config(&cli, codesnap)?;
     let snapshot_type = cli.r#type.clone();
 

cli/src/main.rs

@@ -25,4 +25,5 @@ serde_json = "1.0.132"
 ansi_term = "0.12.1"
 strip-ansi-escapes = "0.2.1"
 cansi = "2.2.1"
+lazy_static = "1.5.0"
 

core/Cargo.toml

@@ -5,12 +5,14 @@ use crate::utils::color::parse_hex_to_cosmic_color;
 
 pub struct ANSI {
     raw_text: String,
+    font_family: String,
 }
 
 impl ANSI {
-    pub fn from(text: &str) -> Self {
+    pub fn from(text: &str, font_family: String) -> Self {
         Self {
             raw_text: text.to_string(),
+            font_family,
         }
     }
 
@@ -25,7 +27,7 @@ impl ANSI {
                     category.text,
                     Attrs::new()
                         .color(parse_hex_to_cosmic_color(hex_color))
-                        .family(Family::Name("Caskaydia Cove Nerd Font")),
+                        .family(Family::Name(self.font_family.as_str())),
                 )
             })
             .collect::<Vec<(&str, Attrs)>>()

core/src/ansi.rs

@@ -27,6 +27,10 @@ impl Background {
 }
 
 impl Component for Background {
+    fn name(&self) -> &'static str {
+        "Background"
+    }
+
     fn children(&self) -> &Vec<Box<dyn Component>> {
         &self.children
     }

core/src/components/background.rs

@@ -1,12 +1,10 @@
 use std::path::MAIN_SEPARATOR_STR;
 
-use cosmic_text::{Attrs, Family};
+use cosmic_text::{Attrs, Family, Metrics};
 use regex::Regex;
 
 use crate::{
-    config,
     edges::margin::Margin,
-    utils::text::{create_file_system_by_fonts_folder, FontRenderer},
     utils::{code::calc_wh_with_min_width, color::RgbaColor},
 };
 
@@ -24,6 +22,10 @@ pub struct Breadcrumbs {
 }
 
 impl Component for Breadcrumbs {
+    fn name(&self) -> &'static str {
+        "Breadcrumbs"
+    }
+
     fn children(&self) -> &Vec<Box<dyn Component>> {
         &self.children
     }
@@ -59,7 +61,7 @@ impl Component for Breadcrumbs {
         pixmap: &mut tiny_skia::Pixmap,
         context: &super::interface::component::ComponentContext,
         render_params: &super::interface::component::RenderParams,
-        style: &super::interface::style::ComponentStyle,
+        _style: &super::interface::style::ComponentStyle,
         _parent_style: &ComponentStyle,
     ) -> super::interface::render_error::Result<()> {
         let config = context.take_snapshot_params.code_config.breadcrumbs.clone();
@@ -79,17 +81,10 @@ impl Component for Breadcrumbs {
                 &context.take_snapshot_params.code_config.font_family,
             ));
 
-            FontRenderer::new(
-                12.,
-                LINE_HEIGHT,
-                context.scale_factor,
-                create_file_system_by_fonts_folder(&context.take_snapshot_params.fonts_folder),
-            )
-            .draw_text(
+            context.font_renderer.lock().unwrap().draw_text(
                 render_params.x,
                 render_params.y,
-                style.width,
-                LINE_HEIGHT,
+                Metrics::new(12., LINE_HEIGHT),
                 vec![(&path, attrs)],
                 pixmap,
             );

core/src/components/breadcrumbs.rs

@@ -8,6 +8,10 @@ pub struct CodeBlock {
 }
 
 impl Component for CodeBlock {
+    fn name(&self) -> &'static str {
+        "CodeBlock"
+    }
+
     fn children(&self) -> &Vec<Box<dyn Component>> {
         &self.children
     }