Enhance File Explorer UI: Add directory input box, improve button styles, and implement platform-specific file opening functionality

Author: mbn-code

File-Explorer/src/main.rs

@@ -1,14 +1,30 @@
 use druid::widget::{Button, Flex, Label, List, Scroll, TextBox};
-use druid::widget::prelude::*;
 use druid::{
     AppDelegate, AppLauncher, Command, Data, DelegateCtx, Env, Lens, Selector, Target,
-    Widget, WidgetExt, WindowDesc,
+    Widget, WidgetExt, WindowDesc, commands, FileDialogOptions, theme,
 };
 use regex::Regex;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf}; // added Path
 use std::sync::Arc;
 use std::thread;
 use walkdir::WalkDir;
+use std::fs;
+
+#[cfg(target_os = "macos")]
+fn open_path(path: &str) {
+    std::process::Command::new("open")
+        .arg(path)
+        .spawn()
+        .expect("failed to open file");
+}
+
+#[cfg(target_os = "windows")]
+fn open_path(path: &str) {
+    std::process::Command::new("explorer")
+        .arg(path)
+        .spawn()
+        .expect("failed to open file");
+}
 
 // A selector for updating search results from a background thread.
 // Note: Now the payload is an Arc<Vec<String>>
@@ -25,78 +41,97 @@ struct AppState {
 
 fn build_ui() -> impl Widget<AppState> {
     // Button to let the user choose a directory (using rfd for a native dialog)
-    let choose_dir_btn = Button::new("Choose Directory").on_click(|_ctx, data: &mut AppState, _env| {
-        // Use rfd's file dialog (this will show a native folder chooser on macOS)
-        if let Some(path) = rfd::FileDialog::new().pick_folder() {
-            data.root_path = path.to_string_lossy().to_string();
-            // Clear any previous search results when the directory changes.
-            data.search_results = Arc::new(Vec::new());
-        }
-    });
+    let choose_dir_btn = Button::new("Choose Directory")
+        .padding(8.0)
+        .background(theme::BUTTON_DARK)
+        .on_click(|ctx, _data, _env| {
+            ctx.submit_command(Command::new(commands::SHOW_OPEN_PANEL, FileDialogOptions::default(), Target::Auto));
+        });
 
-    // A label showing the currently selected directory.
-    let dir_label = Label::new(|data: &AppState, _env: &_| {
-        format!("Current Directory: {}", data.root_path)
-    })
-    .with_text_size(14.0);
+    // Replace the static label with an editable text box for directory input.
+    let directory_box = TextBox::new()
+        .with_placeholder("Enter directory path")
+        .with_text_size(14.0)
+        .padding(8.0)
+        .lens(AppState::root_path);
 
     // Text box for entering the search term.
     let search_box = TextBox::new()
         .with_placeholder("Enter search term")
+        .with_text_size(14.0)
+        .padding(8.0)
         .lens(AppState::search_term);
 
     // Button to kick off the search.
-    let search_btn = Button::new("Search").on_click(|ctx, data: &mut AppState, _env| {
-        let root = data.root_path.clone();
-        let term = data.search_term.clone();
-
-        // Clear any previous search results.
-        data.search_results = Arc::new(Vec::new());
+    let search_btn = Button::new("Search")
+        .padding(8.0)
+        .background(theme::BUTTON_DARK)
+        .on_click(|ctx, data: &mut AppState, _env| {
+            let root = data.root_path.clone();
+            let term = data.search_term.clone();
+
+            // Clear any previous search results.
+            data.search_results = Arc::new(Vec::new());
 
-        let sink = ctx.get_external_handle();
+            let sink = ctx.get_external_handle();
 
-        thread::spawn(move || {
-            let results = search_files(&root, &term);
-            // Send the search results back to the UI thread.
-            sink.submit_command(UPDATE_SEARCH_RESULTS, results, Target::Auto)
-                .expect("Failed to submit command");
+            thread::spawn(move || {
+                let results = search_files(&root, &term);
+                // Send the search results back to the UI thread.
+                sink.submit_command(UPDATE_SEARCH_RESULTS, results, Target::Auto)
+                    .expect("Failed to submit command");
+            });
         });
-    });
 
     // Create a list widget to display search results.
     let results_list = List::new(|| {
         Label::new(|item: &String, _env: &_| format!("{}", item))
-            .padding(5.0)
+            .with_text_size(14.0)
+            .padding(6.0)
+            .on_click(|_ctx, item: &mut String, _env| {
+                open_path(item);
+            })
     })
-    .with_spacing(2.0)
+    .with_spacing(4.0)
     // Lens into the search_results field (which is now an Arc<Vec<String>>)
     .lens(AppState::search_results);
 
     // Layout the UI elements vertically.
     Flex::column()
-        .with_child(choose_dir_btn.padding(5.0))
-        .with_child(dir_label.padding(5.0))
-        .with_child(search_box.padding(5.0))
-        .with_child(search_btn.padding(5.0))
-        .with_flex_child(Scroll::new(results_list), 1.0)
+        .with_child(choose_dir_btn.padding(8.0))
+        .with_child(directory_box.padding(8.0)) // new text box for directory input
+        .with_child(search_box.padding(8.0))
+        .with_child(search_btn.padding(8.0))
+        .with_flex_child(Scroll::new(results_list).expand(), 1.0)
+        .padding(12.0)
+        .background(theme::WINDOW_BACKGROUND_COLOR)
 }
 
-/// Searches files under the given directory whose names match the search term (case-insensitive)
+/// Searches files and directories under the given directory whose names match the search term (case-insensitive)
 /// and returns an Arc<Vec<String>>.
 fn search_files(root_path: &str, search_term: &str) -> Arc<Vec<String>> {
     let regex = Regex::new(&format!(r"(?i){}", search_term)).unwrap();
     let root = PathBuf::from(root_path);
+    let results = search_files_recursive(&root, &regex);
+    Arc::new(results)
+}
+
+fn search_files_recursive(dir: &Path, regex: &Regex) -> Vec<String> {
     let mut results = Vec::new();
-    for entry in WalkDir::new(root).into_iter().filter_map(|e| e.ok()) {
-        if entry.path().is_file() {
-            if let Some(name) = entry.path().file_name().and_then(|n| n.to_str()) {
-                if regex.is_match(name) {
-                    results.push(entry.path().display().to_string());
+    if dir.is_dir() {
+        for entry in fs::read_dir(dir).expect("read_dir call failed") {
+            if let Ok(entry) = entry {
+                if entry.path().is_file() || entry.path().is_dir() {
+                    if let Some(name) = entry.path().file_name().and_then(|n| n.to_str()) {
+                        if regex.is_match(name) {
+                            results.push(entry.path().display().to_string());
+                        }
+                    }
                 }
             }
         }
     }
-    Arc::new(results)
+    results
 }
 
 /// A delegate to handle commands coming from the background thread.
@@ -115,6 +150,15 @@ impl AppDelegate<AppState> for Delegate {
             data.search_results = results.clone();
             return druid::Handled::Yes;
         }
+        if cmd.is(commands::SHOW_OPEN_PANEL) {
+            let dialog = rfd::FileDialog::new();
+            if let Some(folder) = dialog.pick_folder() {
+                data.root_path = folder.to_string_lossy().to_string();
+                data.search_results = Arc::new(Vec::new());
+                return druid::Handled::Yes;
+            }
+            // Removed file selection to force folder-only selection.
+        }
         druid::Handled::No
     }
 }