admin/CC-Switch
1
0
Fork 0
mirror of https://github.com/farion1231/cc-switch.git synced 2026-08-01 04:02:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve rustfmt formatting and clippy warnings

Browse Source 
- Apply cargo fmt across schema.rs, session_usage*.rs, skill.rs, usage_stats.rs
- Fix clippy::for_kv_map: use messages.values() instead of (_, msg) pattern
- Suppress clippy::only_used_in_recursion for intentional recursive base path
- Fix prettier formatting in UsageScriptModal.tsx
This commit is contained in:
Jason
2026-04-06 23:37:35 +08:00
parent d33d63e4df
commit 697d0dd6e1
7 changed files with 150 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/services/session_usage_gemini.rs
+10 -22
View File
@@ -182,10 +182,7 @@ fn sync_single_gemini_file(db: &Database, file_path: &Path) -> Result<(u32, u32)
gemini_msg_count += 1;
// 提取消息 ID 和模型
let message_id = msg
.get("id")
.and_then(|v| v.as_str())
.unwrap_or("unknown");
let message_id = msg.get("id").and_then(|v| v.as_str()).unwrap_or("unknown");
let model = msg
.get("model")
.and_then(|v| v.as_str())
@@ -222,22 +219,10 @@ fn sync_single_gemini_file(db: &Database, file_path: &Path) -> Result<(u32, u32)
/// 从 tokens JSON 对象中提取 token 数据
fn parse_gemini_tokens(tokens: &serde_json::Value) -> GeminiTokens {
GeminiTokens {
input: tokens
.get("input")
.and_then(|v| v.as_u64())
.unwrap_or(0) as u32,
output: tokens
.get("output")
.and_then(|v| v.as_u64())
.unwrap_or(0) as u32,
cached: tokens
.get("cached")
.and_then(|v| v.as_u64())
.unwrap_or(0) as u32,
thoughts: tokens
.get("thoughts")
.and_then(|v| v.as_u64())
.unwrap_or(0) as u32,
input: tokens.get("input").and_then(|v| v.as_u64()).unwrap_or(0) as u32,
output: tokens.get("output").and_then(|v| v.as_u64()).unwrap_or(0) as u32,
cached: tokens.get("cached").and_then(|v| v.as_u64()).unwrap_or(0) as u32,
thoughts: tokens.get("thoughts").and_then(|v| v.as_u64()).unwrap_or(0) as u32,
}
}
@@ -494,7 +479,9 @@ mod tests {
assert_eq!(tokens.input, 0);
assert_eq!(tokens.output, 0);
// 全零（包括 cached=0）会被 sync 逻辑跳过
assert!(tokens.input == 0 && tokens.output == 0 && tokens.thoughts == 0 && tokens.cached == 0);
assert!(
tokens.input == 0 && tokens.output == 0 && tokens.thoughts == 0 && tokens.cached == 0
);
}
#[test]
@@ -509,7 +496,8 @@ mod tests {
let tokens = parse_gemini_tokens(&json);
assert_eq!(tokens.cached, 5000);
// 跳过条件：所有四个字段都为 0 才跳过
let should_skip = tokens.input == 0 && tokens.output == 0 && tokens.thoughts == 0 && tokens.cached == 0;
let should_skip =
tokens.input == 0 && tokens.output == 0 && tokens.thoughts == 0 && tokens.cached == 0;
assert!(!should_skip, "纯缓存命中记录不应被跳过");
}
}