filter file_search to only search files

Author: Kn4ughty

Cargo.lock

@@ -27,6 +27,7 @@ rustflags = ["-Clink-arg=-fuse-ld=lld", "-Clink-arg=-Wl,--no-rosegment"]
 [dependencies]
 iced = { git = "https://github.com/iced-rs/iced", features = ["advanced", "tokio", "image"], rev= "8bfd099c5929d927a3fdde666d4c645d0bd83cb7" }
 shared-mime-info = { git = "https://github.com/Kn4ughty/shared-mime-info" }
+# shared-mime-info = { path = "../shared-mime-info" } # This is useful for rapid testing
 anyhow = "1.0.99"
 libc = "0.2.175"
 log = "0.4.28"

Cargo.toml

@@ -9,7 +9,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("get_files", |b| {
         b.iter(|| {
             //fo
-            files::FileSearcher::find_files();
+            files::FileSearcher::find_files()
         })
     });
 }

benches/get_files.rs

@@ -182,6 +182,7 @@ impl FileSearcher {
                 )
                 .into_iter()
                 .filter_map(|e| e.ok())
+                .filter(|e| !e.file_type().is_dir())
                 {
                     tx.try_send(Self::get_data(entry)).expect("Can send");
 
@@ -194,7 +195,10 @@ impl FileSearcher {
     }
 
     #[allow(dead_code)] // used in benchmarking
-    pub fn find_files() {
+    pub fn find_files() -> mpsc::Receiver<(PathBuf, Option<image::Handle>)> {
+        let (mut tx, rx) = mpsc::channel(900000);
+        let start = std::time::Instant::now();
+        let mut count = 0;
         for dir in &config::SETTINGS
             .lock()
             .expect("mutex")
@@ -207,9 +211,13 @@ impl FileSearcher {
             .into_iter()
             .filter_map(|e| e.ok())
             {
-                Self::get_data(entry);
+                tx.try_send(Self::get_data(entry)).expect("Can send");
+
+                count += 1;
             }
         }
+        log::info!("Time to **Send** {count} files: {:#?}", start.elapsed());
+        rx
     }
 
     fn run_at_index(&self, i: usize) {