feat(plugins): strider improvements (#2551)

* fix(plugins): adjust debounce and smart file ignore in strider * style(comment): remove commented code * style(fmt): rustfmt
zellij-org · Jun 17, 2023 · 805fd1d · 805fd1d
1 parent 29a391f
commit 805fd1d
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/default-plugins/strider/Cargo.toml b/default-plugins/strider/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT"
 colored = "2.0.0"
 zellij-tile = { path = "../../zellij-tile" }
 pretty-bytes = "0.2.2"
-walkdir = "2.3.3"
+ignore = "0.4.20"
 fuzzy-matcher = "0.3.7"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/default-plugins/strider/src/search/mod.rs b/default-plugins/strider/src/search/mod.rs
@@ -15,9 +15,9 @@ use zellij_tile::prelude::*;
 
 use fuzzy_matcher::skim::SkimMatcherV2;
 use fuzzy_matcher::FuzzyMatcher;
+use ignore::Walk;
 use search_results::SearchResult;
 use serde::{Deserialize, Serialize};
-use walkdir::WalkDir;
 
 use std::io::{self, BufRead};
 
@@ -64,8 +64,10 @@ impl Search {
         }
     }
     pub fn scan_hd(&mut self) {
-        for entry in WalkDir::new(ROOT).into_iter().filter_map(|e| e.ok()) {
-            self.add_file_entry(entry.path(), entry.metadata().ok());
+        for result in Walk::new(ROOT) {
+            if let Ok(entry) = result {
+                self.add_file_entry(entry.path(), entry.metadata().ok());
+            }
         }
     }
     pub fn search(&mut self, search_term: String) {
@@ -160,11 +162,7 @@ impl Search {
                         match line {
                             Ok(line) => {
                                 self.file_contents.insert(
-                                    (
-                                        // String::from_utf8_lossy(&strip_ansi_escapes::strip(file_path_stripped_prefix.clone()).unwrap()).to_string(),
-                                        file_path_stripped_prefix.clone(),
-                                        index + 1,
-                                    ),
+                                    (file_path_stripped_prefix.clone(), index + 1),
                                     String::from_utf8_lossy(
                                         &strip_ansi_escapes::strip(line).unwrap(),
                                     )

diff --git a/zellij-server/src/plugins/watch_filesystem.rs b/zellij-server/src/plugins/watch_filesystem.rs
@@ -12,7 +12,7 @@ use zellij_utils::notify_debouncer_full::{
 };
 use zellij_utils::{data::Event, errors::prelude::Result};
 
-const DEBOUNCE_DURATION_MS: u64 = 500;
+const DEBOUNCE_DURATION_MS: u64 = 400;
 
 pub fn watch_filesystem(
     senders: ThreadSenders,