Files
cc-switch/src-tauri/src/settings.rs
T
Jason 1cc0e4bc8d refactor(backend): complete phase 1 - unified error handling (100%)
Completed the remaining migrations for Phase 1 of backend refactoring plan,
achieving 100% coverage of unified error handling with AppError.

## Changes

### Fully Migrated Modules (Result<T, String> → Result<T, AppError>)

- **claude_plugin.rs** (35 lines changed)
  - Migrated 7 public functions: claude_config_path, ensure_claude_dir_exists,
    read_claude_config, write_claude_config, clear_claude_config,
    claude_config_status, is_claude_config_applied
  - Used AppError::io(), AppError::JsonSerialize, AppError::Config
  - Simplified error handling with helper functions

- **settings.rs** (14 lines changed)
  - Migrated AppSettings::save() and update_settings()
  - Used AppError::io() for file operations
  - Used AppError::JsonSerialize for JSON serialization

- **import_export.rs** (67 lines changed)
  - Migrated 8 functions: create_backup, cleanup_old_backups,
    sync_current_providers_to_live, sync_current_provider_for_app,
    sync_codex_live, sync_claude_live, export_config_to_file,
    import_config_from_file, sync_current_providers_live
  - Used AppError::io(), AppError::json(), AppError::Config
  - Added proper error context with file paths and provider IDs
  - Used AppError::Message for temporary bridge with String-based APIs

### Adapted Interface Calls

- **commands.rs** (30 lines changed)
  - Updated 15 Tauri command handlers to use .map_err(|e| e.to_string())
  - Changed from implicit Into::into to explicit e.to_string()
  - Maintained Result<T, String> interface for Tauri (frontend compatibility)
  - Affected commands: Claude MCP (5), Claude plugin (5), settings (1)

- **mcp.rs** (2 lines changed)
  - Updated claude_mcp::set_mcp_servers_map call
  - Changed from .map_err(Into::into) to .map_err(|e| e.to_string())

## Statistics

- Files changed: 5
- Lines changed: +82/-66 (net +16)
- Compilation:  Success (8.42s, 0 warnings)
- Tests:  4/4 passed

## Benefits

- **Type Safety**: All infrastructure modules now use strongly-typed AppError
- **Error Context**: File paths and operation types preserved in error chain
- **Code Quality**: Removed ~30 instances of .map_err(|e| format!("...", e))
- **Maintainability**: Consistent error handling pattern across codebase
- **Debugging**: Error source chain preserved with #[source] attribute

## Phase 1 Status:  100% Complete

All modules migrated:
-  config.rs (Phase 1.1)
-  claude_mcp.rs (Phase 1.1)
-  codex_config.rs (Phase 1.1)
-  app_config.rs (Phase 1.1)
-  store.rs (Phase 1.1)
-  claude_plugin.rs (Phase 1.2)
-  settings.rs (Phase 1.2)
-  import_export.rs (Phase 1.2)
-  commands.rs (interface adaptation complete)
-  mcp.rs (interface adaptation complete)

Ready for Phase 2: Splitting commands.rs by domain.

Co-authored-by: Claude <noreply@anthropic.com>
2025-10-27 16:48:08 +08:00

189 lines
5.7 KiB
Rust

