update code level
This commit is contained in:
206
src/database.rs
206
src/database.rs
@@ -18,20 +18,20 @@ impl Database {
|
|||||||
} else {
|
} else {
|
||||||
url
|
url
|
||||||
};
|
};
|
||||||
|
|
||||||
// 确保数据目录存在
|
// 确保数据目录存在
|
||||||
if let Some(parent) = std::path::Path::new(file_path).parent() {
|
if let Some(parent) = std::path::Path::new(file_path).parent() {
|
||||||
if !parent.exists() {
|
if !parent.exists() {
|
||||||
std::fs::create_dir_all(parent)?;
|
std::fs::create_dir_all(parent)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果数据库文件不存在,创建一个空文件
|
// 如果数据库文件不存在,创建一个空文件
|
||||||
if !std::path::Path::new(file_path).exists() {
|
if !std::path::Path::new(file_path).exists() {
|
||||||
std::fs::File::create(file_path)?;
|
std::fs::File::create(file_path)?;
|
||||||
println!("创建新的数据库文件: {}", file_path);
|
println!("创建新的数据库文件: {}", file_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
let pool = SqlitePoolOptions::new()
|
let pool = SqlitePoolOptions::new()
|
||||||
.max_connections(10) // 增加连接数
|
.max_connections(10) // 增加连接数
|
||||||
.min_connections(2) // 保持最小连接数
|
.min_connections(2) // 保持最小连接数
|
||||||
@@ -40,7 +40,7 @@ impl Database {
|
|||||||
.max_lifetime(std::time::Duration::from_secs(1800)) // 增加最大生命周期
|
.max_lifetime(std::time::Duration::from_secs(1800)) // 增加最大生命周期
|
||||||
.connect(url)
|
.connect(url)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
// 在迁移之前设置SQLite性能优化参数
|
// 在迁移之前设置SQLite性能优化参数
|
||||||
// 这些PRAGMA语句必须在事务外执行
|
// 这些PRAGMA语句必须在事务外执行
|
||||||
sqlx::query("PRAGMA journal_mode=WAL;").execute(&pool).await?;
|
sqlx::query("PRAGMA journal_mode=WAL;").execute(&pool).await?;
|
||||||
@@ -50,14 +50,14 @@ impl Database {
|
|||||||
sqlx::query("PRAGMA mmap_size=268435456;").execute(&pool).await?;
|
sqlx::query("PRAGMA mmap_size=268435456;").execute(&pool).await?;
|
||||||
sqlx::query("PRAGMA temp_store=MEMORY;").execute(&pool).await?;
|
sqlx::query("PRAGMA temp_store=MEMORY;").execute(&pool).await?;
|
||||||
sqlx::query("PRAGMA foreign_keys=ON;").execute(&pool).await?;
|
sqlx::query("PRAGMA foreign_keys=ON;").execute(&pool).await?;
|
||||||
|
|
||||||
// 创建表
|
// 创建表
|
||||||
sqlx::migrate!("./migrations").run(&pool).await?;
|
sqlx::migrate!("./migrations").run(&pool).await?;
|
||||||
|
|
||||||
Ok(Database { pool })
|
Ok(Database { pool })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// 带重试机制的数据库操作执行器
|
/// 带重试机制的数据库操作执行器
|
||||||
async fn execute_with_retry<F, T>(&self, operation: F, operation_name: &str) -> Result<T, sqlx::Error>
|
async fn execute_with_retry<F, T>(&self, operation: F, operation_name: &str) -> Result<T, sqlx::Error>
|
||||||
where
|
where
|
||||||
@@ -65,7 +65,7 @@ impl Database {
|
|||||||
{
|
{
|
||||||
const MAX_RETRIES: u32 = 3;
|
const MAX_RETRIES: u32 = 3;
|
||||||
const BASE_DELAY_MS: u64 = 100;
|
const BASE_DELAY_MS: u64 = 100;
|
||||||
|
|
||||||
for attempt in 0..=MAX_RETRIES {
|
for attempt in 0..=MAX_RETRIES {
|
||||||
match operation().await {
|
match operation().await {
|
||||||
Ok(result) => return Ok(result),
|
Ok(result) => return Ok(result),
|
||||||
@@ -73,7 +73,7 @@ impl Database {
|
|||||||
// 检查是否是死锁或超时错误
|
// 检查是否是死锁或超时错误
|
||||||
if self.is_retryable_error(&e) && attempt < MAX_RETRIES {
|
if self.is_retryable_error(&e) && attempt < MAX_RETRIES {
|
||||||
let delay_ms = BASE_DELAY_MS * 2u64.pow(attempt);
|
let delay_ms = BASE_DELAY_MS * 2u64.pow(attempt);
|
||||||
eprintln!("⚠️ {} 操作失败 (尝试 {}): {}, 等待 {}ms 后重试",
|
eprintln!("⚠️ {} 操作失败 (尝试 {}): {}, 等待 {}ms 后重试",
|
||||||
operation_name, attempt + 1, e, delay_ms);
|
operation_name, attempt + 1, e, delay_ms);
|
||||||
sleep(Duration::from_millis(delay_ms)).await;
|
sleep(Duration::from_millis(delay_ms)).await;
|
||||||
} else {
|
} else {
|
||||||
@@ -83,7 +83,7 @@ impl Database {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unreachable!()
|
unreachable!()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,7 +94,7 @@ impl Database {
|
|||||||
// SQLite 死锁错误码
|
// SQLite 死锁错误码
|
||||||
if let Some(code) = db_err.code() {
|
if let Some(code) = db_err.code() {
|
||||||
code == "5" || // SQLITE_BUSY
|
code == "5" || // SQLITE_BUSY
|
||||||
code == "6" || // SQLITE_LOCKED
|
code == "6" || // SQLITE_LOCKED
|
||||||
code == "261" // SQLITE_BUSY_SNAPSHOT
|
code == "261" // SQLITE_BUSY_SNAPSHOT
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
@@ -104,16 +104,14 @@ impl Database {
|
|||||||
_ => false,
|
_ => false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pub async fn get_albums(&self, page: Option<usize>, limit: Option<usize>) -> Result<Vec<AlbumInfo>, sqlx::Error> {
|
||||||
// 相册操作
|
|
||||||
pub async fn get_all_albums(&self, page: Option<usize>, limit: Option<usize>) -> Result<Vec<AlbumInfo>, sqlx::Error> {
|
|
||||||
let page = page.unwrap_or(1);
|
let page = page.unwrap_or(1);
|
||||||
let limit = limit.unwrap_or(200);
|
let limit = limit.unwrap_or(200);
|
||||||
let offset = (page - 1) * limit;
|
let offset = (page - 1) * limit;
|
||||||
|
|
||||||
let albums = sqlx::query(
|
let albums = sqlx::query(
|
||||||
r#"
|
r#"
|
||||||
SELECT
|
SELECT
|
||||||
a.id,
|
a.id,
|
||||||
a.title,
|
a.title,
|
||||||
a.document,
|
a.document,
|
||||||
@@ -128,11 +126,11 @@ impl Database {
|
|||||||
LIMIT ? OFFSET ?
|
LIMIT ? OFFSET ?
|
||||||
"#
|
"#
|
||||||
)
|
)
|
||||||
.bind(limit as i64)
|
.bind(limit as i64)
|
||||||
.bind(offset as i64)
|
.bind(offset as i64)
|
||||||
.fetch_all(&self.pool)
|
.fetch_all(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let mut result = Vec::new();
|
let mut result = Vec::new();
|
||||||
for row in albums {
|
for row in albums {
|
||||||
let id_str = row.get::<String, _>("id");
|
let id_str = row.get::<String, _>("id");
|
||||||
@@ -143,7 +141,7 @@ impl Database {
|
|||||||
continue; // 跳过无效的记录
|
continue; // 跳过无效的记录
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
result.push(AlbumInfo {
|
result.push(AlbumInfo {
|
||||||
id,
|
id,
|
||||||
title: row.get("title"),
|
title: row.get("title"),
|
||||||
@@ -154,16 +152,60 @@ impl Database {
|
|||||||
created_at: row.get::<String, _>("created_at"),
|
created_at: row.get::<String, _>("created_at"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
// 相册操作
|
||||||
|
pub async fn get_all_albums(&self) -> Result<Vec<AlbumInfo>, sqlx::Error> {
|
||||||
|
|
||||||
|
let albums = sqlx::query(
|
||||||
|
r#"
|
||||||
|
SELECT
|
||||||
|
id,
|
||||||
|
title,
|
||||||
|
document,
|
||||||
|
description,
|
||||||
|
cover_image_id,
|
||||||
|
0 as image_count,
|
||||||
|
created_at
|
||||||
|
FROM albums
|
||||||
|
ORDER BY document DESC
|
||||||
|
"#
|
||||||
|
)
|
||||||
|
.fetch_all(&self.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let mut result = Vec::new();
|
||||||
|
for row in albums {
|
||||||
|
let id_str = row.get::<String, _>("id");
|
||||||
|
let id = match Uuid::parse_str(&id_str) {
|
||||||
|
Ok(uuid) => uuid,
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("无效的UUID格式: {} - 错误: {}", id_str, e);
|
||||||
|
continue; // 跳过无效的记录
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
result.push(AlbumInfo {
|
||||||
|
id,
|
||||||
|
title: row.get("title"),
|
||||||
|
document: row.get("document"),
|
||||||
|
description: row.get("description"),
|
||||||
|
cover_image_id: row.get("cover_image_id"),
|
||||||
|
image_count: row.get("image_count"),
|
||||||
|
created_at: row.get::<String, _>("created_at"),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn search_albums(&self, query: &str, page: Option<usize>, limit: Option<usize>) -> Result<Vec<AlbumInfo>, sqlx::Error> {
|
pub async fn search_albums(&self, query: &str, page: Option<usize>, limit: Option<usize>) -> Result<Vec<AlbumInfo>, sqlx::Error> {
|
||||||
let search_pattern = format!("%{}%", query);
|
let search_pattern = format!("%{}%", query);
|
||||||
let page = page.unwrap_or(1);
|
let page = page.unwrap_or(1);
|
||||||
let limit = limit.unwrap_or(200);
|
let limit = limit.unwrap_or(200);
|
||||||
let offset = (page - 1) * limit;
|
let offset = (page - 1) * limit;
|
||||||
|
|
||||||
let albums = sqlx::query(
|
let albums = sqlx::query(
|
||||||
r#"
|
r#"
|
||||||
SELECT
|
SELECT
|
||||||
@@ -188,7 +230,7 @@ impl Database {
|
|||||||
.bind(offset as i64)
|
.bind(offset as i64)
|
||||||
.fetch_all(&self.pool)
|
.fetch_all(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let mut result = Vec::new();
|
let mut result = Vec::new();
|
||||||
for row in albums {
|
for row in albums {
|
||||||
let id_str = row.get::<String, _>("id");
|
let id_str = row.get::<String, _>("id");
|
||||||
@@ -199,7 +241,7 @@ impl Database {
|
|||||||
continue; // 跳过无效的记录
|
continue; // 跳过无效的记录
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
result.push(AlbumInfo {
|
result.push(AlbumInfo {
|
||||||
id,
|
id,
|
||||||
title: row.get("title"),
|
title: row.get("title"),
|
||||||
@@ -210,10 +252,10 @@ impl Database {
|
|||||||
created_at: row.get::<String, _>("created_at"),
|
created_at: row.get::<String, _>("created_at"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_album_with_images(&self, album_id: Uuid) -> Result<Option<AlbumWithImages>, sqlx::Error> {
|
pub async fn get_album_with_images(&self, album_id: Uuid) -> Result<Option<AlbumWithImages>, sqlx::Error> {
|
||||||
// 获取相册基本信息
|
// 获取相册基本信息
|
||||||
let album_row = sqlx::query(
|
let album_row = sqlx::query(
|
||||||
@@ -222,7 +264,7 @@ impl Database {
|
|||||||
.bind(album_id.to_string())
|
.bind(album_id.to_string())
|
||||||
.fetch_optional(&self.pool)
|
.fetch_optional(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
if let Some(row) = album_row {
|
if let Some(row) = album_row {
|
||||||
let id_str = row.get::<String, _>("id");
|
let id_str = row.get::<String, _>("id");
|
||||||
let id = match Uuid::parse_str(&id_str) {
|
let id = match Uuid::parse_str(&id_str) {
|
||||||
@@ -232,7 +274,7 @@ impl Database {
|
|||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let cover_image_id = match row.get::<Option<String>, _>("cover_image_id") {
|
let cover_image_id = match row.get::<Option<String>, _>("cover_image_id") {
|
||||||
Some(s) => match Uuid::parse_str(&s) {
|
Some(s) => match Uuid::parse_str(&s) {
|
||||||
Ok(uuid) => Some(uuid),
|
Ok(uuid) => Some(uuid),
|
||||||
@@ -243,7 +285,7 @@ impl Database {
|
|||||||
},
|
},
|
||||||
None => None
|
None => None
|
||||||
};
|
};
|
||||||
|
|
||||||
let album = Album {
|
let album = Album {
|
||||||
id,
|
id,
|
||||||
title: row.get("title"),
|
title: row.get("title"),
|
||||||
@@ -252,7 +294,7 @@ impl Database {
|
|||||||
created_at: row.get::<String, _>("created_at"),
|
created_at: row.get::<String, _>("created_at"),
|
||||||
updated_at: row.get::<String, _>("updated_at"),
|
updated_at: row.get::<String, _>("updated_at"),
|
||||||
};
|
};
|
||||||
|
|
||||||
// 获取相册中的图片
|
// 获取相册中的图片
|
||||||
let image_rows = sqlx::query(
|
let image_rows = sqlx::query(
|
||||||
"SELECT * FROM images WHERE album_id = ?"
|
"SELECT * FROM images WHERE album_id = ?"
|
||||||
@@ -260,7 +302,7 @@ impl Database {
|
|||||||
.bind(album_id.to_string())
|
.bind(album_id.to_string())
|
||||||
.fetch_all(&self.pool)
|
.fetch_all(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let mut images = Vec::new();
|
let mut images = Vec::new();
|
||||||
for row in image_rows {
|
for row in image_rows {
|
||||||
let image_id_str = row.get::<String, _>("id");
|
let image_id_str = row.get::<String, _>("id");
|
||||||
@@ -271,7 +313,7 @@ impl Database {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let album_id_str = row.get::<String, _>("album_id");
|
let album_id_str = row.get::<String, _>("album_id");
|
||||||
let album_id = match Uuid::parse_str(&album_id_str) {
|
let album_id = match Uuid::parse_str(&album_id_str) {
|
||||||
Ok(uuid) => uuid,
|
Ok(uuid) => uuid,
|
||||||
@@ -280,7 +322,7 @@ impl Database {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
images.push(Image {
|
images.push(Image {
|
||||||
id: image_id,
|
id: image_id,
|
||||||
album_id,
|
album_id,
|
||||||
@@ -295,9 +337,9 @@ impl Database {
|
|||||||
created_at: row.get::<String, _>("created_at"),
|
created_at: row.get::<String, _>("created_at"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let image_count = images.len() as i64;
|
let image_count = images.len() as i64;
|
||||||
|
|
||||||
Ok(Some(AlbumWithImages {
|
Ok(Some(AlbumWithImages {
|
||||||
album,
|
album,
|
||||||
images,
|
images,
|
||||||
@@ -307,11 +349,11 @@ impl Database {
|
|||||||
Ok(None)
|
Ok(None)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn create_album(&self, album: CreateAlbum) -> Result<Uuid, sqlx::Error> {
|
pub async fn create_album(&self, album: CreateAlbum) -> Result<Uuid, sqlx::Error> {
|
||||||
let id = Uuid::new_v4();
|
let id = Uuid::new_v4();
|
||||||
let now = chrono::Utc::now().to_rfc3339();
|
let now = chrono::Utc::now().to_rfc3339();
|
||||||
|
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO albums (id, title, document, description, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)"
|
"INSERT INTO albums (id, title, document, description, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)"
|
||||||
)
|
)
|
||||||
@@ -323,15 +365,15 @@ impl Database {
|
|||||||
.bind(&now)
|
.bind(&now)
|
||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(id)
|
Ok(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 图片操作
|
// 图片操作
|
||||||
pub async fn add_image(&self, image: CreateImage) -> Result<Uuid, sqlx::Error> {
|
pub async fn add_image(&self, image: CreateImage) -> Result<Uuid, sqlx::Error> {
|
||||||
let id = Uuid::new_v4();
|
let id = Uuid::new_v4();
|
||||||
let now = chrono::Utc::now().to_rfc3339();
|
let now = chrono::Utc::now().to_rfc3339();
|
||||||
|
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO images (id, album_id, filename, original_url, title, description, file_size, width, height, mime_type, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
|
"INSERT INTO images (id, album_id, filename, original_url, title, description, file_size, width, height, mime_type, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
|
||||||
)
|
)
|
||||||
@@ -348,7 +390,7 @@ impl Database {
|
|||||||
.bind(&now)
|
.bind(&now)
|
||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
// 如果这是相册的第一张图片,设置为封面
|
// 如果这是相册的第一张图片,设置为封面
|
||||||
let image_count = sqlx::query_scalar::<_, i64>(
|
let image_count = sqlx::query_scalar::<_, i64>(
|
||||||
"SELECT COUNT(*) FROM images WHERE album_id = ?"
|
"SELECT COUNT(*) FROM images WHERE album_id = ?"
|
||||||
@@ -356,7 +398,7 @@ impl Database {
|
|||||||
.bind(image.album_id.to_string())
|
.bind(image.album_id.to_string())
|
||||||
.fetch_one(&self.pool)
|
.fetch_one(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
if image_count == 1 {
|
if image_count == 1 {
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE albums SET cover_image_id = ? WHERE id = ?"
|
"UPDATE albums SET cover_image_id = ? WHERE id = ?"
|
||||||
@@ -366,7 +408,7 @@ impl Database {
|
|||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(id)
|
Ok(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -378,17 +420,17 @@ impl Database {
|
|||||||
// 由于生命周期问题,简化实现,不使用重试机制
|
// 由于生命周期问题,简化实现,不使用重试机制
|
||||||
let now = chrono::Utc::now().to_rfc3339();
|
let now = chrono::Utc::now().to_rfc3339();
|
||||||
let mut ids = Vec::new();
|
let mut ids = Vec::new();
|
||||||
|
|
||||||
// 保存第一个相册ID用于封面设置
|
// 保存第一个相册ID用于封面设置
|
||||||
let first_album_id = images.first().map(|img| img.album_id);
|
let first_album_id = images.first().map(|img| img.album_id);
|
||||||
|
|
||||||
// 使用事务确保批量插入的原子性
|
// 使用事务确保批量插入的原子性
|
||||||
let mut tx = self.pool.begin().await?;
|
let mut tx = self.pool.begin().await?;
|
||||||
|
|
||||||
for image in &images {
|
for image in &images {
|
||||||
let id = Uuid::new_v4();
|
let id = Uuid::new_v4();
|
||||||
ids.push(id);
|
ids.push(id);
|
||||||
|
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO images (id, album_id, filename, original_url, title, description, file_size, width, height, mime_type, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
|
"INSERT INTO images (id, album_id, filename, original_url, title, description, file_size, width, height, mime_type, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
|
||||||
)
|
)
|
||||||
@@ -406,10 +448,10 @@ impl Database {
|
|||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 提交事务
|
// 提交事务
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
|
|
||||||
// 批量设置封面图片(只对每个相册的第一批图片设置)
|
// 批量设置封面图片(只对每个相册的第一批图片设置)
|
||||||
if let Some(album_id) = first_album_id {
|
if let Some(album_id) = first_album_id {
|
||||||
// 检查相册是否已有图片
|
// 检查相册是否已有图片
|
||||||
@@ -419,7 +461,7 @@ impl Database {
|
|||||||
.bind(album_id.to_string())
|
.bind(album_id.to_string())
|
||||||
.fetch_one(&self.pool)
|
.fetch_one(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
// 如果这是相册的第一批图片,设置第一张为封面
|
// 如果这是相册的第一批图片,设置第一张为封面
|
||||||
if existing_count == images.len() as i64 {
|
if existing_count == images.len() as i64 {
|
||||||
if let Some(first_id) = ids.first() {
|
if let Some(first_id) = ids.first() {
|
||||||
@@ -433,7 +475,7 @@ impl Database {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(ids)
|
Ok(ids)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -445,33 +487,33 @@ impl Database {
|
|||||||
.bind(album_id.to_string())
|
.bind(album_id.to_string())
|
||||||
.fetch_one(&self.pool)
|
.fetch_one(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(count)
|
Ok(count)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 删除相册及其关联的图片
|
/// 删除相册及其关联的图片
|
||||||
pub async fn delete_album(&self, album_id: Uuid) -> Result<(), sqlx::Error> {
|
pub async fn delete_album(&self, album_id: Uuid) -> Result<(), sqlx::Error> {
|
||||||
let mut tx = self.pool.begin().await?;
|
let mut tx = self.pool.begin().await?;
|
||||||
|
|
||||||
// 删除相册关联的图片
|
// 删除相册关联的图片
|
||||||
sqlx::query("DELETE FROM images WHERE album_id = ?")
|
sqlx::query("DELETE FROM images WHERE album_id = ?")
|
||||||
.bind(album_id.to_string())
|
.bind(album_id.to_string())
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
// 删除相册
|
// 删除相册
|
||||||
sqlx::query("DELETE FROM albums WHERE id = ?")
|
sqlx::query("DELETE FROM albums WHERE id = ?")
|
||||||
.bind(album_id.to_string())
|
.bind(album_id.to_string())
|
||||||
.execute(&mut *tx)
|
.execute(&mut *tx)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn update_album_cover(&self, album_id: Uuid, cover_image_id: Option<Uuid>) -> Result<(), sqlx::Error> {
|
pub async fn update_album_cover(&self, album_id: Uuid, cover_image_id: Option<Uuid>) -> Result<(), sqlx::Error> {
|
||||||
let cover_id_str = cover_image_id.map(|id| id.to_string());
|
let cover_id_str = cover_image_id.map(|id| id.to_string());
|
||||||
|
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"UPDATE albums SET cover_image_id = ?, updated_at = datetime('now') WHERE id = ?"
|
"UPDATE albums SET cover_image_id = ?, updated_at = datetime('now') WHERE id = ?"
|
||||||
)
|
)
|
||||||
@@ -479,7 +521,7 @@ impl Database {
|
|||||||
.bind(album_id.to_string())
|
.bind(album_id.to_string())
|
||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -490,7 +532,7 @@ impl Database {
|
|||||||
.bind(image_id.to_string())
|
.bind(image_id.to_string())
|
||||||
.fetch_optional(&self.pool)
|
.fetch_optional(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
if let Some(row) = row {
|
if let Some(row) = row {
|
||||||
let image_id_str = row.get::<String, _>("id");
|
let image_id_str = row.get::<String, _>("id");
|
||||||
let image_id = match Uuid::parse_str(&image_id_str) {
|
let image_id = match Uuid::parse_str(&image_id_str) {
|
||||||
@@ -500,7 +542,7 @@ impl Database {
|
|||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let album_id_str = row.get::<String, _>("album_id");
|
let album_id_str = row.get::<String, _>("album_id");
|
||||||
let album_id = match Uuid::parse_str(&album_id_str) {
|
let album_id = match Uuid::parse_str(&album_id_str) {
|
||||||
Ok(uuid) => uuid,
|
Ok(uuid) => uuid,
|
||||||
@@ -509,7 +551,7 @@ impl Database {
|
|||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(Some(Image {
|
Ok(Some(Image {
|
||||||
id: image_id,
|
id: image_id,
|
||||||
album_id,
|
album_id,
|
||||||
@@ -527,9 +569,9 @@ impl Database {
|
|||||||
Ok(None)
|
Ok(None)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 收藏功能数据库操作
|
// 收藏功能数据库操作
|
||||||
|
|
||||||
// 获取用户的收藏列表
|
// 获取用户的收藏列表
|
||||||
pub async fn get_user_favorites(&self, user_id: &str) -> Result<Vec<FavoriteWithImage>, sqlx::Error> {
|
pub async fn get_user_favorites(&self, user_id: &str) -> Result<Vec<FavoriteWithImage>, sqlx::Error> {
|
||||||
let rows = sqlx::query(
|
let rows = sqlx::query(
|
||||||
@@ -562,7 +604,7 @@ impl Database {
|
|||||||
.bind(user_id)
|
.bind(user_id)
|
||||||
.fetch_all(&self.pool)
|
.fetch_all(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let mut favorites = Vec::new();
|
let mut favorites = Vec::new();
|
||||||
for row in rows {
|
for row in rows {
|
||||||
let favorite_id_str = row.get::<String, _>("favorite_id");
|
let favorite_id_str = row.get::<String, _>("favorite_id");
|
||||||
@@ -573,7 +615,7 @@ impl Database {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let image_id_str = row.get::<String, _>("image_id");
|
let image_id_str = row.get::<String, _>("image_id");
|
||||||
let image_id = match Uuid::parse_str(&image_id_str) {
|
let image_id = match Uuid::parse_str(&image_id_str) {
|
||||||
Ok(uuid) => uuid,
|
Ok(uuid) => uuid,
|
||||||
@@ -582,7 +624,7 @@ impl Database {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let album_id_str = row.get::<String, _>("album_id");
|
let album_id_str = row.get::<String, _>("album_id");
|
||||||
let album_id = match Uuid::parse_str(&album_id_str) {
|
let album_id = match Uuid::parse_str(&album_id_str) {
|
||||||
Ok(uuid) => uuid,
|
Ok(uuid) => uuid,
|
||||||
@@ -591,7 +633,7 @@ impl Database {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let favorite = Favorite {
|
let favorite = Favorite {
|
||||||
id: favorite_id,
|
id: favorite_id,
|
||||||
user_id: row.get("user_id"),
|
user_id: row.get("user_id"),
|
||||||
@@ -599,7 +641,7 @@ impl Database {
|
|||||||
album_id,
|
album_id,
|
||||||
created_at: row.get::<String, _>("favorite_created_at"),
|
created_at: row.get::<String, _>("favorite_created_at"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let image = Image {
|
let image = Image {
|
||||||
id: image_id,
|
id: image_id,
|
||||||
album_id,
|
album_id,
|
||||||
@@ -613,17 +655,17 @@ impl Database {
|
|||||||
mime_type: row.get("mime_type"),
|
mime_type: row.get("mime_type"),
|
||||||
created_at: row.get::<String, _>("image_created_at"),
|
created_at: row.get::<String, _>("image_created_at"),
|
||||||
};
|
};
|
||||||
|
|
||||||
favorites.push(FavoriteWithImage {
|
favorites.push(FavoriteWithImage {
|
||||||
favorite,
|
favorite,
|
||||||
image,
|
image,
|
||||||
album_title: row.get("album_title"),
|
album_title: row.get("album_title"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(favorites)
|
Ok(favorites)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 检查图片是否被用户收藏
|
// 检查图片是否被用户收藏
|
||||||
pub async fn get_favorite_status(&self, user_id: &str, image_id: Uuid) -> Result<FavoriteStatus, sqlx::Error> {
|
pub async fn get_favorite_status(&self, user_id: &str, image_id: Uuid) -> Result<FavoriteStatus, sqlx::Error> {
|
||||||
let row = sqlx::query(
|
let row = sqlx::query(
|
||||||
@@ -633,7 +675,7 @@ impl Database {
|
|||||||
.bind(image_id.to_string())
|
.bind(image_id.to_string())
|
||||||
.fetch_optional(&self.pool)
|
.fetch_optional(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
if let Some(row) = row {
|
if let Some(row) = row {
|
||||||
let favorite_id_str = row.get::<String, _>("id");
|
let favorite_id_str = row.get::<String, _>("id");
|
||||||
let favorite_id = match Uuid::parse_str(&favorite_id_str) {
|
let favorite_id = match Uuid::parse_str(&favorite_id_str) {
|
||||||
@@ -643,7 +685,7 @@ impl Database {
|
|||||||
None
|
None
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(FavoriteStatus {
|
Ok(FavoriteStatus {
|
||||||
is_favorited: true,
|
is_favorited: true,
|
||||||
favorite_id,
|
favorite_id,
|
||||||
@@ -655,12 +697,12 @@ impl Database {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 添加收藏
|
// 添加收藏
|
||||||
pub async fn add_favorite(&self, user_id: &str, favorite_data: CreateFavorite) -> Result<Uuid, sqlx::Error> {
|
pub async fn add_favorite(&self, user_id: &str, favorite_data: CreateFavorite) -> Result<Uuid, sqlx::Error> {
|
||||||
let favorite_id = Uuid::new_v4();
|
let favorite_id = Uuid::new_v4();
|
||||||
let now = chrono::Utc::now().to_rfc3339();
|
let now = chrono::Utc::now().to_rfc3339();
|
||||||
|
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"INSERT INTO favorites (id, user_id, image_id, album_id, created_at) VALUES (?, ?, ?, ?, ?)"
|
"INSERT INTO favorites (id, user_id, image_id, album_id, created_at) VALUES (?, ?, ?, ?, ?)"
|
||||||
)
|
)
|
||||||
@@ -671,10 +713,10 @@ impl Database {
|
|||||||
.bind(&now)
|
.bind(&now)
|
||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(favorite_id)
|
Ok(favorite_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 移除收藏(通过收藏ID)
|
// 移除收藏(通过收藏ID)
|
||||||
pub async fn remove_favorite(&self, favorite_id: Uuid) -> Result<(), sqlx::Error> {
|
pub async fn remove_favorite(&self, favorite_id: Uuid) -> Result<(), sqlx::Error> {
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
@@ -683,10 +725,10 @@ impl Database {
|
|||||||
.bind(favorite_id.to_string())
|
.bind(favorite_id.to_string())
|
||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
// 移除收藏(通过用户ID和图片ID)
|
// 移除收藏(通过用户ID和图片ID)
|
||||||
pub async fn remove_favorite_by_image(&self, user_id: &str, image_id: Uuid) -> Result<(), sqlx::Error> {
|
pub async fn remove_favorite_by_image(&self, user_id: &str, image_id: Uuid) -> Result<(), sqlx::Error> {
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
@@ -696,7 +738,7 @@ impl Database {
|
|||||||
.bind(image_id.to_string())
|
.bind(image_id.to_string())
|
||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,7 +26,7 @@ pub async fn import_existing_data(config: &Config, db: Arc<Database>) -> Result<
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取数据库中现有的相册列表
|
// 获取数据库中现有的相册列表
|
||||||
let existing_albums = db.get_all_albums(None, None).await?;
|
let existing_albums = db.get_all_albums().await?;
|
||||||
let existing_titles: Vec<String> = existing_albums.iter()
|
let existing_titles: Vec<String> = existing_albums.iter()
|
||||||
.map(|album| album.document.to_lowercase())
|
.map(|album| album.document.to_lowercase())
|
||||||
.collect();
|
.collect();
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ pub async fn get_albums(
|
|||||||
let page = query.get("page").and_then(|s| s.parse::<usize>().ok());
|
let page = query.get("page").and_then(|s| s.parse::<usize>().ok());
|
||||||
let limit = query.get("limit").and_then(|s| s.parse::<usize>().ok());
|
let limit = query.get("limit").and_then(|s| s.parse::<usize>().ok());
|
||||||
|
|
||||||
match db.get_all_albums(page, limit).await {
|
match db.get_albums(page, limit).await {
|
||||||
Ok(albums) => HttpResponse::Ok().json(albums),
|
Ok(albums) => HttpResponse::Ok().json(albums),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("获取相册列表失败: {}", e);
|
eprintln!("获取相册列表失败: {}", e);
|
||||||
@@ -206,7 +206,7 @@ pub async fn search_albums(
|
|||||||
let limit = query.get("limit").and_then(|s| s.parse::<usize>().ok());
|
let limit = query.get("limit").and_then(|s| s.parse::<usize>().ok());
|
||||||
|
|
||||||
if q.is_empty() {
|
if q.is_empty() {
|
||||||
return match db.get_all_albums(page, limit).await {
|
return match db.get_albums(page, limit).await {
|
||||||
Ok(albums) => HttpResponse::Ok().json(albums),
|
Ok(albums) => HttpResponse::Ok().json(albums),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("获取相册列表失败: {}", e);
|
eprintln!("获取相册列表失败: {}", e);
|
||||||
|
|||||||
Reference in New Issue
Block a user