Skip to content

Resolve #9 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bennobuilder merged 2 commits into from
Jul 18, 2026
Merged

Resolve #9 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2dd050
#9 bump mado version
bennobuilder Jul 18, 2026
4a9a7ad
#9 support installed apps in catalog search
bennobuilder Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ sqlx = { version = "0.9.0", default-features = false, features = [
] }
tokio = { version = "1.52.3", features = ["macros", "signal", "sync", "time"] }
abstand-macos = { path = "../crates/macos" }
mado = "0.0.9"
mado = "0.0.10"
nucleo-matcher = "0.3.1"
chrono = { version = "0.4.45", default-features = false, features = [
"clock",
Expand Down
162 changes: 145 additions & 17 deletions apps/desktop/src-tauri/src/modules/catalog/search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use super::{
app_identity::resolve_app_identity, matcher::fuzzy_match, predefined::PREDEFINED_SERVICES,
};
use crate::common::url::extract_website_target;
use mado::{get_installed_apps, InstalledAppsConfig};
use mado::{get_installed_app, get_installed_apps, InstalledApp, InstalledAppsConfig};
use std::collections::HashSet;

pub struct CatalogSearch {
Expand All @@ -18,15 +18,34 @@ impl CatalogSearch {
};
}

/// Searches cached catalog items by query.
/// Searches cached catalog items, installed apps by bundle ID, and custom websites.
pub fn search(&self, query: &str, limit: usize) -> Vec<CatalogSearchResult> {
let trimmed_query = query.trim();
if trimmed_query.is_empty() {
return Vec::new();
}

let query_website_target = extract_website_target(trimmed_query);
let is_known_app = self.apps.iter().any(|item| {
return item
.bundle_id()
.is_some_and(|bundle_id| bundle_id.eq_ignore_ascii_case(trimmed_query));
});
let custom_app = if is_known_app {
None
} else {
get_installed_app(
trimmed_query,
InstalledAppsConfig {
include_icon: false,
include_app_color: false,
icon_size: 0,
},
)
.map(Self::searchable_app)
};
let has_exact_app_match = is_known_app || custom_app.is_some();

let query_website_target = extract_website_target(trimmed_query);
let custom_website = query_website_target.as_ref().and_then(|target| {
let is_known_website = self
.websites
Expand All @@ -35,16 +54,24 @@ impl CatalogSearch {
return (!is_known_website)
.then(|| SearchableItem::custom_hostname(target.hostname.clone()));
});

let items = self
.apps
.iter()
.chain(custom_app.iter())
.chain(self.websites.iter())
.chain(custom_website.iter());
.chain(custom_website.iter())
// Note: Bundle IDs can look like hostnames, so an exact app match excludes website results
.filter(|item| !has_exact_app_match || item.is_app());

let fuzzy_match_query = query_website_target
.as_ref()
.map(|target| target.hostname.as_str())
.unwrap_or(trimmed_query);
let fuzzy_match_query = if has_exact_app_match {
trimmed_query
} else {
query_website_target
.as_ref()
.map(|target| target.hostname.as_str())
.unwrap_or(trimmed_query)
};
let matches = fuzzy_match(items, fuzzy_match_query);

let mut seen_ids = HashSet::<String>::new();
Expand Down Expand Up @@ -82,18 +109,20 @@ impl CatalogSearch {

return get_installed_apps(config)
.into_iter()
.map(|app| {
let identity = resolve_app_identity(&app.bundle_id, &app.name, &app.path);
SearchableItem::app(SearchableApp {
stable_id: identity.stable_id,
name: Some(app.name),
bundle_id: identity.bundle_id,
process_path: Some(app.path),
})
})
.map(Self::searchable_app)
.collect();
}

fn searchable_app(app: InstalledApp) -> SearchableItem {
let identity = resolve_app_identity(&app.bundle_id, &app.name, &app.path);
return SearchableItem::app(SearchableApp {
stable_id: identity.stable_id,
name: Some(app.name),
bundle_id: identity.bundle_id,
process_path: Some(app.path),
});
}

/// Loads searchable website items from predefined services.
fn load_websites() -> Vec<SearchableItem> {
let mut items = Vec::new();
Expand Down Expand Up @@ -175,6 +204,17 @@ impl SearchableItem {
};
}

fn bundle_id(&self) -> Option<&str> {
return match self {
Self::App { app, .. } => app.bundle_id.as_deref(),
Self::Website { .. } => None,
};
}

fn is_app(&self) -> bool {
return matches!(self, Self::App { .. });
}

pub fn display_name(&self) -> &str {
return match self {
Self::App { app, .. } => app
Expand Down Expand Up @@ -221,3 +261,91 @@ pub struct SearchableWebsite {
pub hostname: String,
pub name: Option<String>,
}

#[cfg(test)]
mod tests {
use super::*;

fn catalog_search() -> CatalogSearch {
return CatalogSearch {
apps: vec![SearchableItem::app(SearchableApp {
stable_id: "com.example.Reader".to_string(),
name: Some("Reader".to_string()),
bundle_id: Some("com.example.Reader".to_string()),
process_path: Some("/Applications/Reader.app".to_string()),
})],
websites: vec![SearchableItem::website(
SearchableWebsite {
hostname: "docs.example.com".to_string(),
name: Some("Example Docs".to_string()),
},
vec!["docs.example.com".to_string()],
)],
};
}

#[test]
fn finds_catalog_app_by_bundle_id() {
let results = catalog_search().search("com.example.Reader", 20);

assert_eq!(results.len(), 1);
let CatalogSearchResult::App { app, .. } = &results[0] else {
panic!("catalog app query should resolve as an app");
};
assert_eq!(app.bundle_id.as_deref(), Some("com.example.Reader"));
}

#[test]
fn finds_catalog_website_by_hostname() {
let results = catalog_search().search("docs.example.com", 20);

assert_eq!(results.len(), 1);
let CatalogSearchResult::Website { website, path, .. } = &results[0] else {
panic!("catalog website query should resolve as a website");
};
assert_eq!(website.hostname, "docs.example.com");
assert_eq!(website.name.as_deref(), Some("Example Docs"));
assert_eq!(path, &None);
}

#[test]
fn returns_custom_website_with_path() {
let results = catalog_search().search("https://outside.example/reference/", 20);

assert_eq!(results.len(), 1);
let CatalogSearchResult::Website { website, path, .. } = &results[0] else {
panic!("custom URL should resolve as a website");
};
assert_eq!(website.hostname, "outside.example");
assert_eq!(website.name, None);
assert_eq!(path.as_deref(), Some("/reference"));
}

#[cfg(target_os = "macos")]
#[test]
fn returns_installed_app_missing_from_catalog() {
let search = CatalogSearch {
apps: Vec::new(),
websites: Vec::new(),
};

let results = search.search("com.apple.finder", 20);

assert_eq!(results.len(), 1);
let CatalogSearchResult::App { app, .. } = &results[0] else {
panic!("installed bundle ID should resolve as an app");
};
assert_eq!(app.bundle_id.as_deref(), Some("com.apple.finder"));
assert!(app
.process_path
.as_deref()
.is_some_and(|path| path.ends_with("/Finder.app")));
}

#[test]
fn returns_no_results_for_unmatched_query() {
let results = catalog_search().search("zzzz-unmatched", 20);

assert!(results.is_empty());
}
}
Loading