Merge pull request #141 from pacholoamit/perf/improve-disk-scanning-p…

…erformance perf/improve disk scanning performance
pacholoamit · May 20, 2024 · fa088d1 · fa088d1
2 parents 2fa1be5 + 207f8c9
commit fa088d1
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 26 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "0.9.0"
+version = "0.9.1"
 description = "Cross-platform (Linux, WIndows, MacOS) Desktop GUI system monitor"
 authors = ["Pacholo Amit"]
 license = "MIT"

diff --git a/src-tauri/src/app.rs b/src-tauri/src/app.rs
@@ -9,6 +9,7 @@ use tauri::{State, Window};
 use crate::dirstat::{DiskItem, DiskItemMetadata, FileInfo};
 use crate::metrics::Metrics;
 use crate::models::*;
+use rayon::prelude::*;
 
 pub struct AppState(Arc<Mutex<App>>);
 
@@ -132,40 +133,62 @@ pub fn delete_folder(path: String) {
 }
 
 // Result<Vec<FileEntry>, String>
+
 #[tauri::command]
-pub async fn deep_scan(path: String) -> Result<Vec<DiskItem>, String> {
+pub async fn deep_scan(path: String) -> Result<DiskItem, String> {
+    let time = std::time::Instant::now();
     dbg!("Scanning folder:", &path);
     let path_buf = PathBuf::from(&path);
     let file_info = FileInfo::from_path(&path_buf, true).map_err(|e| e.to_string())?;
 
     let analysed = match file_info {
         FileInfo::Directory { volume_id } => {
-            let sub_entries = fs::read_dir(path_buf)
-                .map_err(|e| e.to_string())?
-                .filter_map(Result::ok)
-                .collect::<Vec<_>>();
-
-            let mut sub_items = sub_entries
-                .par_iter()
-                .filter_map(|entry| DiskItem::from_analyze(&entry.path(), true, volume_id).ok())
-                .collect::<Vec<_>>();
-
-            sub_items.sort_unstable_by(|a, b| a.metadata.size.cmp(&b.metadata.size).reverse());
-
-            sub_items
+            DiskItem::from_analyze(&path_buf, true, volume_id).map_err(|e| e.to_string())?
         }
-        FileInfo::File { size, .. } => vec![DiskItem {
-            name: path_buf
-                .file_name()
-                .unwrap_or(OsStr::new("."))
-                .to_string_lossy()
-                .to_string(),
-            metadata: DiskItemMetadata { size },
-            children: None,
-        }],
+        _ => return Err("Not a directory".into()),
     };
 
     dbg!("Scanning complete");
+    dbg!("Time taken:", time.elapsed().as_secs_f32());
 
     Ok(analysed)
 }
+
+// #[tauri::command]  355.9603 seconds
+// pub async fn deep_scan(path: String) -> Result<Vec<DiskItem>, String> {
+//     let time = std::time::Instant::now();
+//     dbg!("Scanning folder:", &path);
+//     let path_buf = PathBuf::from(&path);
+//     let file_info = FileInfo::from_path(&path_buf, true).map_err(|e| e.to_string())?;
+
+//     let analysed = match file_info {
+//         FileInfo::Directory { volume_id } => {
+//             let sub_entries = fs::read_dir(path_buf)
+//                 .map_err(|e| e.to_string())?
+//                 .filter_map(Result::ok)
+//                 .collect::<Vec<_>>();
+
+//             let mut sub_items = sub_entries
+//                 .par_iter() // Use rayon's parallel iterator
+//                 .filter_map(|entry| DiskItem::from_analyze(&entry.path(), true, volume_id).ok())
+//                 .collect::<Vec<_>>();
+
+//             sub_items.sort_unstable_by(|a, b| a.metadata.size.cmp(&b.metadata.size).reverse());
+
+//             sub_items
+//         }
+//         FileInfo::File { size, .. } => vec![DiskItem {
+//             name: path_buf
+//                 .file_name()
+//                 .unwrap_or(OsStr::new("."))
+//                 .to_string_lossy()
+//                 .to_string(),
+//             metadata: DiskItemMetadata { size },
+//             children: None,
+//         }],
+//     };
+
+//     dbg!("Scanning complete");
+//     dbg!("Time taken:", time.elapsed().as_secs_f32());
+//     Ok(analysed)
+// }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "pachtop",
-    "version": "0.9.0"
+    "version": "0.9.1"
   },
   "tauri": {
     "systemTray": {