Merge pull request #13 from unsecretised/optimisations

SUPER FAST RUSTCAST

Author: unsecretised

Cargo.lock

@@ -18,6 +18,7 @@ objc2-application-services = { version = "0.3.2", default-features = false, feat
 ] }
 objc2-foundation = "0.3.2"
 rand = "0.9.2"
+rayon = "1.11.0"
 serde = { version = "1.0.228", features = ["derive"] }
 tokio = { version = "1.48.0", features = ["full"] }
 toml = "0.9.8"

Cargo.toml

@@ -18,6 +18,8 @@ use iced::{
 
 use objc2::rc::Retained;
 use objc2_app_kit::NSRunningApplication;
+use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
+use rayon::slice::ParallelSliceMut;
 
 use std::cmp::min;
 use std::process::Command;
@@ -154,22 +156,22 @@ impl Tile {
             .show_icons
             .unwrap();
 
-        let home = std::env::var("HOME").unwrap();
+        let user_local_path = std::env::var("HOME").unwrap() + "/Applications/";
 
-        let mut apps = get_installed_apps("/Applications/", store_icons);
-        apps.append(&mut get_installed_apps(
+        let paths = vec![
+            "/Applications/",
+            user_local_path.as_str(),
             "/System/Applications/",
-            store_icons,
-        ));
-        apps.append(&mut get_installed_apps(
-            home + "/Applications/",
-            store_icons,
-        ));
-        apps.append(&mut get_installed_apps(
             "/System/Applications/Utilities/",
-            store_icons,
-        ));
-        apps.sort_by_key(|x| x.name.len());
+        ];
+
+        let mut apps: Vec<App> = paths
+            .par_iter()
+            .map(|path| get_installed_apps(path, store_icons))
+            .flatten()
+            .collect();
+
+        apps.par_sort_by_key(|x| x.name.len());
 
         (
             Self {
@@ -413,27 +415,29 @@ impl Tile {
     }
 
     pub fn handle_search_query_changed(&mut self) {
-        let filter_vec = if self.query_lc.starts_with(&self.prev_query_lc) {
+        let filter_vec: &Vec<App> = if self.query_lc.starts_with(&self.prev_query_lc) {
             self.prev_query_lc = self.query_lc.to_owned();
-            &self.results.clone()
+            &self.results
         } else {
             &self.options
         };
 
-        self.results = vec![];
-        self.results.extend(
-            &mut filter_vec
-                .iter()
-                .filter(|x| x.name_lc == self.query_lc)
-                .map(|x| x.to_owned()),
-        );
-
-        self.results.extend(
-            &mut filter_vec
-                .iter()
-                .filter(|x| x.name_lc != self.query_lc && x.name_lc.starts_with(&self.query_lc))
-                .map(|x| x.to_owned()),
-        );
+        let query = self.query_lc.clone();
+
+        let mut exact: Vec<App> = filter_vec
+            .par_iter()
+            .filter(|x| x.name_lc == query)
+            .cloned()
+            .collect();
+
+        let mut prefix: Vec<App> = filter_vec
+            .par_iter()
+            .filter(|x| x.name_lc != query && x.name_lc.starts_with(&query))
+            .cloned()
+            .collect();
+
+        exact.append(&mut prefix);
+        self.results = exact;
     }
 
     pub fn capture_frontmost(&mut self) {

src/app.rs

@@ -9,6 +9,7 @@ use global_hotkey::hotkey::Code;
 use iced::widget::image::Handle;
 use icns::IconFamily;
 use image::RgbaImage;
+use rayon::iter::{IntoParallelIterator, ParallelIterator};
 
 use crate::app::App;
 
@@ -45,18 +46,21 @@ pub(crate) fn handle_from_icns(path: &Path) -> Option<Handle> {
 }
 
 pub(crate) fn get_installed_apps(dir: impl AsRef<Path>, store_icons: bool) -> Vec<App> {
-    fs::read_dir(dir)
+    let entries: Vec<_> = fs::read_dir(dir.as_ref())
         .unwrap_or_else(|x| {
             log_error_and_exit(&x.to_string());
             exit(-1)
         })
         .filter_map(|x| x.ok())
+        .collect();
+
+    entries
+        .into_par_iter()
         .filter_map(|x| {
             let file_type = x.file_type().unwrap_or_else(|e| {
                 log_error(&e.to_string());
                 exit(-1)
             });
-
             if !file_type.is_dir() {
                 return None;
             }
@@ -66,12 +70,12 @@ pub(crate) fn get_installed_apps(dir: impl AsRef<Path>, store_icons: bool) -> Ve
                 log_error(e.to_str().unwrap_or(""));
                 exit(-1)
             });
-
             if !file_name.ends_with(".app") {
                 return None;
             }
 
-            let path_str = x.path().to_str().map(|x| x.to_string()).unwrap_or_else(|| {
+            let path = x.path();
+            let path_str = path.to_str().map(|x| x.to_string()).unwrap_or_else(|| {
                 log_error("Unable to get file_name");
                 exit(-1)
             });
@@ -146,8 +150,8 @@ pub(crate) fn get_installed_apps(dir: impl AsRef<Path>, store_icons: bool) -> Ve
             } else {
                 None
             };
-            let name = file_name.strip_suffix(".app").unwrap().to_string();
 
+            let name = file_name.strip_suffix(".app").unwrap().to_string();
             Some(App {
                 open_command: format!("open {}", path_str),
                 icons,