Serendipity/PathEditor
1
1
Fork 0
mirror of https://github.com/LHY0125/PathEditor.git synced 2026-06-29 09:55:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor: 全面代码质量提升 — StringList→string[], strict 模式, 死代码清理

Browse Source 
架构重构:
- StringList 类替换为不可变 string[]（消除 dataVersion hack，Zustand 自然检测变化）
- UndoRedoManager.undo/redo 返回新数组而非原地修改
- 删除 dataVersion 字段和 _bumpVersion()
- 启用 TypeScript strict 模式

死代码清理:
- 删除 string-list.ts, string-list.test.ts, use-path-validation.ts
- Rust AppError 保留供未来使用

功能修复:
- importFromJson 添加 try/catch
- handleClean 使用真实格式验证替代 () => true
- savePaths 保存前调用 backup_registry，处理部分保存失败
- importFromJson 校验非 object 类型输入

i18n 完善:
- MergePreview/StatusBar 硬编码中文 → t() 调用
- 新增 merge.* 和 status.* 翻译键

Rust 改进:
- registry.rs 抽取 load_paths/save_paths 通用函数，消除重复
- registry 新增 6 个单元测试（split/join/roundtrip）
- backup.rs 时间戳加毫秒防覆盖，回退路径改为 home_dir

元数据:
- package.json 名称→patheditor, 版本→4.0.0
- 新增 CHANGELOG.md
- 移除 UndoRedoButtons 废弃注释
- tsconfig 添加 strict:true

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
刘航宇
2026-05-26 00:26:27 +08:00
parent 2ceec54790
commit bfd114d80f
21 changed files with 410 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/commands/backup.rs
+3 -2
View File
@@ -6,7 +6,8 @@ use std::path::PathBuf;
#[tauri::command]
pub fn get_appdata_dir() -> String {
dirs::data_dir()
.unwrap_or_else(|| PathBuf::from("C:\\"))
.or_else(dirs::home_dir)
.unwrap_or_else(|| PathBuf::from("."))
.join("PathEditor")
.join("backups")
.to_string_lossy()
@@ -33,7 +34,7 @@ pub fn backup_registry(custom_dir: Option<String>, sys_paths: Vec<String>, user_
.map_err(|e| format!("无法创建备份目录: {}", e))?;
// 生成带时间戳的文件名
let timestamp = Local::now().format("%Y%m%d_%H%M%S");
let timestamp = Local::now().format("%Y%m%d_%H%M%S_%3f");
let filename = format!("path_backup_{}.txt", timestamp);
let filepath = backup_dir.join(&filename);
src-tauri/src/commands/registry.rs
+77 -50
View File
@@ -5,71 +5,54 @@ const SYS_REG_PATH: &str = "SYSTEM\\CurrentControlSet\\Control\\Session Manager\
const USER_REG_PATH: &str = "Environment";
const PATH_VALUE: &str = "Path";
/// 从注册表加载系统 PATH
fn load_paths(root: winreg::HKEY, sub_path: &str, label: &str) -> Result<Vec<String>, String> {
let key = RegKey::predef(root);
let env_key = key
.open_subkey_with_flags(sub_path, KEY_READ)
.map_err(|e| format!("无法打开{}注册表项: {}", label, e))?;
let value: String = env_key
.get_value(PATH_VALUE)
.map_err(|e| format!("无法读取{} PATH: {}", label, e))?;
Ok(split_path(&value))
}
fn save_paths(root: winreg::HKEY, sub_path: &str, label: &str, paths: &[String]) -> Result<(), String> {
let key = RegKey::predef(root);
let env_key = key
.open_subkey_with_flags(sub_path, KEY_WRITE)
.map_err(|e| format!("无法写入{}注册表（需要管理员权限）: {}", label, e))?;
let value = join_path(paths);
env_key
.set_value(PATH_VALUE, &value)
.map_err(|e| format!("无法写入{} PATH: {}", label, e))?;
log::info!("已保存{} PATH，{} 个条目", label, paths.len());
Ok(())
}
#[tauri::command]
pub fn load_system_paths() -> Result<Vec<String>, String> {
let hklm = RegKey::predef(HKEY_LOCAL_MACHINE);
let env_key = hklm
.open_subkey_with_flags(SYS_REG_PATH, KEY_READ)
.map_err(|e| format!("无法打开系统注册表项: {}", e))?;
let value: String = env_key
.get_value(PATH_VALUE)
.map_err(|e| format!("无法读取系统 PATH: {}", e))?;
Ok(split_path(&value))
load_paths(HKEY_LOCAL_MACHINE, SYS_REG_PATH, "系统")
}
/// 从注册表加载用户 PATH
#[tauri::command]
pub fn load_user_paths() -> Result<Vec<String>, String> {
let hkcu = RegKey::predef(HKEY_CURRENT_USER);
let env_key = hkcu
.open_subkey_with_flags(USER_REG_PATH, KEY_READ)
.map_err(|e| format!("无法打开用户注册表项: {}", e))?;
let value: String = env_key
.get_value(PATH_VALUE)
.map_err(|e| format!("无法读取用户 PATH: {}", e))?;
Ok(split_path(&value))
load_paths(HKEY_CURRENT_USER, USER_REG_PATH, "用户")
}
/// 保存系统 PATH 到注册表
#[tauri::command]
pub fn save_system_paths(paths: Vec<String>) -> Result<(), String> {
let hklm = RegKey::predef(HKEY_LOCAL_MACHINE);
let env_key = hklm
.open_subkey_with_flags(SYS_REG_PATH, KEY_WRITE)
.map_err(|e| format!("无法写入系统注册表（需要管理员权限）: {}", e))?;
let value = join_path(&paths);
env_key
.set_value(PATH_VALUE, &value)
.map_err(|e| format!("无法写入系统 PATH: {}", e))?;
log::info!("已保存系统 PATH，{} 个条目", paths.len());
Ok(())
save_paths(HKEY_LOCAL_MACHINE, SYS_REG_PATH, "系统", &paths)
}
/// 保存用户 PATH 到注册表
#[tauri::command]
pub fn save_user_paths(paths: Vec<String>) -> Result<(), String> {
let hkcu = RegKey::predef(HKEY_CURRENT_USER);
let env_key = hkcu
.open_subkey_with_flags(USER_REG_PATH, KEY_WRITE)
.map_err(|e| format!("无法写入用户注册表: {}", e))?;
let value = join_path(&paths);
env_key
.set_value(PATH_VALUE, &value)
.map_err(|e| format!("无法写入用户 PATH: {}", e))?;
log::info!("已保存用户 PATH，{} 个条目", paths.len());
Ok(())
save_paths(HKEY_CURRENT_USER, USER_REG_PATH, "用户", &paths)
}
/// 用分号分割 PATH 字符串
fn split_path(raw: &str) -> Vec<String> {
raw.split(';')
.map(|s| s.trim().to_string())
@@ -77,7 +60,6 @@ fn split_path(raw: &str) -> Vec<String> {
.collect()
}
/// 用分号连接路径列表（去除首尾空格避免污染注册表）
fn join_path(paths: &[String]) -> String {
paths
.iter()
@@ -86,3 +68,48 @@ fn join_path(paths: &[String]) -> String {
.collect::<Vec<_>>()
.join(";")
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn split_empty() {
assert_eq!(split_path(""), Vec::<String>::new());
}
#[test]
fn split_single() {
assert_eq!(split_path("C:\\Windows"), vec!["C:\\Windows"]);
}
#[test]
fn split_multiple() {
assert_eq!(
split_path("C:\\Windows;D:\\Projects"),
vec!["C:\\Windows", "D:\\Projects"]
);
}
#[test]
fn split_trims_and_filters_empty() {
assert_eq!(
split_path(" C:\\ ; ; D:\\ "),
vec!["C:\\", "D:\\"]
);
}
#[test]
fn join_and_split_roundtrip() {
let paths = vec!["C:\\Windows".to_string(), "D:\\Projects".to_string()];
let joined = join_path(&paths);
let split = split_path(&joined);
assert_eq!(split, paths);
}
#[test]
fn join_trims_entries() {
let paths = vec![" C:\\Windows ".to_string(), " D:\\ ".to_string()];
assert_eq!(join_path(&paths), "C:\\Windows;D:\\");
}
}