mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-07-29 09:37:37 +08:00
refactor(startup): improve first-launch import logic with per-table detection
- Replace global `is_empty_for_first_import()` with independent checks: - `is_mcp_table_empty()` for MCP server imports - `is_prompts_table_empty()` for prompt imports - Skills and providers already have built-in idempotency checks - Fix misleading logs in provider import: - Change `import_default_config` return type from `Result<()>` to `Result<bool>` - Return `true` when actually imported, `false` when skipped - Only log success message when import actually occurred - Add idempotency protection to `import_from_file_on_first_launch` This allows each data type to be independently recovered if deleted, rather than requiring all tables to be empty for any import to trigger.
This commit is contained in:
@@ -115,28 +115,21 @@ impl Database {
|
||||
Ok(db)
|
||||
}
|
||||
|
||||
/// 检查数据库是否为空(需要首次导入)
|
||||
///
|
||||
/// 通过检查是否有任何 MCP 服务器、提示词、Skills 仓库或供应商来判断
|
||||
pub fn is_empty_for_first_import(&self) -> Result<bool, AppError> {
|
||||
/// 检查 MCP 服务器表是否为空
|
||||
pub fn is_mcp_table_empty(&self) -> Result<bool, AppError> {
|
||||
let conn = lock_conn!(self.conn);
|
||||
|
||||
let mcp_count: i64 = conn
|
||||
let count: i64 = conn
|
||||
.query_row("SELECT COUNT(*) FROM mcp_servers", [], |row| row.get(0))
|
||||
.map_err(|e| AppError::Database(e.to_string()))?;
|
||||
Ok(count == 0)
|
||||
}
|
||||
|
||||
let prompt_count: i64 = conn
|
||||
/// 检查提示词表是否为空
|
||||
pub fn is_prompts_table_empty(&self) -> Result<bool, AppError> {
|
||||
let conn = lock_conn!(self.conn);
|
||||
let count: i64 = conn
|
||||
.query_row("SELECT COUNT(*) FROM prompts", [], |row| row.get(0))
|
||||
.map_err(|e| AppError::Database(e.to_string()))?;
|
||||
|
||||
let skill_repo_count: i64 = conn
|
||||
.query_row("SELECT COUNT(*) FROM skill_repos", [], |row| row.get(0))
|
||||
.map_err(|e| AppError::Database(e.to_string()))?;
|
||||
|
||||
let provider_count: i64 = conn
|
||||
.query_row("SELECT COUNT(*) FROM providers", [], |row| row.get(0))
|
||||
.map_err(|e| AppError::Database(e.to_string()))?;
|
||||
|
||||
Ok(mcp_count == 0 && prompt_count == 0 && skill_repo_count == 0 && provider_count == 0)
|
||||
Ok(count == 0)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user