Mirrors/coco-app
1
0
Fork 0
mirror of https://github.com/infinilabs/coco-app.git synced 2025-12-16 11:37:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This commit fixes the issue that indexing applications does not
respect the search scope configuration, it always uses the default
values.
This commit is contained in:
SteveLauC
2025-07-18 16:26:34 +08:00
committed by GitHub
parent 823a95d601
commit 7b8b396368
2 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/content.en/docs/release-notes/_index.md
View File

@@ -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

74
src-tauri/src/extension/built_in/application/with_feature.rs
View File

@@ -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,6 +510,33 @@ impl ApplicationSearchSource {
pub async fn prepare_index_and_store<R: Runtime>(
app_handle: AppHandle<R>,
) -> Result<(), String> {
app_handle
.store(TAURI_STORE_APP_HOTKEY)
.map_err(|e| e.to_string())?;
let disabled_app_list_and_search_path_store = app_handle
.store(TAURI_STORE_DISABLED_APP_LIST_AND_SEARCH_PATH)
.map_err(|e| e.to_string())?;
if disabled_app_list_and_search_path_store
.get(TAURI_STORE_KEY_DISABLED_APP_LIST)
.is_none()
{
disabled_app_list_and_search_path_store
.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()
{
let default_search_path = get_default_search_paths();
disabled_app_list_and_search_path_store
.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(),
@@ -509,28 +557,6 @@ impl ApplicationSearchSource {
)
}
app_handle
.store(TAURI_STORE_APP_HOTKEY)
.map_err(|e| e.to_string())?;
let disabled_app_list_and_search_path_store = app_handle
.store(TAURI_STORE_DISABLED_APP_LIST_AND_SEARCH_PATH)
.map_err(|e| e.to_string())?;
if disabled_app_list_and_search_path_store
.get(TAURI_STORE_KEY_DISABLED_APP_LIST)
.is_none()
{
disabled_app_list_and_search_path_store
.set(TAURI_STORE_KEY_DISABLED_APP_LIST, Json::Array(Vec::new()));
}
if disabled_app_list_and_search_path_store
.get(TAURI_STORE_KEY_SEARCH_PATH)
.is_none()
{
let default_search_path = get_default_search_paths();
disabled_app_list_and_search_path_store
.set(TAURI_STORE_KEY_SEARCH_PATH, default_search_path);
}
Ok(())
}