Merge pull request #78 from alley-rs/dev

fix: release 时一些编译错误

Author: thep0y

src-tauri/src/config/mod.rs

@@ -14,8 +14,8 @@ use crate::error::{Error, HunterResult};
 pub use crate::config::config::Config;
 pub use crate::config::log_level::LogLevel;
 pub use crate::config::node::ServerNode;
+use crate::global::APP_NAME;
 
-const APP_NAME: &str = "hunter";
 const CONFIG_FILE_NAME: &str = "hunter.toml";
 const TROJAN_CONFIG_FILE_NAME: &str = "config.json";
 

src-tauri/src/global.rs

@@ -1,6 +1,6 @@
 use std::{fs, path::PathBuf, sync::LazyLock};
 
-const APP_NAME: &str = "hunter";
+pub const APP_NAME: &str = "hunter";
 
 pub(super) static EXECUTABLE_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
     let dir = dirs::cache_dir().unwrap().join(APP_NAME);

src-tauri/src/proxy.rs

@@ -435,7 +435,9 @@ impl Proxy {
     }
 
     #[cfg(target_os = "linux")]
-    pub fn switch_auto_start(&self, current_state: bool) -> HunterResult<()> {
+    pub async fn switch_auto_start(&self, current_state: bool) -> HunterResult<()> {
+        let trojan_config_path = get_or_init_config_manager().await.trojan_config_path();
+
         if current_state {
             debug!("delete auto start script");
             fs::remove_file(&self.auto_start_desktop).map_err(|e| {
@@ -458,7 +460,7 @@ Type=Application
 X-KDE-AutostartScript=true
 "#,
             self.executable_file.to_string_lossy(),
-            TROJAN_CONFIG_FILE_PATH.to_string_lossy()
+            trojan_config_path.to_string_lossy()
         );
 
         debug!("add auto start script");
@@ -494,7 +496,7 @@ ws.Run "{} -config {}",0"#,
     }
 
     #[cfg(target_os = "macos")]
-    pub fn switch_auto_start(&self, current_state: bool) -> HunterResult<()> {
+    pub async fn switch_auto_start(&self, current_state: bool) -> HunterResult<()> {
         if current_state {
             debug!("删除开机启动脚本");
             return fs::remove_file(&self.auto_start_plist).map_err(|e| {
@@ -503,6 +505,8 @@ ws.Run "{} -config {}",0"#,
             });
         }
 
+        let trojan_config_path = get_or_init_config_manager().await.trojan_config_path();
+
         let content = format!(
             r#"<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -522,7 +526,7 @@ ws.Run "{} -config {}",0"#,
 </plist>
 "#,
             self.executable_file.to_string_lossy(),
-            TROJAN_CONFIG_FILE_PATH.to_str().unwrap()
+            trojan_config_path.to_str().unwrap()
         );
 
         debug!("添加开机启动脚本");

src-tauri/src/setup.rs

@@ -13,10 +13,10 @@ pub(super) fn setup_logging() {
 
     #[cfg(all(desktop, not(debug_assertions)))]
     let writer = {
-        use crate::global::APP_CONFIG_DIR;
+        use crate::global::APP_NAME;
         use std::{fs::File, sync::Mutex};
-        let log_file =
-            File::create(APP_CONFIG_DIR.join("lsar.log")).expect("Failed to create the log file");
+        let dir = dirs::config_dir().unwrap().join(APP_NAME);
+        let log_file = File::create(dir.join("lsar.log")).expect("Failed to create the log file");
         Mutex::new(log_file)
     };