format

s

f

Author: Mikachu2333

build.rs

@@ -19,7 +19,7 @@ fn main() {
         res.set("FileDescription", "Starter for ScreenCapture");
         res.set(
             "LegalCopyright",
-            "Copyright (C) Mikachu2333 2025. MIT License.",
+            "Copyright (C) Mikachu2333 2025-2026. MIT License.",
         );
 
         if let Err(e) = res.compile() {

src/config.rs

@@ -16,7 +16,7 @@ use std::{
     path::{Path, PathBuf},
 };
 use toml::Value;
-use toml_edit::{value, DocumentMut};
+use toml_edit::{value, DocumentMut, Item, Table};
 
 /// 读取并解析TOML配置文件
 ///
@@ -114,41 +114,68 @@ fn write_config(conf_path: &PathBuf, settings: &SettingsCollection, original_con
         doc["gui"] = toml_edit::table();
     }
 
-    // 写入 hotkey 配置
-    for (key, hv) in &settings.keys_collection {
-        doc["hotkey"][*key] = value(format_hotkey_for_config(hv));
+    // 写入 hotkey 配置（保留注释）
+    if let Some(hotkey_table) = doc.get_mut("hotkey").and_then(|v| v.as_table_mut()) {
+        for (key, hv) in &settings.keys_collection {
+            update_value_preserve_decor(hotkey_table, key, format_hotkey_for_config(hv));
+        }
     }
 
-    // 写入 path 配置
-    let save_path_str = if settings.path.save_path.as_os_str().is_empty() {
-        "&".to_string()
-    } else {
-        normalize_path_for_config(&settings.path.save_path)
-    };
-    doc["path"]["dir"] = value(save_path_str);
-    doc["path"]["launch_app_path"] =
-        value(normalize_path_for_config(&settings.path.launch_app.path));
-    doc["path"]["launch_app_args"] = value(settings.path.launch_app.args.join("\t"));
-    doc["path"]["last_path"] = value(settings.path.last_path);
-
-    // 写入 sundry 配置
-    doc["sundry"]["startup"] = value(settings.sundry.auto_start);
-    doc["sundry"]["comp_level"] = value(settings.sundry.comp_level as i64);
-    doc["sundry"]["scale_ratio"] = value(settings.sundry.scale_level as i64);
-    doc["sundry"]["lang"] = value(if settings.sundry.lang { 1i64 } else { 0i64 });
-
-    // 写入 gui 配置
+    // 写入 path 配置（保留注释）
+    if let Some(path_table) = doc.get_mut("path").and_then(|v| v.as_table_mut()) {
+        let save_path_str = if settings.path.save_path.as_os_str().is_empty() {
+            "&".to_string()
+        } else {
+            normalize_path_for_config(&settings.path.save_path)
+        };
+        update_value_preserve_decor(path_table, "dir", save_path_str);
+        update_value_preserve_decor(
+            path_table,
+            "launch_app_path",
+            normalize_path_for_config(&settings.path.launch_app.path),
+        );
+        update_value_preserve_decor(
+            path_table,
+            "launch_app_args",
+            settings.path.launch_app.args.join("\t"),
+        );
+        update_bool_preserve_decor(path_table, "last_path", settings.path.last_path);
+    }
+
+    // 写入 sundry 配置（保留注释）
+    if let Some(sundry_table) = doc.get_mut("sundry").and_then(|v| v.as_table_mut()) {
+        update_bool_preserve_decor(sundry_table, "startup", settings.sundry.auto_start);
+        update_int_preserve_decor(
+            sundry_table,
+            "comp_level",
+            settings.sundry.comp_level as i64,
+        );
+        update_int_preserve_decor(
+            sundry_table,
+            "scale_ratio",
+            settings.sundry.scale_level as i64,
+        );
+        update_int_preserve_decor(
+            sundry_table,
+            "lang",
+            if settings.sundry.lang { 1i64 } else { 0i64 },
+        );
+    }
+
+    // 写入 gui 配置（保留注释）
     // 从 "--tool:\"xxx\"" 格式中提取原始值
     let extract_gui_value = |s: &str| -> String {
         s.trim_start_matches("--tool:\"")
             .trim_end_matches('"')
             .to_string()
     };
-    if let Some(normal) = settings.gui.get("normal") {
-        doc["gui"]["gui_config"] = value(extract_gui_value(normal));
-    }
-    if let Some(long) = settings.gui.get("long") {
-        doc["gui"]["long_gui_config"] = value(extract_gui_value(long));
+    if let Some(gui_table) = doc.get_mut("gui").and_then(|v| v.as_table_mut()) {
+        if let Some(normal) = settings.gui.get("normal") {
+            update_value_preserve_decor(gui_table, "gui_config", extract_gui_value(normal));
+        }
+        if let Some(long) = settings.gui.get("long") {
+            update_value_preserve_decor(gui_table, "long_gui_config", extract_gui_value(long));
+        }
     }
 
     // 写回文件
@@ -157,6 +184,45 @@ fn write_config(conf_path: &PathBuf, settings: &SettingsCollection, original_con
     }
 }
 
+/// 更新表中的字符串值，保留原有的注释装饰
+fn update_value_preserve_decor(table: &mut Table, key: &str, new_value: String) {
+    if let Some(Item::Value(v)) = table.get_mut(key) {
+        // 保存原有的装饰（注释）
+        let decor = v.decor().clone();
+        // 创建新值并应用装饰
+        let mut new_val = toml_edit::Value::from(new_value);
+        *new_val.decor_mut() = decor;
+        *v = new_val;
+        return;
+    }
+    // 键不存在，直接插入新值
+    table[key] = value(new_value);
+}
+
+/// 更新表中的布尔值，保留原有的注释装饰
+fn update_bool_preserve_decor(table: &mut Table, key: &str, new_value: bool) {
+    if let Some(Item::Value(v)) = table.get_mut(key) {
+        let decor = v.decor().clone();
+        let mut new_val = toml_edit::Value::from(new_value);
+        *new_val.decor_mut() = decor;
+        *v = new_val;
+        return;
+    }
+    table[key] = value(new_value);
+}
+
+/// 更新表中的整数值，保留原有的注释装饰
+fn update_int_preserve_decor(table: &mut Table, key: &str, new_value: i64) {
+    if let Some(Item::Value(v)) = table.get_mut(key) {
+        let decor = v.decor().clone();
+        let mut new_val = toml_edit::Value::from(new_value);
+        *new_val.decor_mut() = decor;
+        *v = new_val;
+        return;
+    }
+    table[key] = value(new_value);
+}
+
 /// 将 HotkeyValue 格式化为配置文件格式
 ///
 /// ### 参数

src/file_ops.rs

@@ -112,17 +112,14 @@ static RES_CONF: &[u8] = include_bytes!("../res/config.toml");
 /// * 如果配置文件不存在，释放配置文件并执行初始化操作
 /// * 首次释放配置文件后会自动打开配置文件并提示重启程序
 pub fn unzip_res(paths: &PathInfos, exists: &FileExist) {
-    let screen_capture_res = RES_EXE;
-    let config_res = RES_CONF;
-
     if (!exists.exe_exist) || (!exists.exe_latest) {
-        fs::write(&paths.exe_path, screen_capture_res).expect("Error write EXE file.");
+        fs::write(&paths.exe_path, RES_EXE).expect("Error write EXE file.");
         println!("EXE: Release exe file.");
     } else {
         println!("EXE: No need to release.");
     }
     if !exists.conf_exist {
-        fs::write(&paths.conf_path, config_res).expect("Error write config file.");
+        fs::write(&paths.conf_path, RES_CONF).expect("Error write config file.");
         println!("CONF: Release config file.");
         operate_exe(&paths.conf_path, "conf", HashMap::new());
         operate_exe(Path::new(""), "restart", HashMap::new());
@@ -183,15 +180,13 @@ impl OperateMode for Vec<String> {
 /// ### 参数
 /// - `path`: 要操作的程序路径
 /// - `mode`: 操作模式字符串
-/// - `gui`: GUI相关参数的HashMap，包含normal和long模式的参数
+/// - `gui`: GUI相关参数（保留参数，用于兼容trait签名）
 ///
 /// ### 操作模式
 /// - `pin`: 启动钉图功能，从剪贴板获取图像并钉在屏幕上
-/// - `exit`: 退出程序，显示退出消息后终止进程
 /// - `conf`: 使用记事本打开配置文件进行编辑
 /// - `restart`: 显示重启提示消息并退出程序
-/// - 其他参数模式: 执行截屏相关操作，支持按'*'分割的多参数格式
-fn execute_string_mode(path: &Path, mode: &str, gui: HashMap<String, String>) {
+fn execute_string_mode(path: &Path, mode: &str, _gui: HashMap<String, String>) {
     match mode {
         "pin" => {
             let _ = Command::new(path).arg("--pin:clipboard").spawn();
@@ -213,31 +208,9 @@ fn execute_string_mode(path: &Path, mode: &str, gui: HashMap<String, String>) {
             );
             std::process::exit(0);
         }
-        parm => {
-            let default_empty = String::new();
-            println!("parm: {:?}\narg: {:?}\n", parm, gui.clone());
-            let gui_arg = if parm.contains("long") {
-                gui.get("long").unwrap_or(&default_empty)
-            } else {
-                gui.get("normal").unwrap_or(&default_empty)
-            };
-            if parm.contains('*') {
-                // 包含多个参数，按'*'分割
-                let temp = parm.split('*').map(String::from);
-                let mut cmd = Command::new(path);
-                cmd.args(temp);
-                if !gui_arg.is_empty() {
-                    cmd.arg(gui_arg);
-                }
-                let _ = cmd.spawn();
-            } else {
-                // 单个参数
-                let mut cmd = Command::new(path);
-                if !gui_arg.is_empty() {
-                    cmd.arg(gui_arg);
-                }
-                let _ = cmd.spawn();
-            }
+        _ => {
+            // 未知模式，忽略
+            eprintln!("Unknown operate mode: {}", mode);
         }
     }
 }

src/hotkeys.rs

@@ -75,8 +75,6 @@ pub fn set_hotkeys(
 
         // 为截屏快捷键准备共享状态的克隆
         let current_path_sc = current_save_path.clone();
-        let use_last_path_sc = use_last_path;
-        let default_save_path_sc = save_path.clone();
 
         // 注册截屏快捷键
         let hotkey_sc = hkm.register(
@@ -91,17 +89,6 @@ pub fn set_hotkeys(
 
                 let args = crate::file_ops::build_capture_args(comp_val, scale_val, &path_to_use, false);
                 operate_exe(&exe_path_clone, args, gui_clone.clone());
-
-                // 如果启用了 last_path 功能且路径非空，更新配置
-                if use_last_path_sc && !path_to_use.as_os_str().is_empty() {
-                    // 更新共享状态（如果路径来自默认配置，首次使用后记录）
-                    {
-                        let mut guard = current_path_sc.lock().unwrap();
-                        if guard.as_os_str().is_empty() {
-                            *guard = default_save_path_sc.clone();
-                        }
-                    }
-                }
             },
         );
         if hotkey_sc.is_err() {
@@ -205,8 +192,6 @@ pub fn set_hotkeys(
 
         // 为截长屏快捷键准备共享状态的克隆
         let current_path_scl = current_save_path.clone();
-        let use_last_path_scl = use_last_path;
-        let default_save_path_scl = save_path.clone();
 
         // 注册截长屏快捷键
         let hotkey_scl = hkm.register(
@@ -221,16 +206,6 @@ pub fn set_hotkeys(
 
                 let args = crate::file_ops::build_capture_args(comp_val2, scale_val2, &path_to_use, true);
                 operate_exe(&exe_path_clone, args, gui_clone.clone());
-
-                // 如果启用了 last_path 功能且路径非空，更新配置
-                if use_last_path_scl && !path_to_use.as_os_str().is_empty() {
-                    {
-                        let mut guard = current_path_scl.lock().unwrap();
-                        if guard.as_os_str().is_empty() {
-                            *guard = default_save_path_scl.clone();
-                        }
-                    }
-                }
             },
         );
         if hotkey_scl.is_err() {

src/types.rs

@@ -198,7 +198,7 @@ impl SettingsCollection {
     fn key_str(&self, key: &str) -> String {
         self.keys_collection
             .get(key)
-            .map(|v| v.to_string().replace("\"", ""))
+            .map(|v| v.to_string())
             .unwrap()
     }
 
@@ -325,13 +325,9 @@ pub struct HotkeyValue {
 }
 impl std::fmt::Display for HotkeyValue {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mods_str: Vec<String> = self
-            .mod_keys
-            .iter()
-            .map(|m| format!("{:?}", m.to_string()))
-            .collect();
+        let mods_str: Vec<String> = self.mod_keys.iter().map(|m| m.to_string()).collect();
 
-        write!(f, "{}@{:?}", mods_str.join("+"), self.vkey.to_string())
+        write!(f, "{}@{}", mods_str.join("+"), self.vkey)
     }
 }