custom charset

Author: Seng-Jik

src/charset.rs

@@ -1,10 +1,11 @@
-use std::{collections::BTreeSet};
+use std::{collections::BTreeSet, path::PathBuf, str::FromStr};
 
 pub struct CharsetRequest {
     pub ascii: bool,
     pub schinese1: bool,
     pub schinese2: bool,
-    pub schinese3: bool
+    pub schinese3: bool,
+    pub additional: Vec<PathBuf>
 }
 
 impl CharsetRequest {
@@ -27,6 +28,16 @@ impl CharsetRequest {
             x.schinese3 = true;
         }
 
+        if arg.is_present("charset") {
+            x.additional =
+                arg
+                    .values_of("charset")
+                    .unwrap()
+                    .map(PathBuf::from_str)
+                    .map(Result::unwrap)
+                    .collect()
+        }
+
         x
     }
 
@@ -35,7 +46,8 @@ impl CharsetRequest {
             ascii: true,
             schinese1: false,
             schinese2: false,
-            schinese3: false
+            schinese3: false,
+            additional: vec![]
         }
     }
 
@@ -58,6 +70,10 @@ impl CharsetRequest {
             s.push_str(include_str!("./charset/common-standard-chinese-characters-table/level-3.txt"));
         }
 
+        for i in &self.additional {
+            s.push_str(&std::fs::read_to_string(i).unwrap());
+        }
+
         s.chars().filter(|x| *x != '\n' && *x != '\r').collect()
     }
 }

src/main.rs

@@ -122,7 +122,14 @@ fn main() {
                 .arg(Arg::with_name("padding-y")
                     .long("padding-y")
                     .default_value("24")
-                    .help("Padding Y on every basic character in pixels")));
+                    .help("Padding Y on every basic character in pixels"))
+                .arg(Arg::with_name("charset")
+                    .long("charset")
+                    .short("c")
+                    .multiple(true)
+                    .required(false)
+                    .takes_value(true)
+                    .help("Additional charset to generate")));
 
     if std::env::args().nth(1) == None {
         app.print_help().unwrap();
@@ -367,22 +374,6 @@ fn font(args: &ArgMatches) {
 
                 threads
             }).collect();
-
-    {
-        let ref mut p = progress_bar.lock().unwrap();
-
-        p.print_info(
-            "Info", 
-            &format!("Stride: {}", stride), 
-            Color::Green, 
-            Style::Bold);
-
-        p.print_info(
-            "Info", 
-            &format!("Search Radius: {}", search_radius), 
-            Color::Green, 
-            Style::Bold);
-    }
 
     for i in charset {
         let mut task = task.lock().unwrap();