Merge pull request #107 from solidiquis/issue/106

fix issue where not-existent directory as cli arg causes infinite loop
solidiquis · Mar 30, 2023 · 37b5165 · 37b5165
2 parents 9a8fc34 + db16a0d
commit 37b5165
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/render/context/config.rs b/src/render/context/config.rs
@@ -19,10 +19,8 @@ const XDG_CONFIG_HOME: &str = "XDG_CONFIG_HOME";
 /// - `$HOME/.config/erdtree/.erdtreerc`
 /// - `$HOME/.erdtreerc`
 pub fn read_config_to_string<T: AsRef<Path>>(path: Option<T>) -> Option<String> {
-    path
-        .map(fs::read_to_string)
-        .map(Result::ok)
-        .flatten()
+    path.map(fs::read_to_string)
+        .and_then(Result::ok)
         .or_else(config_from_config_path)
         .or_else(config_from_xdg_path)
         .or_else(config_from_home)

diff --git a/src/render/tree/mod.rs b/src/render/tree/mod.rs
@@ -87,6 +87,7 @@ impl Tree {
     /// parallel traversal; post-processing post-processing of all directory entries should
     /// be completely CPU-bound.
     fn traverse(ctx: &Context) -> Result<(Arena<Node>, NodeId)> {
+        let walker = WalkParallel::try_from(ctx)?;
         let (tx, rx) = mpsc::channel();
 
         thread::scope(|s| {
@@ -148,8 +149,6 @@ impl Tree {
 
             let mut visitor_builder = BranchVisitorBuilder::new(ctx, Sender::clone(&tx));
 
-            let walker = WalkParallel::try_from(ctx)?;
-
             walker.visit(&mut visitor_builder);
 
             tx.send(TraversalState::Done).unwrap();

diff --git a/tests/file_count.rs b/tests/file_count.rs
@@ -27,7 +27,14 @@ fn file_count() {
 #[test]
 fn file_count_report() {
     assert_eq!(
-        utils::run_cmd(&["--count", "--report", "--sort", "name", "--no-config", "tests/data"]),
+        utils::run_cmd(&[
+            "--count",
+            "--report",
+            "--sort",
+            "name",
+            "--no-config",
+            "tests/data"
+        ]),
         indoc!(
             "
             d   1241 B   data
@@ -45,4 +52,3 @@ fn file_count_report() {
         ),
     )
 }
-