use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::fs;
use std::path::PathBuf;
use std::sync::{OnceLock, RwLock};
use crate::error::AppError;
/// 自定义端点配置
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct CustomEndpoint {
pub url: String,
pub added_at: i64,
#[serde(skip_serializing_if = "Option::is_none")]
pub last_used: Option<i64>,
}
/// 应用设置结构,允许覆盖默认配置目录
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct AppSettings {
#[serde(default = "default_show_in_tray")]
pub show_in_tray: bool,
#[serde(default = "default_minimize_to_tray_on_close")]
pub minimize_to_tray_on_close: bool,
/// 是否启用 Claude 插件联动
#[serde(default)]
pub enable_claude_plugin_integration: bool,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub claude_config_dir: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub codex_config_dir: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub language: Option<String>,
/// Claude 自定义端点列表
#[serde(default, skip_serializing_if = "HashMap::is_empty")]
pub custom_endpoints_claude: HashMap<String, CustomEndpoint>,
/// Codex 自定义端点列表
#[serde(default, skip_serializing_if = "HashMap::is_empty")]
pub custom_endpoints_codex: HashMap<String, CustomEndpoint>,
}
fn default_show_in_tray() -> bool {
true
}
fn default_minimize_to_tray_on_close() -> bool {
true
}
impl Default for AppSettings {
fn default() -> Self {
Self {
show_in_tray: true,
minimize_to_tray_on_close: true,
enable_claude_plugin_integration: false,
claude_config_dir: None,
codex_config_dir: None,
language: None,
custom_endpoints_claude: HashMap::new(),
custom_endpoints_codex: HashMap::new(),
}
}
}
impl AppSettings {
fn settings_path() -> PathBuf {
// settings.json 必须使用固定路径,不能被 app_config_dir 覆盖
// 否则会造成循环依赖:读取 settings 需要知道路径,但路径在 settings 中
dirs::home_dir()
.expect("无法获取用户主目录")
.join(".cc-switch")
.join("settings.json")
}
fn normalize_paths(&mut self) {
self.claude_config_dir = self
.claude_config_dir
.as_ref()
.map(|s| s.trim())
.filter(|s| !s.is_empty())
.map(|s| s.to_string());
self.codex_config_dir = self
.codex_config_dir
.as_ref()
.map(|s| s.trim())
.filter(|s| !s.is_empty())
.map(|s| s.to_string());
self.language = self
.language
.as_ref()
.map(|s| s.trim())
.filter(|s| matches!(*s, "en" | "zh"))
.map(|s| s.to_string());
}
pub fn load() -> Self {
let path = Self::settings_path();
if let Ok(content) = fs::read_to_string(&path) {
match serde_json::from_str::<AppSettings>(&content) {
Ok(mut settings) => {
settings.normalize_paths();
settings
}
Err(err) => {
log::warn!(
"解析设置文件失败,将使用默认设置。路径: {}, 错误: {}",
path.display(),
err
);
Self::default()
}
}
} else {
Self::default()
}
}
pub fn save(&self) -> Result<(), AppError> {
let mut normalized = self.clone();
normalized.normalize_paths();
let path = Self::settings_path();
if let Some(parent) = path.parent() {
fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
}
let json = serde_json::to_string_pretty(&normalized)
.map_err(|e| AppError::JsonSerialize { source: e })?;
fs::write(&path, json).map_err(|e| AppError::io(&path, e))?;
Ok(())
}
}
fn settings_store() -> &'static RwLock<AppSettings> {
static STORE: OnceLock<RwLock<AppSettings>> = OnceLock::new();
STORE.get_or_init(|| RwLock::new(AppSettings::load()))
}
fn resolve_override_path(raw: &str) -> PathBuf {
if raw == "~" {
if let Some(home) = dirs::home_dir() {
return home;
}
} else if let Some(stripped) = raw.strip_prefix("~/") {
if let Some(home) = dirs::home_dir() {
return home.join(stripped);
}
} else if let Some(stripped) = raw.strip_prefix("~\\") {
if let Some(home) = dirs::home_dir() {
return home.join(stripped);
}
}
PathBuf::from(raw)
}
pub fn get_settings() -> AppSettings {
settings_store().read().expect("读取设置锁失败").clone()
}
pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
new_settings.normalize_paths();
new_settings.save()?;
let mut guard = settings_store().write().expect("写入设置锁失败");
*guard = new_settings;
Ok(())
}
pub fn get_claude_override_dir() -> Option<PathBuf> {
let settings = settings_store().read().ok()?;
settings
.claude_config_dir
.as_ref()
.map(|p| resolve_override_path(p))
}
pub fn get_codex_override_dir() -> Option<PathBuf> {
let settings = settings_store().read().ok()?;
settings
.codex_config_dir
.as_ref()
.map(|p| resolve_override_path(p))
}