From 4115c041076b47543e564f10670c2456e35f4873 Mon Sep 17 00:00:00 2001
From: lychang <632945494@qq.com>
Date: Mon, 23 Mar 2026 02:38:17 +0800
Subject: [PATCH] update code level
---
.env | 1 -
assets/css/style.css | 82 +++++++++++++++
assets/js/album.js | 15 ++-
assets/js/app.js | 207 ++++++++++++++++++++++++++++++++++---
src/database.rs | 65 +++++++++++-
src/image_processor.rs | 64 +++++++++---
src/import.rs | 228 ++++++++++++++++++++++++++++++++++++++++-
src/routes.rs | 95 +++++++----------
8 files changed, 662 insertions(+), 95 deletions(-)
delete mode 100644 .env
diff --git a/.env b/.env
deleted file mode 100644
index 1851c03..0000000
--- a/.env
+++ /dev/null
@@ -1 +0,0 @@
-DATABASE_URL=sqlite:data/imager.db
\ No newline at end of file
diff --git a/assets/css/style.css b/assets/css/style.css
index 4ac332c..d877e4c 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1468,6 +1468,88 @@ body {
}
}
+/* 分页加载样式 */
+.loading-more {
+ text-align: center;
+ padding: 40px 20px;
+ background: var(--white);
+ border-radius: var(--border-radius);
+ box-shadow: var(--shadow-sm);
+ margin: 20px 0;
+ border: 1px solid var(--medium-gray);
+}
+
+.loading-spinner {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 12px;
+ color: var(--text-light);
+ font-size: 1rem;
+}
+
+.loading-spinner .fa-spinner {
+ color: var(--secondary-blue);
+ font-size: 1.2rem;
+}
+
+.load-more-error {
+ text-align: center;
+ padding: 30px 20px;
+ background: #fef2f2;
+ border-radius: var(--border-radius);
+ box-shadow: var(--shadow-sm);
+ margin: 20px 0;
+ border: 1px solid #fecaca;
+ color: #dc2626;
+}
+
+.error-content {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 10px;
+ font-size: 1rem;
+}
+
+.error-content .fa-exclamation-triangle {
+ font-size: 1.2rem;
+}
+
+.error-content a {
+ color: var(--primary-blue);
+ text-decoration: underline;
+ cursor: pointer;
+}
+
+.error-content a:hover {
+ color: var(--secondary-blue);
+}
+
+/* 移动端分页样式优化 */
+@media (max-width: 768px) {
+ .loading-more {
+ padding: 30px 15px;
+ margin: 15px 0;
+ }
+
+ .loading-spinner {
+ font-size: 0.9rem;
+ gap: 10px;
+ }
+
+ .load-more-error {
+ padding: 25px 15px;
+ margin: 15px 0;
+ }
+
+ .error-content {
+ font-size: 0.9rem;
+ flex-direction: column;
+ gap: 8px;
+ }
+}
+
/* 打印样式 */
@media print {
.search-container,
diff --git a/assets/js/album.js b/assets/js/album.js
index 8b3ab03..2732a85 100644
--- a/assets/js/album.js
+++ b/assets/js/album.js
@@ -128,8 +128,7 @@ function displayImages() {
const title = image.title || `图片 ${index + 1}`;
// 检查图片是否已被收藏
- const isFavorited = isImageFavorited(image.id || image.original_url);
-
+ isImageFavorited(image.id || image.original_url);
return `
![]()
= scrollHeight - 200) {
+ loadMoreAlbums();
+ }
+}
+
+// 加载更多相册
+async function loadMoreAlbums() {
+ if (isLoadingMore || !hasMoreAlbums) return;
+
+ isLoadingMore = true;
+ try {
+ await loadAlbums();
+ } catch (error) {
+ console.error('加载更多相册失败:', error);
+ showLoadMoreError();
+ } finally {
+ isLoadingMore = false;
+ }
+}
+
+// 显示加载更多错误
+function showLoadMoreError() {
+ const container = document.getElementById('albums-container');
+ const errorElement = document.createElement('div');
+ errorElement.className = 'load-more-error';
+ errorElement.innerHTML = `
+
+ `;
+
+ const existingError = container.querySelector('.load-more-error');
+ if (existingError) {
+ existingError.remove();
+ }
+
+ container.appendChild(errorElement);
+}
+
// 防抖搜索
function debouncedSearch() {
searchAlbums();
@@ -67,25 +132,129 @@ function showSkeleton(count = 6) {
`).join('');
}
-// 加载所有相册
-async function loadAlbums() {
- try {
- // 显示骨架屏
- showSkeleton();
+// 显示加载更多指示器
+function showLoadingMore() {
+ const container = document.getElementById('albums-container');
+ const loadingIndicator = document.createElement('div');
+ loadingIndicator.id = 'loading-more';
+ loadingIndicator.className = 'loading-more';
+ loadingIndicator.innerHTML = `
+
+
+ 加载更多相册...
+
+ `;
+ container.appendChild(loadingIndicator);
+}
- const response = await fetch(`${API_BASE}/albums`);
+// 隐藏加载更多指示器
+function hideLoadingMore() {
+ const loadingIndicator = document.getElementById('loading-more');
+ if (loadingIndicator) {
+ loadingIndicator.remove();
+ }
+}
+
+// 追加相册到列表
+function appendAlbums(albums) {
+ const container = document.getElementById('albums-container');
+ const newAlbumsHTML = albums.map(album => {
+ // 处理封面图片URL - 使用懒加载
+ let coverImageUrl = '/assets/placeholder.svg';
+ let dataSrc = '';
+
+ if (album.cover_image_id) {
+ dataSrc = `/api/thumbnail/${album.cover_image_id}`;
+ coverImageUrl = '/assets/placeholder.svg'; // 初始使用占位图
+ }
+
+ // 格式化日期
+ const createdDate = new Date(album.created_at).toLocaleDateString('zh-CN');
+
+ return `
+
+
+

+
+
+
${album.title}
+
+ ${album.image_count} 张图片
+ ${createdDate}
+
+
+ 查看相册
+
+
+
+ `;
+ }).join('');
+
+ // 移除加载指示器并添加新相册
+ hideLoadingMore();
+ container.insertAdjacentHTML('beforeend', newAlbumsHTML);
+}
+
+// 加载所有相册
+async function loadAlbums(reset = false) {
+ try {
+ if (reset) {
+ currentPage = 1;
+ allAlbums = [];
+ hasMoreAlbums = true;
+ const container = document.getElementById('albums-container');
+ container.innerHTML = '';
+ }
+
+ if (!hasMoreAlbums) return;
+
+ // 显示骨架屏
+ if (currentPage === 1) {
+ showSkeleton();
+ } else {
+ showLoadingMore();
+ }
+
+ const response = await fetch(`${API_BASE}/albums?page=${currentPage}&limit=${albumsPerPage}`);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
- allAlbums = await response.json();
- displayAlbums(allAlbums);
+
+ const newAlbums = await response.json();
+
+ // 检查是否还有更多数据
+ if (newAlbums.length < albumsPerPage) {
+ hasMoreAlbums = false;
+ }
+
+ // 合并到现有相册列表
+ allAlbums = [...allAlbums, ...newAlbums];
+
+ if (currentPage === 1) {
+ displayAlbums(allAlbums);
+ } else {
+ appendAlbums(newAlbums);
+ }
+
updateStats(allAlbums);
// 初始化图片懒加载
initLazyLoading();
+
+ currentPage++;
+
+ // 隐藏加载更多指示器
+ hideLoadingMore();
} catch (error) {
console.error('加载相册失败:', error);
showError('加载相册数据失败,请刷新页面重试');
+ hideLoadingMore();
}
}
@@ -94,21 +263,33 @@ async function searchAlbums() {
const searchTerm = document.getElementById('search-input').value.toLowerCase().trim();
if (searchTerm === '') {
- // 显示所有相册
- displayAlbums(allAlbums);
- updateStats(allAlbums);
+ // 显示所有相册,重置分页
+ loadAlbums(true);
return;
}
try {
+ // 重置搜索状态
+ currentPage = 1;
+ allAlbums = [];
+ hasMoreAlbums = true;
+
// 显示搜索中的骨架屏
showSkeleton(4);
- const response = await fetch(`${API_BASE}/search?q=${encodeURIComponent(searchTerm)}`);
+ const response = await fetch(`${API_BASE}/search?q=${encodeURIComponent(searchTerm)}&page=${currentPage}&limit=${albumsPerPage}`);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
+
const filteredAlbums = await response.json();
+ allAlbums = filteredAlbums;
+
+ // 检查是否还有更多数据
+ if (filteredAlbums.length < albumsPerPage) {
+ hasMoreAlbums = false;
+ }
+
displayAlbums(filteredAlbums);
if (filteredAlbums.length === 0) {
@@ -119,6 +300,8 @@ async function searchAlbums() {
// 初始化图片懒加载
initLazyLoading();
+
+ currentPage++;
} catch (error) {
console.error('搜索失败:', error);
showError('搜索失败,请重试');
diff --git a/src/database.rs b/src/database.rs
index b797f2c..95215db 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -6,7 +6,7 @@ use std::time::Duration;
use tokio::time::sleep;
pub struct Database {
- pool: SqlitePool,
+ pub pool: SqlitePool,
}
impl Database {
@@ -106,7 +106,11 @@ impl Database {
}
// 相册操作
- pub async fn get_all_albums(&self) -> Result
, sqlx::Error> {
+ pub async fn get_all_albums(&self, page: Option, limit: Option) -> Result, sqlx::Error> {
+ let page = page.unwrap_or(1);
+ let limit = limit.unwrap_or(200);
+ let offset = (page - 1) * limit;
+
let albums = sqlx::query(
r#"
SELECT
@@ -121,8 +125,11 @@ impl Database {
LEFT JOIN images img ON img.album_id = a.id
GROUP BY a.id, a.title, a.document, a.description, a.cover_image_id, a.created_at
ORDER BY a.document DESC
+ LIMIT ? OFFSET ?
"#
)
+ .bind(limit as i64)
+ .bind(offset as i64)
.fetch_all(&self.pool)
.await?;
@@ -151,8 +158,11 @@ impl Database {
Ok(result)
}
- pub async fn search_albums(&self, query: &str) -> Result, sqlx::Error> {
+ pub async fn search_albums(&self, query: &str, page: Option, limit: Option) -> Result, sqlx::Error> {
let search_pattern = format!("%{}%", query);
+ let page = page.unwrap_or(1);
+ let limit = limit.unwrap_or(200);
+ let offset = (page - 1) * limit;
let albums = sqlx::query(
r#"
@@ -170,9 +180,12 @@ impl Database {
WHERE a.title LIKE ?
GROUP BY a.id, a.title, a.document, a.description, a.cover_image_id, a.created_at
ORDER BY a.created_at DESC
+ LIMIT ? OFFSET ?
"#
)
.bind(&search_pattern)
+ .bind(limit as i64)
+ .bind(offset as i64)
.fetch_all(&self.pool)
.await?;
@@ -424,6 +437,52 @@ impl Database {
Ok(ids)
}
+ /// 获取相册中的图片数量
+ pub async fn get_album_image_count(&self, album_id: Uuid) -> Result {
+ let count = sqlx::query_scalar::<_, i64>(
+ "SELECT COUNT(*) FROM images WHERE album_id = ?"
+ )
+ .bind(album_id.to_string())
+ .fetch_one(&self.pool)
+ .await?;
+
+ Ok(count)
+ }
+
+ /// 删除相册及其关联的图片
+ pub async fn delete_album(&self, album_id: Uuid) -> Result<(), sqlx::Error> {
+ let mut tx = self.pool.begin().await?;
+
+ // 删除相册关联的图片
+ sqlx::query("DELETE FROM images WHERE album_id = ?")
+ .bind(album_id.to_string())
+ .execute(&mut *tx)
+ .await?;
+
+ // 删除相册
+ sqlx::query("DELETE FROM albums WHERE id = ?")
+ .bind(album_id.to_string())
+ .execute(&mut *tx)
+ .await?;
+
+ tx.commit().await?;
+ Ok(())
+ }
+
+ pub async fn update_album_cover(&self, album_id: Uuid, cover_image_id: Option) -> Result<(), sqlx::Error> {
+ let cover_id_str = cover_image_id.map(|id| id.to_string());
+
+ sqlx::query(
+ "UPDATE albums SET cover_image_id = ?, updated_at = datetime('now') WHERE id = ?"
+ )
+ .bind(cover_id_str)
+ .bind(album_id.to_string())
+ .execute(&self.pool)
+ .await?;
+
+ Ok(())
+ }
+
pub async fn get_image(&self, image_id: Uuid) -> Result