fix: indexing apps does not respect search scope config (#773)

SteveLauC · web-flow · commit 7b8b396368b1 · 2025-07-18T16:26:34.000+08:00
This commit fixes the issue that indexing applications does not
respect the search scope configuration, it always uses the default
values.
diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
@@ -24,8 +24,10 @@ Information about release notes of Coco Server is provided here.
 - fix(file search): searching by name&content does not search file name #743
 - fix: prevent window from hiding when moved on Windows #748
 - fix: unregister ext hotkey when it gets deleted #770
+- fix: indexing apps does not respect search scope config #773
 - fix: restore missing category titles on subpages #772
 
+
 ### ✈️ Improvements
 
 - refactor: prioritize stat(2) when checking if a file is dir #737
diff --git a/src-tauri/src/extension/built_in/application/with_feature.rs b/src-tauri/src/extension/built_in/application/with_feature.rs
@@ -245,8 +245,29 @@ async fn index_applications_if_not_indexed<R: Runtime>(
     let mut writer = pizza_engine.acquire_writer();
 
     if !index_exists {
-        let default_search_path = get_default_search_paths();
-        let apps = list_app_in(default_search_path).map_err(|str| anyhow::anyhow!(str))?;
+        let search_path = {
+            let disabled_app_list_and_search_path_store = tauri_app_handle
+                .store(TAURI_STORE_DISABLED_APP_LIST_AND_SEARCH_PATH)?;
+            let search_path_json = disabled_app_list_and_search_path_store
+              .get(TAURI_STORE_KEY_SEARCH_PATH)
+              .unwrap_or_else(|| {
+                panic!("search path should be persisted in the store, but it is not, plz ensure that the store gets initialized before calling this function")
+              });
+
+            let search_path: Vec<String> = match search_path_json {
+              Json::Array(array) => array
+                .into_iter()
+                .map(|json| match json {
+                  Json::String(str) => str,
+                  _ => unreachable!("search path is stored in a string"),
+                })
+                .collect(),
+              _ => unreachable!("search path is stored in an array"),
+            };
+
+            search_path
+        };
+        let apps = list_app_in(search_path).map_err(|str| anyhow::anyhow!(str))?;
 
         for app in apps.iter() {
             let app_path = get_app_path(app);
@@ -489,26 +510,6 @@ impl ApplicationSearchSource {
     pub async fn prepare_index_and_store<R: Runtime>(
         app_handle: AppHandle<R>,
     ) -> Result<(), String> {
-        let (tx, rx) = tokio::sync::oneshot::channel();
-        let index_applications_task = IndexAllApplicationsTask {
-            tauri_app_handle: app_handle.clone(),
-            callback: Some(tx),
-        };
-
-        RUNTIME_TX
-            .get()
-            .unwrap()
-            .send(Box::new(index_applications_task))
-            .unwrap();
-
-        let indexing_applications_result = rx.await.unwrap();
-        if let Err(ref e) = indexing_applications_result {
-            error!(
-                "indexing local applications failed, app search won't work, error [{}]",
-                e
-            )
-        }
-
         app_handle
             .store(TAURI_STORE_APP_HOTKEY)
             .map_err(|e| e.to_string())?;
@@ -523,6 +524,9 @@ impl ApplicationSearchSource {
                 .set(TAURI_STORE_KEY_DISABLED_APP_LIST, Json::Array(Vec::new()));
         }
 
+        // IndexAllApplicationsTask will read the apps installed in search paths and 
+        // index them, so it depends on this configuration entry. Init this entry 
+        // before indexing apps.
         if disabled_app_list_and_search_path_store
             .get(TAURI_STORE_KEY_SEARCH_PATH)
             .is_none()
@@ -532,6 +536,28 @@ impl ApplicationSearchSource {
                 .set(TAURI_STORE_KEY_SEARCH_PATH, default_search_path);
         }
 
+
+        let (tx, rx) = tokio::sync::oneshot::channel();
+        let index_applications_task = IndexAllApplicationsTask {
+            tauri_app_handle: app_handle.clone(),
+            callback: Some(tx),
+        };
+
+        RUNTIME_TX
+            .get()
+            .unwrap()
+            .send(Box::new(index_applications_task))
+            .unwrap();
+
+        let indexing_applications_result = rx.await.unwrap();
+        if let Err(ref e) = indexing_applications_result {
+            error!(
+                "indexing local applications failed, app search won't work, error [{}]",
+                e
+            )
+        }
+
+
         Ok(())
     }
 }
