chore: update

src-tauri/src/utils/dirs.rs

@@ -2,10 +2,7 @@ use crate::core::handle;
 use anyhow::Result;
 use once_cell::sync::OnceCell;
 use std::path::PathBuf;
-use tauri::{
-    api::path::{data_dir, resource_dir},
-    Env,
-};
+use tauri::Manager;
 
 #[cfg(not(feature = "verge-dev"))]
 pub static APP_ID: &str = "io.github.clash-verge-rev.clash-verge-rev";
@@ -48,9 +45,21 @@ pub fn app_home_dir() -> Result<PathBuf> {
         return Ok(PathBuf::from(app_dir).join(".config").join(APP_ID));
     }
 
-    Ok(data_dir()
-        .ok_or(anyhow::anyhow!("failed to get app home dir"))?
-        .join(APP_ID))
+    let handle = handle::Handle::global();
+    let app_handle = handle.app_handle.lock();
+
+    if let Some(app_handle) = app_handle.as_ref() {
+        match app_handle.path().data_dir() {
+            Ok(dir) => {
+                return Ok(dir.join(APP_ID));
+            }
+            Err(e) => {
+                log::error!("Failed to get the app home directory: {}", e);
+                return Err(anyhow::anyhow!("Failed to get the app homedirectory"));
+            }
+        }
+    }
+    Err(anyhow::anyhow!("failed to get the app home dir"))
 }
 
 /// get the resources dir
@@ -58,10 +67,15 @@ pub fn app_resources_dir() -> Result<PathBuf> {
     let handle = handle::Handle::global();
     let app_handle = handle.app_handle.lock();
     if let Some(app_handle) = app_handle.as_ref() {
-        let res_dir = resource_dir(app_handle.package_info(), &Env::default())
-            .ok_or(anyhow::anyhow!("failed to get the resource dir"))?
-            .join("resources");
-        return Ok(res_dir);
+        match app_handle.path().resource_dir() {
+            Ok(dir) => {
+                return Ok(dir.join("resources"));
+            }
+            Err(e) => {
+                log::error!("Failed to get the resource directory: {}", e);
+                return Err(anyhow::anyhow!("Failed to get the resource directory"));
+            }
+        };
     };
     Err(anyhow::anyhow!("failed to get the resource dir"))
 }
@@ -88,6 +102,10 @@ pub fn profiles_path() -> Result<PathBuf> {
     Ok(app_home_dir()?.join(PROFILE_YAML))
 }
 
+pub fn clash_pid_path() -> Result<PathBuf> {
+    Ok(app_home_dir()?.join("clash.pid"))
+}
+
 #[cfg(not(target_os = "windows"))]
 pub fn service_path() -> Result<PathBuf> {
     Ok(app_resources_dir()?.join("clash-verge-service"))