update code level

This commit is contained in:
lychang
2026-03-23 02:38:17 +08:00
parent 743d23cfee
commit 4115c04107
8 changed files with 662 additions and 95 deletions

View File

@@ -4,6 +4,7 @@ use std::sync::Arc;
use image::GenericImageView;
use serde::Deserialize;
use tokio::task;
use uuid::Uuid;
use crate::config::Config;
use crate::database::Database;
use crate::models::*;
@@ -25,14 +26,59 @@ pub async fn import_existing_data(config: &Config, db: Arc<Database>) -> Result<
}
// 获取数据库中现有的相册列表
let existing_albums = db.get_all_albums().await?;
let existing_albums = db.get_all_albums(None, None).await?;
let existing_titles: Vec<String> = existing_albums.iter()
.map(|album| album.document.to_lowercase())
.collect();
println!("数据库中现有相册数量: {}", existing_albums.len());
// 第一阶段:快速扫描所有相册文件夹
// 第一阶段:检查并重新导入失败的相册
println!("🔍 检查需要重新导入的相册...");
let mut reimported_count = 0;
let mut deleted_count = 0;
for album in &existing_albums {
let album_folder_path = albums_dir.join(&album.document);
// 检查相册文件夹是否存在
if !album_folder_path.exists() {
// 文件夹不存在,删除数据库中的相册记录
println!("🗑️ 相册文件夹不存在,删除相册: {}", album.document);
if let Err(e) = db.delete_album(album.id).await {
eprintln!("❌ 删除相册失败: {}", e);
} else {
deleted_count += 1;
}
continue;
}
// 检查相册是否有图片
let image_count = db.get_album_image_count(album.id).await.unwrap_or(0);
if image_count == 0 {
// 相册存在但没有图片,尝试重新导入
println!("🔄 重新导入相册: {} (图片数量: 0)", album.document);
match reimport_single_album(&db, &album.document, &album_folder_path, album.id).await {
Ok(count) => {
if count > 0 {
reimported_count += 1;
println!("✅ 相册 {} 重新导入成功,导入 {} 张图片", album.document, count);
} else {
println!("⚠️ 相册 {} 重新导入但没有找到图片", album.document);
}
}
Err(e) => {
eprintln!("❌ 相册 {} 重新导入失败: {}", album.document, e);
}
}
}
}
if reimported_count > 0 || deleted_count > 0 {
println!("🎯 重新导入完成: 重新导入 {} 个相册,删除 {} 个相册", reimported_count, deleted_count);
}
// 第二阶段:快速扫描所有相册文件夹,导入新相册
let entries: Vec<_> = fs::read_dir(albums_dir)?.collect::<Result<Vec<_>, _>>()?;
let mut album_folders = Vec::new();
@@ -42,7 +88,6 @@ pub async fn import_existing_data(config: &Config, db: Arc<Database>) -> Result<
if let Some(folder_name) = path.file_name().and_then(|s| s.to_str()) {
// 检查是否已存在同名相册
if existing_titles.contains(&folder_name.to_lowercase()) {
println!("跳过已存在的相册: {}", folder_name);
continue;
}
album_folders.push((folder_name.to_string(), path));
@@ -222,6 +267,26 @@ async fn import_single_album(db: &Database, folder_name: &str, path: &Path) -> R
match db.add_images(images_to_insert).await {
Ok(ids) => {
println!(" 批量插入成功,共插入 {} 张图片", ids.len());
// 设置第一张图片为封面图片并生成缩略图
if let Some(first_image_id) = ids.first() {
println!(" 设置第一张图片为封面图片 (ID: {})...", first_image_id);
// 更新相册的封面图片ID
if let Err(e) = db.update_album_cover(album_id, Some(*first_image_id)).await {
eprintln!(" 更新相册封面失败: {}", e);
}
// 获取第一张图片的信息
if let Ok(Some(first_image)) = db.get_image(*first_image_id).await {
// 生成缩略图
match generate_thumbnail_for_image(&first_image, path, folder_name).await {
Ok(_) => println!(" 封面缩略图生成成功"),
Err(e) => eprintln!(" 封面缩略图生成失败: {}", e),
}
}
}
Ok(ids.len())
}
Err(e) => {
@@ -290,4 +355,161 @@ fn get_image_info(image_path: &Path) -> Result<(i64, i32, i32), Box<dyn std::err
let (width, height) = img.dimensions();
Ok((file_size, width as i32, height as i32))
}
/// 重新导入单个相册(使用现有的相册ID)
async fn reimport_single_album(
db: &Database,
folder_name: &str,
path: &Path,
album_id: Uuid,
) -> Result<usize, Box<dyn std::error::Error>> {
println!("📁 重新导入相册: {} (ID: {})", folder_name, album_id);
// 读取index.json文件
let index_file_path = path.join("index.json");
let album_title = if index_file_path.exists() {
match fs::read_to_string(&index_file_path) {
Ok(content) => {
match serde_json::from_str::<AlbumIndex>(&content) {
Ok(index) => index.title,
Err(_) => folder_name.to_string(),
}
}
Err(_) => folder_name.to_string(),
}
} else {
folder_name.to_string()
};
println!(" 相册标题: {}", album_title);
// 扫描图片文件
let mut images_to_insert = Vec::new();
let image_extensions = ["jpg", "jpeg", "png", "gif", "webp", "bmp"];
let entries: Vec<_> = fs::read_dir(path)?.collect::<Result<Vec<_>, _>>()?;
for entry in entries {
let file_path = entry.path();
if file_path.is_file() {
if let Some(extension) = file_path.extension().and_then(|ext| ext.to_str()) {
if image_extensions.contains(&extension.to_lowercase().as_str()) {
if let Some(filename) = file_path.file_name().and_then(|s| s.to_str()) {
// 跳过index.json文件
if filename == "index.json" {
continue;
}
// 获取图片信息
let (file_size, width, height) = match get_image_info(&file_path) {
Ok(info) => info,
Err(e) => {
eprintln!(" 获取图片信息失败 {}: {}", filename, e);
continue;
}
};
let image = CreateImage {
album_id,
filename: format!("{}/{}", folder_name, filename),
original_url: Some(format!("/images/{}/{}", folder_name, filename)),
title: Some(filename.to_string()),
description: Some(String::new()),
file_size,
width,
height,
mime_type: match extension.to_lowercase().as_str() {
"jpg" | "jpeg" => "image/jpeg".to_string(),
"png" => "image/png".to_string(),
"gif" => "image/gif".to_string(),
"webp" => "image/webp".to_string(),
"bmp" => "image/bmp".to_string(),
_ => "application/octet-stream".to_string(),
},
};
images_to_insert.push(image);
}
}
}
}
}
println!(" 发现 {} 张图片需要导入", images_to_insert.len());
// 批量插入图片
if !images_to_insert.is_empty() {
println!(" 批量插入 {} 张图片...", images_to_insert.len());
match db.add_images(images_to_insert).await {
Ok(ids) => {
println!(" 批量插入成功,共插入 {} 张图片", ids.len());
// 设置第一张图片为封面图片并生成缩略图
if let Some(first_image_id) = ids.first() {
println!(" 设置第一张图片为封面图片 (ID: {})...", first_image_id);
// 更新相册的封面图片ID
if let Err(e) = db.update_album_cover(album_id, Some(*first_image_id)).await {
eprintln!(" 更新相册封面失败: {}", e);
}
// 获取第一张图片的信息
if let Ok(Some(first_image)) = db.get_image(*first_image_id).await {
// 生成缩略图
match generate_thumbnail_for_image(&first_image, path, folder_name).await {
Ok(_) => println!(" 封面缩略图生成成功"),
Err(e) => eprintln!(" 封面缩略图生成失败: {}", e),
}
}
}
Ok(ids.len())
}
Err(e) => {
eprintln!(" 批量插入失败: {}", e);
Ok(0)
}
}
} else {
Ok(0)
}
}
/// 为图片生成缩略图(使用ImageProcessor)
async fn generate_thumbnail_for_image(
image: &crate::models::Image,
album_path: &Path,
_folder_name: &str,
) -> Result<(), Box<dyn std::error::Error>> {
// 构建图片文件路径
let image_filename = image.filename.split('/').last().unwrap_or(&image.filename);
let image_path = album_path.join(image_filename);
if !image_path.exists() {
return Err(format!("图片文件不存在: {}", image_path.display()).into());
}
// 读取图片数据
let image_data = fs::read(&image_path)?;
// 创建临时的ImageProcessor实例
// 注意:这里使用默认的缩略图目录路径
let config = crate::config::StorageConfig {
images_dir: Path::new("./albums").to_path_buf(),
thumbnails_dir: Path::new("./thumbnails").to_path_buf(),
};
let image_processor = crate::image_processor::ImageProcessor::new(config);
// 生成缩略图
match image_processor.generate_thumbnail_from_data(&image_data, &image.id.to_string()).await {
Ok(_) => {
println!(" 缩略图生成成功 (ID: {})", image.id);
Ok(())
}
Err(e) => {
Err(format!("缩略图生成失败: {}", e).into())
}
}
}