Merge pull request #86 from solidiquis/optimization/arena-tree

[Optimization] - Custom visitor, index tree, scoped thread

Cargo.toml

@@ -29,6 +29,7 @@ clap_complete = "4.1.1"
 crossbeam = "0.8.2"
 filesize = "0.2.0"
 ignore = "0.4.2"
+indextree = "4.6.0"
 lscolors = { version = "0.13.0", features = ["ansi_term"] }
 num_cpus = "1.15.0"
 once_cell = "1.17.0"

src/render/context/mod.rs

@@ -141,45 +141,34 @@ impl Context {
             // user arguments.
             let mut args = vec![OsString::from("--")];
 
-            // Used to pick either from config or user args.
-            let mut pick_args_from = |id: &str, matches: &ArgMatches| {
-                if let Ok(Some(raw)) = matches.try_get_raw(id) {
-                    let kebap = id.replace("_", "-");
-
-                    let raw_args = raw
-                        .map(OsStr::to_owned)
-                        .map(|s| vec![OsString::from(format!("--{}", kebap)), s])
-                        .filter(|pair| pair[1] != "false")
-                        .flatten()
-                        .filter(|s| s != "true")
-                        .collect::<Vec<OsString>>();
-
-                    args.extend(raw_args);
-                }
-            };
-
             let mut ids = user_args.ids().map(Id::as_str).collect::<Vec<&str>>();
 
             ids.extend(config_args.ids().map(Id::as_str).collect::<Vec<&str>>());
 
             ids = crate::utils::uniq(ids);
 
             for id in ids {
-                // Don't look at me... my shame..
                 if id == "Context" {
                     continue;
+                } else if id == "dir" {
+                    if let Ok(Some(raw)) = user_args.try_get_raw(id) {
+                        let raw_args = raw.map(OsStr::to_owned).collect::<Vec<OsString>>();
+
+                        args.extend(raw_args);
+                        continue;
+                    }
                 }
 
                 if let Some(user_arg) = user_args.value_source(id) {
                     match user_arg {
                         // prioritize the user arg if user provided a command line argument
-                        ValueSource::CommandLine => pick_args_from(id, &user_args),
+                        ValueSource::CommandLine => Self::pick_args_from(id, &user_args, &mut args),
 
                         // otherwise prioritize argument from the config
-                        _ => pick_args_from(id, &config_args),
+                        _ => Self::pick_args_from(id, &config_args, &mut args),
                     }
                 } else {
-                    pick_args_from(id, &config_args)
+                    Self::pick_args_from(id, &config_args, &mut args)
                 }
             }
 
@@ -241,6 +230,23 @@ impl Context {
 
         builder.build()
     }
+
+    /// Used to pick either from config or user args when constructing [Context].
+    fn pick_args_from(id: &str, matches: &ArgMatches, args: &mut Vec<OsString>) {
+        if let Ok(Some(raw)) = matches.try_get_raw(id) {
+            let kebap = id.replace("_", "-");
+
+            let raw_args = raw
+                .map(OsStr::to_owned)
+                .map(|s| vec![OsString::from(format!("--{}", kebap)), s])
+                .filter(|pair| pair[1] != "false")
+                .flatten()
+                .filter(|s| s != "true")
+                .collect::<Vec<OsString>>();
+
+            args.extend(raw_args);
+        }
+    }
 }
 
 #[derive(Debug)]

src/render/disk_usage.rs

@@ -53,7 +53,7 @@ pub enum SiPrefix {
 }
 
 /// Represents either logical or physical size and handles presentation.
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct FileSize {
     pub bytes: u64,
     #[allow(dead_code)]
@@ -92,9 +92,9 @@ impl FileSize {
     }
 }
 
-impl AddAssign<&Self> for FileSize {
-    fn add_assign(&mut self, rhs: &Self) {
-        self.bytes += rhs.bytes;
+impl AddAssign<u64> for FileSize {
+    fn add_assign(&mut self, rhs: u64) {
+        self.bytes += rhs;
     }
 }