fix app open logic

Author: klaatu01

src-tauri/src/ax/application_tree.rs

@@ -90,6 +90,7 @@ pub enum SearchParam {
     ByWindowId(WindowId),
     BySpaceId(SpaceId),
     ByDisplayId(DisplayId),
+    ByName(String),
     Focused,
 }
 
@@ -183,6 +184,11 @@ impl ApplicationTree {
             SearchParam::BySpaceId(space_id) => self.search_by_space_id(space_id),
             SearchParam::ByDisplayId(display_id) => self.search_by_display_id(display_id),
             SearchParam::Focused => self.search_by_focused(),
+            SearchParam::ByName(name) => self
+                .flatten()
+                .into_iter()
+                .filter(|res| res.app_name == name)
+                .collect(),
         }
     }
 }

src-tauri/src/ax/mod.rs

@@ -148,6 +148,23 @@ impl AX {
         Some(())
     }
 
+    pub fn try_focus_app(&mut self, app_name: &str) {
+        if let Some(res) = self
+            .application_tree
+            .search(SearchParam::ByName(app_name.to_string()))
+            .first()
+        {
+            let SearchResult {
+                pid,
+                window_id,
+                space_id,
+                ..
+            } = res;
+            let _ = self.focus_space(*space_id);
+            self.focus.focus(&self.app, *pid, Some(*window_id));
+        }
+    }
+
     /// Find window, switch to its Space, then focus it.
     pub fn focus_window(&mut self, window_id: WindowId) {
         if let Some(res) = self

src-tauri/src/cmd.rs

@@ -1,4 +1,7 @@
-use std::sync::{Arc, RwLock};
+use std::{
+    sync::{Arc, RwLock},
+    thread,
+};
 
 use lightsky::WindowId;
 use tauri::Manager;
@@ -19,10 +22,16 @@ pub fn run_cmd(app: tauri::AppHandle, cmd: Command) -> Result<(), String> {
     }
 }
 
-fn run_app_cmd(app: tauri::AppHandle, AppInfo { path, .. }: AppInfo) -> Result<(), String> {
+fn run_app_cmd(app: tauri::AppHandle, AppInfo { path, name }: AppInfo) -> Result<(), String> {
     app.opener()
         .open_path(path, None::<&str>)
-        .map_err(|e| e.to_string())
+        .map_err(|e| e.to_string())?;
+    thread::sleep(std::time::Duration::from_millis(500));
+    let ax = app.state::<Arc<RwLock<AX>>>();
+    let mut ax = ax.write().unwrap();
+    ax.refresh();
+    ax.try_focus_app(&name);
+    Ok(())
 }
 
 fn run_switch_cmd(app: tauri::AppHandle, target: WindowTarget) -> Result<(), String> {