refactor: Use Rust to get installed apps and consider also user apps (#…

…27)

src-tauri/Cargo.toml

@@ -22,6 +22,7 @@ tauri-plugin-deep-link = "0.1.2"
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" }
 enigo = "0.1.3"
 swift-rs = "1.0.6"
+rust_search = "2.1.0"
 
 
 [features]

src-tauri/src/apps.rs

@@ -0,0 +1,28 @@
+use rust_search::SearchBuilder;
+
+#[tauri::command]
+pub fn get_apps() -> Vec<String> {
+    let result: Vec<String>;
+    result = search(
+        vec!["~/Applications", "/Applications", "/System/Applications"],
+        Some(".app"),
+        Some(1),
+    );
+    return result;
+}
+
+fn search(
+    search_locations: Vec<&str>,
+    extension: Option<&str>,
+    depth: Option<usize>,
+) -> Vec<String> {
+    let (location, more_locations) = search_locations.split_first().unwrap();
+    let result: Vec<String> = SearchBuilder::default()
+        .location(location)
+        .more_locations(more_locations.to_vec())
+        .depth(depth.unwrap_or(1))
+        .ext(extension.unwrap_or("*"))
+        .build()
+        .collect();
+    return result;
+}

src-tauri/src/main.rs

@@ -1,12 +1,13 @@
-use std::{env, path::PathBuf};
+mod apps;
 
+use apps::get_apps;
+use enigo::{Enigo, MouseControllable};
 use serde_json::json;
+use std::{env, path::PathBuf};
+use swift_rs::{swift, Bool, Int, SRString};
 use tauri::{
     ActivationPolicy, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, Wry,
 };
-
-use enigo::{Enigo, MouseControllable};
-use swift_rs::{swift, Bool, Int, SRString};
 use tauri_plugin_store::{with_store, StoreCollection};
 
 swift!(fn get_default_browser() -> SRString);
@@ -35,7 +36,8 @@ fn main() {
             make_default_browser,
             retrieve_app_icon,
             open_picker_window,
-            open_preferences_window
+            open_preferences_window,
+            get_apps
         ])
         .setup(|app| {
             //? Allows application to receive and parse the URI passed in when opened.

src-tauri/tauri.conf.json

@@ -30,20 +30,6 @@
               "read",
               "~/Library/Preferences/com.apple.LaunchServices/com.apple.launchservices.secure"
             ]
-          },
-          {
-            "name": "findApps",
-            "cmd": "find",
-            "args": [
-              "~/Applications",
-              "/Applications",
-              "-iname",
-              "*.app",
-              "-prune",
-              "-not",
-              "-path",
-              "\"*/.*\""
-            ]
           }
         ]
       },

src/utils/get-installed-app-names.ts

@@ -1,12 +1,10 @@
-import { path } from '@tauri-apps/api';
-
 import { AppName, apps } from '@config/apps';
-import { Command } from '@tauri-apps/api/shell';
+import { path } from '@tauri-apps/api';
+import { invoke } from '@tauri-apps/api/tauri'
 
 async function getAllInstalledAppNames(): Promise<string[]> {
-  const output = await new Command('findApps').execute();
-  const appNamesRaw = output.stdout.trim().split('\n');
-  const appNamePromises = appNamesRaw.map(async (appPath) => {
+  const apps = await invoke('get_apps') as Array<string>
+  const appNamePromises = apps.map(async (appPath) => {
     const baseName = await path.basename(appPath);
     const appName = baseName.substring(0, baseName.length - 4);
     return appName;