Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

feat(desktop): get display name for bundles from system (#3516)

Elijah Potter7c8e23c6334e
diff --git a/harper-desktop/src-tauri/src/lib.rs b/harper-desktop/src-tauri/src/lib.rs
index 4ca1c0b59..b9cebe308 100644
--- a/harper-desktop/src-tauri/src/lib.rs
+++ b/harper-desktop/src-tauri/src/lib.rs
@@ -9,6 +9,7 @@ use harper_core::{
linting::{FlatConfig, Lint, LintGroup},
spell::{Dictionary, MutableDictionary},
};
+use serde::Serialize;
use std::{cell::RefCell, rc::Rc, sync::Arc, time::Duration};
use tauri::{
Manager, State, WebviewUrl, WebviewWindowBuilder, WindowEvent,
@@ -57,6 +58,13 @@ const OPEN_EDITOR_MENU_ID: &str = "open-editor";
const SETTINGS_MENU_ID: &str = "settings";
const QUIT_MENU_ID: &str = "quit";
+#[derive(Debug, Clone, Serialize)]
+struct IntegrationView {
+ bundle_id: String,
+ enabled: bool,
+ display_name: String,
+}
+
struct TrayMenu {
menu: Menu<tauri::Wry>,
service_toggle: MenuItem<tauri::Wry>,
@@ -383,8 +391,18 @@ async fn add_to_dictionary(
#[tauri::command]
async fn get_integrations(
config: State<'_, Arc<Mutex<Config>>>,
-) -> Result<Vec<Integration>, String> {
- Ok(config.lock().await.integrations.clone())
+) -> Result<Vec<IntegrationView>, String> {
+ let integrations = config.lock().await.integrations.clone();
+ let broker = platform_broker();
+
+ Ok(integrations
+ .into_iter()
+ .map(|integration| IntegrationView {
+ display_name: broker.integration_display_name(&integration.bundle_id),
+ bundle_id: integration.bundle_id,
+ enabled: integration.enabled,
+ })
+ .collect())
}
#[tauri::command]
diff --git a/harper-desktop/src-tauri/src/mac_broker.rs b/harper-desktop/src-tauri/src/mac_broker.rs
index 40b41ca3d..4263eec65 100644
--- a/harper-desktop/src-tauri/src/mac_broker.rs
+++ b/harper-desktop/src-tauri/src/mac_broker.rs
@@ -29,6 +29,8 @@ use std::{
cell::RefCell,
collections::BTreeMap,
error::Error as StdError,
+ path::Path,
+ process::Command,
ptr,
rc::Rc,
time::{Duration, Instant},
@@ -180,6 +182,10 @@ impl OsBroker for MacBroker {
}
}
+ fn system_integration_display_name(&self, bundle_id: &str) -> Option<String> {
+ system_integration_display_name(bundle_id)
+ }
+
fn launch_app_bundle(&self, bundle_id: &str) -> Result<(), String> {
let bundle_id = bundle_id.trim();
@@ -187,7 +193,7 @@ impl OsBroker for MacBroker {
return Err("Bundle ID cannot be empty.".to_string());
}
- std::process::Command::new("open")
+ Command::new("open")
.arg("-b")
.arg(bundle_id)
.spawn()
@@ -197,6 +203,42 @@ impl OsBroker for MacBroker {
}
}
+fn system_integration_display_name(bundle_id: &str) -> Option<String> {
+ let bundle_id = bundle_id.trim();
+
+ if bundle_id.is_empty() {
+ return None;
+ }
+
+ let predicate_bundle_id = bundle_id.replace('\\', "\\\\").replace('"', "\\\"");
+ let output = Command::new("mdfind")
+ .arg(format!(
+ "kMDItemCFBundleIdentifier == \"{predicate_bundle_id}\""
+ ))
+ .output()
+ .ok()?;
+
+ if !output.status.success() {
+ return None;
+ }
+
+ String::from_utf8_lossy(&output.stdout)
+ .lines()
+ .filter_map(|line| display_name_from_app_path(line.trim()))
+ .next()
+}
+
+fn display_name_from_app_path(path: &str) -> Option<String> {
+ let file_name = Path::new(path).file_name()?.to_str()?;
+ let display_name = file_name.strip_suffix(".app").unwrap_or(file_name).trim();
+
+ if display_name.is_empty() {
+ None
+ } else {
+ Some(display_name.to_string())
+ }
+}
+
fn focused_window_pid() -> Result<pid_t, Box<dyn StdError>> {
let system = AXUIElement::system_wide();
let app = ax_element_attribute(&system, kAXFocusedApplicationAttribute)?;
diff --git a/harper-desktop/src-tauri/src/os_broker.rs b/harper-desktop/src-tauri/src/os_broker.rs
index b2534a116..e8fc9d168 100644
--- a/harper-desktop/src-tauri/src/os_broker.rs
+++ b/harper-desktop/src-tauri/src/os_broker.rs
@@ -34,11 +34,35 @@ pub trait OsBroker {
self.accessibility_permission_status()
}
+ fn system_integration_display_name(&self, _bundle_id: &str) -> Option<String> {
+ None
+ }
+
+ fn integration_display_name(&self, bundle_id: &str) -> String {
+ self.system_integration_display_name(bundle_id)
+ .unwrap_or_else(|| fallback_integration_display_name(bundle_id))
+ }
+
fn launch_app_bundle(&self, _bundle_id: &str) -> Result<(), String> {
Err("Launching apps by bundle ID is only supported on macOS.".to_string())
}
}
+fn fallback_integration_display_name(bundle_id: &str) -> String {
+ let trimmed = bundle_id.trim();
+
+ if trimmed.is_empty() {
+ return "Unknown app".to_string();
+ }
+
+ trimmed
+ .split('.')
+ .rev()
+ .find(|segment| !segment.is_empty())
+ .unwrap_or(trimmed)
+ .to_string()
+}
+
/// No-op platform broker for targets that do not have an OS implementation yet.
///
/// This lets the highlighter compile on non-macOS platforms while making it explicit that there is
@@ -59,3 +83,27 @@ impl OsBroker for NoopBroker {
None
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::fallback_integration_display_name;
+
+ #[test]
+ fn fallback_handles_empty_bundle_ids() {
+ assert_eq!(fallback_integration_display_name(""), "Unknown app");
+ assert_eq!(fallback_integration_display_name(" "), "Unknown app");
+ }
+
+ #[test]
+ fn fallback_uses_last_non_empty_segment_without_changing_case() {
+ assert_eq!(
+ fallback_integration_display_name("com.microsoft.VSCode"),
+ "VSCode"
+ );
+ assert_eq!(
+ fallback_integration_display_name("com.googlecode.iterm2"),
+ "iterm2"
+ );
+ assert_eq!(fallback_integration_display_name("com.example."), "example");
+ }
+}
diff --git a/harper-desktop/src/lib/client.ts b/harper-desktop/src/lib/client.ts
index c4da2739c..596ffdeb2 100644
--- a/harper-desktop/src/lib/client.ts
+++ b/harper-desktop/src/lib/client.ts
@@ -37,6 +37,7 @@ function getConfigLinter(): Promise<LocalLinterType> {
export interface Integration {
bundle_id: string;
enabled: boolean;
+ display_name: string;
}
export type AccessibilityPermissionStatus = 'Granted' | 'NotGranted' | 'Unsupported';
diff --git a/harper-desktop/src/lib/settings/pages/GettingStartedPage.svelte b/harper-desktop/src/lib/settings/pages/GettingStartedPage.svelte
index 749e7ae17..3568054f1 100644
--- a/harper-desktop/src/lib/settings/pages/GettingStartedPage.svelte
+++ b/harper-desktop/src/lib/settings/pages/GettingStartedPage.svelte
@@ -83,7 +83,10 @@ async function enableTextEditForSetup() {
);
} else {
await Client.addIntegration('com.apple.TextEdit');
- integrations = [...integrations, { bundle_id: 'com.apple.TextEdit', enabled: true }];
+ integrations = [
+ ...integrations,
+ { bundle_id: 'com.apple.TextEdit', enabled: true, display_name: 'TextEdit' },
+ ];
}
state = {
diff --git a/harper-desktop/src/lib/settings/pages/IntegrationsPage.svelte b/harper-desktop/src/lib/settings/pages/IntegrationsPage.svelte
index f769eeb67..c47905166 100644
--- a/harper-desktop/src/lib/settings/pages/IntegrationsPage.svelte
+++ b/harper-desktop/src/lib/settings/pages/IntegrationsPage.svelte
@@ -37,14 +37,10 @@ async function loadIntegrations() {
function toIntegrationRow(integration: Integration): IntegrationRow {
return {
...integration,
- name: integrationName(integration.bundle_id),
+ name: integration.display_name,
};
}
-function integrationName(bundleId: string) {
- return bundleId.split('.').at(-1) || bundleId;
-}
-
async function setIntegrationEnabled(bundleId: string, enabled: boolean) {
const previousIntegrations = integrations;
@@ -93,12 +89,16 @@ async function addIntegration(bundleId: string) {
const previousIntegrations = integrations;
- integrations = [...integrations, { bundle_id: trimmedBundleId, enabled: true }];
+ integrations = [
+ ...integrations,
+ { bundle_id: trimmedBundleId, enabled: true, display_name: trimmedBundleId },
+ ];
isIntegrationsSaving = true;
integrationsError = '';
try {
await Client.addIntegration(trimmedBundleId);
+ await loadIntegrations();
closeAppPicker();
} catch (error) {
integrations = previousIntegrations;