This commit is contained in:
lychang
2026-03-22 10:53:25 +08:00
parent f3ae54a26b
commit 743d23cfee
2 changed files with 80 additions and 36 deletions

View File

@@ -57,52 +57,32 @@ pub async fn import_existing_data(config: &Config, db: Arc<Database>) -> Result<
return Ok(());
}
// 第二阶段:并行处理相册导入
let mut tasks = Vec::new();
// 限制并发数量,避免内存爆炸
let max_concurrent = std::thread::available_parallelism()?.get().min(4);
let semaphore = Arc::new(tokio::sync::Semaphore::new(max_concurrent));
for (folder_name, path) in album_folders {
let db_clone = Arc::clone(&db);
let semaphore_clone = Arc::clone(&semaphore);
let folder_name_clone = folder_name.clone();
let path_clone = path.clone();
let task = task::spawn(async move {
let _permit = semaphore_clone.acquire().await.unwrap();
match import_single_album(&db_clone, &folder_name_clone, &path_clone).await {
Ok(count) => {
println!("✅ 相册 {} 导入完成,共导入 {} 张图片", folder_name_clone, count);
count
}
Err(e) => {
eprintln!("❌ 相册 {} 导入失败: {}", folder_name_clone, e);
0
}
}
});
tasks.push(task);
}
// 等待所有任务完成
// 第二阶段:串行处理相册导入,避免数据库死锁
// 对于SQLite,高并发写入容易导致死锁,改为串行处理
let mut total_imported = 0;
let mut successful_albums = 0;
for task in tasks {
match task.await {
for (folder_name, path) in album_folders {
println!("📁 开始导入相册: {}", folder_name);
match import_single_album(&db, &folder_name, &path).await {
Ok(count) => {
if count > 0 {
successful_albums += 1;
total_imported += count;
println!("✅ 相册 {} 导入完成,共导入 {} 张图片", folder_name, count);
} else {
println!("⚠️ 相册 {} 没有图片需要导入", folder_name);
}
}
Err(e) => {
eprintln!("任务执行失败: {}", e);
eprintln!("❌ 相册 {} 导入失败: {}", folder_name, e);
// 继续处理下一个相册,不中断整个导入过程
}
}
// 在每个相册导入后添加短暂延迟,减少数据库压力
tokio::time::sleep(std::time::Duration::from_millis(100)).await;
}
println!("🎉 导入完成!成功导入 {} 个相册,共 {} 张图片", successful_albums, total_imported);