Merge pull request #188 from unsecretised/file-searching

Add file searching using ignore

Author: unsecretised

Cargo.lock

@@ -15,6 +15,7 @@ emojis = "0.8.0"
 global-hotkey = "0.7.0"
 iced = { version = "0.14.0", features = ["image", "tokio"] }
 icns = "0.3.1"
+ignore = "0.4.25"
 image = "0.25.9"
 libc = "0.2.180"
 log = "0.4.29"

Cargo.toml

@@ -25,6 +25,7 @@ pub const RUSTCAST_DESC_NAME: &str = "Utility";
 #[derive(Debug, Clone, PartialEq)]
 pub enum Page {
     Main,
+    FileSearch,
     ClipboardHistory,
     EmojiSearch,
 }

src/app.rs

@@ -132,6 +132,14 @@ impl App {
                 display_name: "Clipboard History".to_string(),
                 search_name: "clipboard".to_string(),
             },
+            App {
+                ranking: 0,
+                open_command: AppCommand::Message(Message::SwitchToPage(Page::FileSearch)),
+                desc: RUSTCAST_DESC_NAME.to_string(),
+                icons: icons.clone(),
+                display_name: "Search for a file".to_string(),
+                search_name: "file search".to_string(),
+            },
             App {
                 ranking: 0,
                 open_command: AppCommand::Message(Message::ReloadConfig),

src/app/apps.rs

@@ -137,9 +137,8 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
         };
 
         let results_count = match &tile.page {
-            Page::Main => tile.results.len(),
+            Page::Main | Page::EmojiSearch | Page::FileSearch => tile.results.len(),
             Page::ClipboardHistory => tile.clipboard_content.len(),
-            Page::EmojiSearch => tile.results.len(),
         };
 
         let height = if tile.page == Page::ClipboardHistory {

src/app/tile/elm.rs

@@ -25,6 +25,7 @@ use crate::app::tile::AppIndex;
 use crate::app::{Message, Page, tile::Tile};
 use crate::calculator::Expr;
 use crate::commands::Function;
+use crate::commands::search_for_file;
 use crate::config::Config;
 use crate::unit_conversion;
 use crate::utils::is_valid_url;
@@ -156,7 +157,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 };
 
                 let quantity = match tile.page {
-                    Page::Main => 66.5,
+                    Page::Main | Page::FileSearch => 66.5,
                     Page::ClipboardHistory => 50.,
                     Page::EmojiSearch => 5.,
                 };
@@ -436,7 +437,9 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 };
             }
 
-            if tile.query_lc.is_empty() {
+            if tile.query_lc.is_empty()
+                || (tile.query_lc.chars().count() < 2 && tile.page == Page::FileSearch)
+            {
                 tile.results = Vec::new();
                 return zero_item_resize_task(id);
             };
@@ -505,7 +508,11 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 }
             }
 
-            tile.handle_search_query_changed();
+            if tile.page != Page::FileSearch {
+                tile.handle_search_query_changed();
+            } else {
+                tile.results = search_for_file(&tile.query_lc);
+            }
 
             if !tile.results.is_empty() {
                 tile.results.par_sort_by_key(|x| -x.ranking);

src/app/tile/update.rs

@@ -3,10 +3,19 @@
 use std::{process::Command, thread};
 
 use arboard::Clipboard;
+use ignore::{DirEntry, WalkBuilder};
 use objc2_app_kit::NSWorkspace;
 use objc2_foundation::NSURL;
 
-use crate::{calculator::Expr, clipboard::ClipBoardContentType, config::Config};
+use crate::{
+    app::{
+        ToApp,
+        apps::{App, AppCommand},
+    },
+    calculator::Expr,
+    clipboard::ClipBoardContentType,
+    config::Config,
+};
 
 /// The different functions that rustcast can perform
 #[derive(Debug, Clone, PartialEq)]
@@ -106,3 +115,54 @@ impl Function {
         }
     }
 }
+
+pub fn search(home: &str, name: &str) -> Vec<App> {
+    let mut builder = WalkBuilder::new(home);
+    builder.follow_links(false);
+    builder.threads(10);
+
+    let name_clone = name.to_string();
+    builder
+        .build()
+        .filter_map(move |x| {
+            if let Ok(ent) = x {
+                let name = ent.file_name().to_string_lossy();
+                if name.contains(&name_clone) && !name.starts_with(".") {
+                    Some(ent.to_app())
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        })
+        .take(400)
+        .collect()
+}
+
+pub fn search_for_file(name: &str) -> Vec<App> {
+    let home = std::env::var("HOME").unwrap_or_else(|_| "/".into());
+
+    search(&home, name)
+}
+
+impl ToApp for DirEntry {
+    fn to_app(&self) -> App {
+        let path = "~".to_string()
+            + self
+                .path()
+                .to_str()
+                .unwrap_or("")
+                .to_string()
+                .strip_prefix(&std::env::var("HOME").unwrap_or("".to_string()))
+                .unwrap_or("");
+        App {
+            ranking: 0,
+            open_command: AppCommand::Function(Function::OpenApp(path.clone())),
+            desc: path,
+            icons: None,
+            display_name: self.file_name().to_str().unwrap_or("").to_string(),
+            search_name: "".to_string(),
+        }
+    }
+}