diff --git a/src-tauri/src/auto_launch.rs b/src-tauri/src/auto_launch.rs index 26c1d5c33..c69ae46ad 100644 --- a/src-tauri/src/auto_launch.rs +++ b/src-tauri/src/auto_launch.rs @@ -75,8 +75,7 @@ mod tests { #[cfg(target_os = "macos")] #[test] fn test_get_macos_app_bundle_path_valid() { - let exe_path = - std::path::Path::new("/Applications/CC Switch.app/Contents/MacOS/CC Switch"); + let exe_path = std::path::Path::new("/Applications/CC Switch.app/Contents/MacOS/CC Switch"); let result = get_macos_app_bundle_path(exe_path); assert_eq!( result, @@ -92,7 +91,9 @@ mod tests { let result = get_macos_app_bundle_path(exe_path); assert_eq!( result, - Some(std::path::PathBuf::from("/Users/test/My Apps/CC Switch.app")) + Some(std::path::PathBuf::from( + "/Users/test/My Apps/CC Switch.app" + )) ); } diff --git a/src-tauri/src/database/dao/universal_providers.rs b/src-tauri/src/database/dao/universal_providers.rs index 32c955009..a822e23ee 100644 --- a/src-tauri/src/database/dao/universal_providers.rs +++ b/src-tauri/src/database/dao/universal_providers.rs @@ -12,22 +12,22 @@ const UNIVERSAL_PROVIDERS_KEY: &str = "universal_providers"; impl Database { /// 获取所有统一供应商 - pub fn get_all_universal_providers(&self) -> Result, AppError> { + pub fn get_all_universal_providers( + &self, + ) -> Result, AppError> { let conn = lock_conn!(self.conn); - + let mut stmt = conn .prepare("SELECT value FROM settings WHERE key = ?") .map_err(|e| AppError::Database(e.to_string()))?; - + let result: Option = stmt .query_row([UNIVERSAL_PROVIDERS_KEY], |row| row.get(0)) .ok(); - + match result { - Some(json) => { - serde_json::from_str(&json) - .map_err(|e| AppError::Database(format!("解析统一供应商数据失败: {e}"))) - } + Some(json) => serde_json::from_str(&json) + .map_err(|e| AppError::Database(format!("解析统一供应商数据失败: {e}"))), None => Ok(HashMap::new()), } } @@ -62,14 +62,13 @@ impl Database { ) -> Result<(), AppError> { let conn = lock_conn!(self.conn); let json = to_json_string(providers)?; - + conn.execute( "INSERT OR REPLACE INTO settings (key, value) VALUES (?, ?)", [UNIVERSAL_PROVIDERS_KEY, &json], ) .map_err(|e| AppError::Database(e.to_string()))?; - + Ok(()) } } -