Upload fastsearch-tauri/src-tauri/src/main.rs

fastsearch-tauri/src-tauri/src/main.rs

@@ -5,7 +5,13 @@ use std::sync::Arc;
 use parking_lot::RwLock;
 use crossbeam_channel::unbounded;
 use once_cell::sync::Lazy;
-use tauri::{Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem, CustomMenuItem, WindowBuilder, WindowUrl, WindowEvent, PhysicalPosition};
+use tauri::{
+    menu::{MenuBuilder, MenuItemBuilder},
+    tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
+    Manager, Emitter, PhysicalPosition,
+};
+use tauri_plugin_global_shortcut::ShortcutState;
+use tauri_plugin_shell::ShellExt;
 use serde::{Serialize, Deserialize};
 
 use fastsearch_core::index::store::IndexStore;
@@ -97,23 +103,24 @@ fn cmd_rescan() {
 }
 
 #[tauri::command]
-fn cmd_toggle_window(window: tauri::Window) {
+fn cmd_toggle_window(window: tauri::WebviewWindow) {
     toggle_window(&window);
 }
 
 #[tauri::command]
-fn cmd_open_file(path: String) {
-    let _ = std::process::Command::new("explorer")
-        .arg("/select,")
-        .arg(&path)
-        .spawn();
+fn cmd_open_file(path: String, app: tauri::AppHandle) {
+    let _ = app.shell().open(
+        format!("explorer /select,\"{}\"", path.replace('"', "\\\"")),
+        None,
+    );
 }
 
 #[tauri::command]
-fn cmd_open_folder(path: String) {
-    let _ = std::process::Command::new("explorer")
-        .arg(&path)
-        .spawn();
+fn cmd_open_folder(path: String, app: tauri::AppHandle) {
+    let _ = app.shell().open(
+        format!("explorer \"{}\"", path.replace('"', "\\\"")),
+        None,
+    );
 }
 
 #[tauri::command]
@@ -145,7 +152,7 @@ fn cmd_get_exclusions() -> Vec<String> {
 }
 
 // ── Window helpers ───────────────────────────────────────────────
-fn toggle_window(window: &tauri::Window) {
+fn toggle_window(window: &tauri::WebviewWindow) {
     if window.is_visible().unwrap_or(false) {
         let _ = window.hide();
     } else {
@@ -161,7 +168,7 @@ fn toggle_window(window: &tauri::Window) {
     }
 }
 
-fn show_window(window: &tauri::Window) {
+fn show_window(window: &tauri::WebviewWindow) {
     if !window.is_visible().unwrap_or(false) {
         let _ = window.show();
         let _ = window.set_focus();
@@ -355,111 +362,77 @@ fn init_index() {
     });
 }
 
-// ── Hotkey listener (Win+Space) ──────────────────────────────────
-fn setup_hotkey_listener(app_handle: tauri::AppHandle) {
-    std::thread::spawn(move || {
-        use rdev::{listen, EventType, Key};
-        
-        let mut win_pressed = false;
-
-        let callback = move |event: rdev::Event| {
-            match event.event_type {
-                EventType::KeyPress(Key::MetaLeft) | EventType::KeyPress(Key::MetaRight) => {
-                    win_pressed = true;
-                }
-                EventType::KeyRelease(Key::MetaLeft) | EventType::KeyRelease(Key::MetaRight) => {
-                    win_pressed = false;
-                }
-                EventType::KeyPress(Key::Space) => {
-                    if win_pressed {
-                        if let Some(window) = app_handle.get_window("main") {
-                            let _ = window.emit("toggle-search", "");
-                        }
-                    }
-                }
-                _ => {}
-            }
-        };
-
-        if let Err(e) = listen(callback) {
-            eprintln!("Hotkey listener error: {:?}", e);
-        }
-    });
-}
-
 // ── Main ───────────────────────────────────────────────────────────
 fn main() {
-    let tray_menu = SystemTrayMenu::new()
-        .add_item(CustomMenuItem::new("show", "Show"))
-        .add_native_item(SystemTrayMenuItem::Separator)
-        .add_item(CustomMenuItem::new("quit", "Quit"));
-
-    let system_tray = SystemTray::new().with_menu(tray_menu);
-
     tauri::Builder::default()
+        .plugin(tauri_plugin_global_shortcut::Builder::new().build())
+        .plugin(tauri_plugin_shell::init())
         .setup(|app| {
+            // Initialize index in background
             init_index();
 
-            let app_handle = app.handle();
-            setup_hotkey_listener(app_handle.clone());
-
-            let window = WindowBuilder::new(
-                app,
-                "main",
-                WindowUrl::App("index.html".into())
-            )
-            .title("FastSeek")
-            .inner_size(800.0, 520.0)
-            .decorations(false)
-            .transparent(true)
-            .always_on_top(true)
-            .skip_taskbar(true)
-            .visible(false)
-            .build()?;
-
-            // Center window initially
-            if let Some(monitor) = window.primary_monitor()? {
-                let size = monitor.size();
-                let win_size = window.outer_size()?;
-                let x = (size.width as i32 - win_size.width as i32) / 2;
-                let y = (size.height as i32 - win_size.height as i32) / 3;
-                window.set_position(PhysicalPosition::new(x, y))?;
-            }
-
-            Ok(())
-        })
-        .system_tray(system_tray)
-        .on_system_tray_event(|app, event| {
-            match event {
-                SystemTrayEvent::LeftClick { .. } => {
-                    if let Some(window) = app.get_window("main") {
-                        toggle_window(&window);
-                    }
-                }
-                SystemTrayEvent::MenuItemClick { id, .. } => {
-                    match id.as_str() {
-                        "show" => {
-                            if let Some(window) = app.get_window("main") {
-                                show_window(&window);
-                            }
+            // ── Tray Icon ──────────────────────────────────────────
+            let show = MenuItemBuilder::with_id("show", "Show").build(app)?;
+            let quit = MenuItemBuilder::with_id("quit", "Quit").build(app)?;
+            let menu = MenuBuilder::new(app).items(&[&show, &quit]).build()?;
+
+            let _tray = TrayIconBuilder::new()
+                .menu(&menu)
+                .on_menu_event(|app, event| match event.id().as_ref() {
+                    "show" => {
+                        if let Some(win) = app.get_webview_window("main") {
+                            let _ = win.show();
+                            let _ = win.set_focus();
                         }
-                        "quit" => {
-                            std::process::exit(0);
+                    }
+                    "quit" => {
+                        app.exit(0);
+                    }
+                    _ => {}
+                })
+                .on_tray_icon_event(|tray, event| {
+                    if let TrayIconEvent::Click {
+                        button: MouseButton::Left,
+                        button_state: MouseButtonState::Up,
+                        ..
+                    } = event {
+                        let app = tray.app_handle();
+                        if let Some(win) = app.get_webview_window("main") {
+                            toggle_window(&win);
                         }
-                        _ => {}
                     }
-                }
-                _ => {}
-            }
-        })
-        .on_window_event(|event| {
-            match event.event() {
-                WindowEvent::Focused(false) => {
+                })
+                .build(app)?;
+
+            // ── Global Shortcut (Win+Space) ──────────────────────
+            app.handle().plugin(
+                tauri_plugin_global_shortcut::Builder::new()
+                    .with_handler(|app, shortcut, event| {
+                        if shortcut.matches_code(tauri_plugin_global_shortcut::Code::Space) {
+                            if event.state == ShortcutState::Pressed {
+                                if let Some(win) = app.get_webview_window("main") {
+                                    toggle_window(&win);
+                                }
+                            }
+                        }
+                    })
+                    .build(),
+            )?;
+
+            // Register Win+Space shortcut
+            let shortcut_manager = app.global_shortcut();
+            let _ = shortcut_manager.register("Super+Space");
+
+            // ── Window Events ──────────────────────────────────────
+            let win = app.get_webview_window("main").unwrap();
+            win.on_window_event(|win, event| {
+                if let tauri::WindowEvent::Focused(false) = event {
                     // Optional: hide on blur (click outside)
-                    // event.window().hide().ok();
+                    // let _ = win.hide();
                 }
-                _ => {}
-            }
+            });
+
+            Ok(())
         })
         .invoke_handler(tauri::generate_handler![
             cmd_search,