chore: add env dependency; fix macOS FFI signatures and path resolution; clean imports

Author: theg1239

apps/desktop/src-tauri/Cargo.lock

@@ -34,6 +34,7 @@ url = "2"
 percent-encoding = "2"
 tauri-plugin-os = "2.3.1"
 tauri-plugin-store = "2.4.0"
+env = "1.0.1"
 
 [dev-dependencies]
 tempfile = "3.13.0"

apps/desktop/src-tauri/Cargo.toml

@@ -38,13 +38,11 @@ fn current_http_handler_windows() -> Result<String, String> {
 #[cfg(target_os = "macos")]
 fn current_http_handler_macos() -> Result<String, String> {
     use core_foundation::base::TCFType;
-    use core_foundation::string::CFString;
+    use core_foundation::string::{CFString, CFStringRef};
 
     #[link(name = "CoreServices", kind = "framework")]
     extern "C" {
-        fn LSCopyDefaultHandlerForURLScheme(
-            scheme: core_foundation::sys::string::CFStringRef,
-        ) -> core_foundation::sys::string::CFStringRef;
+        fn LSCopyDefaultHandlerForURLScheme(scheme: CFStringRef) -> CFStringRef;
     }
 
     let scheme = CFString::new("http");

apps/desktop/src-tauri/src/commands.rs

@@ -1,18 +1,23 @@
 use core_foundation::base::TCFType;
 use core_foundation::string::CFString;
-use core_foundation::url::{kCFURLPOSIXPathStyle, CFURL};
+use core_foundation::url::{kCFURLPOSIXPathStyle, CFURL, CFURLRef};
 use std::path::Path;
-use tauri::AppHandle;
+use tauri::{AppHandle, Manager};
 
 #[link(name = "CoreServices", kind = "framework")]
 extern "C" {
-    fn LSRegisterURL(in_url: core_foundation::sys::url::CFURLRef, in_update: bool) -> i32;
+    fn LSRegisterURL(in_url: CFURLRef, in_update: bool) -> i32;
 }
 
 pub fn register(app: &AppHandle) -> Result<(), String> {
-    if let Some(bundle_path) = app.path_resolver().app_bundle_path() {
-        try_register_path(&bundle_path)?;
-    } else if let Ok(exe_path) = std::env::current_exe() {
+    if let Ok(resource_dir) = app.path().resource_dir() {
+        if let Some(bundle_path) = resource_dir.parent().and_then(|p| p.parent()) {
+            try_register_path(bundle_path)?;
+            return Ok(());
+        }
+    }
+
+    if let Ok(exe_path) = std::env::current_exe() {
         try_register_path(&exe_path)?;
     }
 
@@ -25,7 +30,7 @@ fn try_register_path(path: &Path) -> Result<(), String> {
         "Failed to resolve application path for LaunchServices registration".to_string()
     })?;
     let cf_path = CFString::new(path_str);
-    let url = CFURL::from_file_system_path(&cf_path, kCFURLPOSIXPathStyle, is_directory);
+    let url = CFURL::from_file_system_path(cf_path, kCFURLPOSIXPathStyle, is_directory);
     let status = unsafe { LSRegisterURL(url.as_concrete_TypeRef(), true) };
 
     if status != 0 {

apps/desktop/src-tauri/src/platform/macos.rs

@@ -2,7 +2,6 @@ use crate::preferences::PreferencesState;
 use chrono::Utc;
 use crowser::browser::{get_all_existing_browsers, get_browser_path};
 use serde::{Deserialize, Serialize};
-use std::env;
 use std::path::PathBuf;
 use std::process::Command;
 use std::sync::Arc;
@@ -12,8 +11,10 @@ use tokio::time::{sleep, Duration};
 use url::Url;
 use uuid::Uuid;
 
-#[cfg(any(target_os = "linux", target_os = "macos"))]
-use dirs::{config_dir, home_dir};
+#[cfg(target_os = "linux")]
+use dirs::config_dir;
+#[cfg(target_os = "macos")]
+use dirs::home_dir;
 
 #[cfg(target_os = "windows")]
 use std::os::windows::process::CommandExt;