This commit is contained in:
lychang
2026-03-22 04:02:47 +08:00
parent e4bf7cf1a4
commit f3ae54a26b
22 changed files with 10607 additions and 347 deletions

View File

@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>相册详情 - 图片展示服务</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
<link rel="stylesheet" href="/assets/css/font-awesome.css">
<link rel="stylesheet" href="/assets/css/style.css">
<link rel="stylesheet" href="/assets/css/album.css">
</head>
@@ -27,15 +27,55 @@
</div>
</div>
<!-- 图片查看器 -->
<div class="lightbox" id="lightbox">
<span class="lightbox-close" onclick="closeLightbox()">&times;</span>
<div class="lightbox-nav">
<button onclick="prevImage()"><i class="fas fa-chevron-left"></i></button>
<button onclick="nextImage()"><i class="fas fa-chevron-right"></i></button>
<!-- 图片查看器 - 使用previewModal相同逻辑 -->
<div class="preview-modal" id="lightbox">
<div class="preview-overlay" onclick="closeLightbox()"></div>
<div class="preview-container">
<div class="preview-header">
<div class="preview-title">
<h3 id="lightbox-title">图片标题</h3>
<span class="preview-info" id="lightbox-album">来自: 相册名称</span>
</div>
<div class="preview-actions">
<button class="preview-nav preview-prev" onclick="prevImage()" id="lightbox-prev">
<i class="fas fa-chevron-left"></i>
</button>
<span class="preview-counter" id="lightbox-counter">1 / 1</span>
<button class="preview-nav preview-next" onclick="nextImage()" id="lightbox-next">
<i class="fas fa-chevron-right"></i>
</button>
<button class="preview-close" onclick="closeLightbox()">
<i class="fas fa-times"></i>
</button>
</div>
</div>
<div class="preview-content">
<div class="preview-image-container">
<img id="lightbox-img" src="" alt="" class="preview-image" loading="eager">
<div class="preview-loading">
<i class="fas fa-spinner fa-spin"></i>
<span>加载中...</span>
</div>
</div>
</div>
<div class="preview-footer">
<div class="preview-meta">
<span class="meta-item" id="lightbox-dimensions">
<i class="fas fa-ruler-combined"></i>
0 × 0
</span>
<span class="meta-item" id="lightbox-size">
<i class="fas fa-weight-hanging"></i>
0 KB
</span>
</div>
<div class="preview-controls">
<button class="preview-action" onclick="addToFavoritesFromLightbox()" id="lightbox-favorite-btn">
<i class="fas fa-heart"></i> 加入收藏
</button>
</div>
</div>
</div>
<img id="lightbox-img" src="" alt="">
<div class="lightbox-info" id="lightbox-info"></div>
</div>
<script src="/assets/js/album.js"></script>

View File

@@ -1,4 +1,4 @@
/* 相册详情页面特定样式 - 蓝白配色体系 */
/* 相册详情页面特定样式 - 增强响应式支持 */
:root {
--primary-blue: #1e40af;
--secondary-blue: #3b82f6;
@@ -16,6 +16,8 @@
--shadow-xl: 0 20px 25px rgba(0, 0, 0, 0.1);
--border-radius: 12px;
--border-radius-lg: 20px;
--mobile-breakpoint: 768px;
--tablet-breakpoint: 1024px;
}
body {
@@ -24,6 +26,7 @@ body {
min-height: 100vh;
color: var(--text-dark);
line-height: 1.6;
overflow-x: hidden;
}
.container {
@@ -80,12 +83,84 @@ body {
margin-right: auto;
}
/* 智能图片网格布局 - 自适应瀑布流效果 */
.images-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
gap: 25px;
margin-bottom: 50px;
align-items: start; /* 顶部对齐 */
}
/* 大屏幕下的优化布局 */
@media (min-width: 1200px) {
.images-grid {
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
gap: 30px;
}
}
/* 宽幅图片布局 - 超宽图片 (ratio > 1.5) */
.image-item.landscape {
grid-column: span 1;
}
.image-item.landscape img {
aspect-ratio: 16/9;
height: auto;
width: 100%;
object-fit: cover;
}
/* 竖幅图片布局 - 超高图片 (ratio < 0.67) */
.image-item.portrait {
grid-column: span 1;
}
.image-item.portrait img {
aspect-ratio: 3/4;
height: auto;
width: 100%;
object-fit: cover;
}
/* 较宽图片布局 (1.2 < ratio ≤ 1.5) */
.image-item.wide {
grid-column: span 1;
}
.image-item.wide img {
aspect-ratio: 4/3;
height: auto;
width: 100%;
object-fit: cover;
}
/* 较高图片布局 (0.83 ≤ ratio < 1.2) */
.image-item.tall {
grid-column: span 1;
}
.image-item.tall img {
aspect-ratio: 3/4;
height: auto;
width: 100%;
object-fit: cover;
}
/* 方形图片布局 (接近1:1) */
.image-item.square {
grid-column: span 1;
}
.image-item.square img {
aspect-ratio: 1/1;
height: auto;
width: 100%;
object-fit: cover;
}
/* 默认图片样式(未分类的图片) */
.image-item {
position: relative;
overflow: hidden;
@@ -96,18 +171,22 @@ body {
cursor: pointer;
border: 1px solid var(--medium-gray);
}
.image-item:hover {
transform: translateY(-8px);
box-shadow: var(--shadow-xl);
border-color: var(--accent-blue);
}
/* 通用图片样式 - 移除固定高度,使用自适应 */
.image-item img {
width: 100%;
height: 220px;
height: auto; /* 改为自适应高度 */
object-fit: cover;
display: block;
transition: transform 0.5s ease;
}
.image-item:hover img {
transform: scale(1.05);
}
@@ -118,6 +197,100 @@ body {
font-size: 0.9rem;
font-weight: 500;
line-height: 1.4;
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
gap: 8px;
}
.image-caption small {
background: var(--light-gray);
padding: 4px 8px;
border-radius: 4px;
font-size: 0.8rem;
color: var(--text-light);
}
/* 收藏按钮样式 */
.favorite-btn {
position: absolute;
top: 10px;
right: 10px;
background: rgba(255, 255, 255, 0.9);
border: none;
border-radius: 50%;
width: 36px;
height: 36px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
transition: all 0.3s ease;
backdrop-filter: blur(10px);
box-shadow: var(--shadow-sm);
opacity: 0;
z-index: 10;
}
.image-item:hover .favorite-btn {
opacity: 1;
}
.favorite-btn:hover {
background: rgba(255, 255, 255, 1);
transform: scale(1.1);
box-shadow: var(--shadow-md);
}
.favorite-btn.favorited {
color: #ec4899;
background: rgba(236, 72, 153, 0.1);
}
.favorite-btn.favorited:hover {
background: rgba(236, 72, 153, 0.2);
}
.favorite-btn i {
font-size: 16px;
transition: all 0.3s ease;
}
/* 触摸设备显示收藏按钮 */
@media (hover: none) and (pointer: coarse) {
.favorite-btn {
opacity: 0.7;
}
.image-item:active .favorite-btn {
opacity: 1;
transform: scale(1.1);
}
}
/* 图片加载状态 */
.image-loading {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: var(--light-gray);
display: flex;
align-items: center;
justify-content: center;
color: var(--text-light);
}
.image-loading .fa-spinner {
font-size: 1.5rem;
animation: spin 1s linear infinite;
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
/* 图片查看器样式 */
@@ -199,6 +372,294 @@ body {
padding: 15px 25px;
border-radius: var(--border-radius);
backdrop-filter: blur(10px);
max-width: 80%;
}
/* 响应式媒体查询 - 移动端优化 */
@media (max-width: 1024px) {
.container {
padding: 25px 15px;
}
.header {
margin-bottom: 35px;
}
.album-title {
font-size: 2.2rem;
}
.album-info {
font-size: 1.1rem;
padding: 18px;
margin-bottom: 35px;
}
.images-grid {
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
gap: 20px;
}
.image-item img {
height: auto; /* 自适应高度 */
}
.lightbox img {
max-width: 90%;
max-height: 70%;
}
.lightbox-close {
top: 20px;
right: 25px;
font-size: 30px;
width: 45px;
height: 45px;
}
}
@media (max-width: 768px) {
.container {
padding: 20px 15px;
}
.header {
margin-bottom: 30px;
}
.back-link {
padding: 10px 20px;
font-size: 0.9rem;
margin-bottom: 20px;
}
.album-title {
font-size: 1.8rem;
margin-bottom: 12px;
}
.album-info {
font-size: 1rem;
padding: 15px;
margin-bottom: 30px;
}
.images-grid {
grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
gap: 15px;
}
.image-item {
border-radius: 10px;
}
.image-item img {
height: auto; /* 自适应高度 */
}
.image-caption {
padding: 10px;
font-size: 0.85rem;
}
.image-caption small {
font-size: 0.75rem;
padding: 3px 6px;
}
.lightbox {
padding: 20px;
}
.lightbox img {
max-width: 95%;
max-height: 65%;
}
.lightbox-close {
top: 15px;
right: 15px;
font-size: 24px;
width: 40px;
height: 40px;
}
.lightbox-nav {
padding: 0 10px;
}
.lightbox-nav button {
font-size: 24px;
padding: 10px 20px;
}
.lightbox-info {
font-size: 1rem;
padding: 12px 20px;
margin-top: 20px;
}
}
@media (max-width: 480px) {
.container {
padding: 15px 10px;
}
.header {
margin-bottom: 25px;
}
.back-link {
padding: 8px 16px;
font-size: 0.85rem;
margin-bottom: 15px;
}
.album-title {
font-size: 1.6rem;
margin-bottom: 10px;
}
.album-info {
font-size: 0.9rem;
padding: 12px;
margin-bottom: 25px;
}
.images-grid {
grid-template-columns: 1fr;
gap: 12px;
}
.image-item img {
height: auto; /* 自适应高度 */
}
.image-caption {
padding: 8px;
font-size: 0.8rem;
flex-direction: column;
align-items: flex-start;
gap: 6px;
}
.lightbox {
padding: 15px;
}
.lightbox img {
max-width: 100%;
max-height: 60%;
}
.lightbox-close {
top: 10px;
right: 10px;
font-size: 20px;
width: 35px;
height: 35px;
}
.lightbox-nav {
padding: 0 5px;
}
.lightbox-nav button {
font-size: 20px;
padding: 8px 16px;
}
.lightbox-info {
font-size: 0.9rem;
padding: 10px 15px;
margin-top: 15px;
max-width: 95%;
}
}
/* 触摸设备优化 */
@media (hover: none) and (pointer: coarse) {
.image-item:hover {
transform: none;
box-shadow: var(--shadow-lg);
}
.image-item:active {
transform: scale(0.98);
box-shadow: var(--shadow-md);
}
.back-link:hover {
transform: none;
}
.back-link:active {
transform: scale(0.95);
}
.lightbox-nav button:hover {
transform: none;
}
.lightbox-nav button:active {
transform: scale(0.9);
}
.lightbox-close:hover {
transform: none;
}
.lightbox-close:active {
transform: scale(0.9);
}
}
/* 横屏模式优化 */
@media (orientation: landscape) and (max-height: 500px) {
.lightbox {
flex-direction: row;
align-items: center;
}
.lightbox img {
max-width: 70%;
max-height: 85%;
}
.lightbox-info {
margin-top: 0;
margin-left: 20px;
max-width: 25%;
}
}
/* 高分辨率屏幕优化 */
@media (min-resolution: 2dppx) {
.image-item img {
image-rendering: -webkit-optimize-contrast;
image-rendering: crisp-edges;
}
.lightbox img {
image-rendering: auto;
}
}
/* 暗色模式支持 */
@media (prefers-color-scheme: dark) {
:root {
--primary-blue: #3b82f6;
--light-blue: #1e293b;
--white: #0f172a;
--light-gray: #334155;
--medium-gray: #475569;
--text-dark: #f1f5f9;
--text-light: #cbd5e1;
}
body {
background: linear-gradient(135deg, var(--light-blue) 0%, var(--white) 100%);
}
}
@media (max-width: 768px) {

7053
assets/css/font-awesome.css vendored Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>流云图库</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
<link rel="stylesheet" href="/assets/css/font-awesome.css">
<link rel="stylesheet" href="/assets/css/style.css">
</head>
<body>
@@ -19,6 +19,15 @@
<label for="search-input"></label><input type="text" id="search-input" placeholder="搜索图片标题..." onkeypress="handleKeyPress(event)">
<button onclick="searchAlbums()"><i class="fas fa-search"></i></button>
</div>
<div class="action-buttons">
<button class="random-button" onclick="openRandomAlbum()">
<i class="fas fa-random"></i> 随机相册
</button>
<button class="favorites-button" onclick="showFavorites()">
<i class="fas fa-heart"></i> 收藏夹
</button>
</div>
</div>
<div class="stats" id="stats">

View File

@@ -3,8 +3,23 @@ let currentAlbum = null;
let currentImageIndex = 0;
let images = [];
// 设备检测
const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
const isTouchDevice = 'ontouchstart' in window || navigator.maxTouchPoints > 0;
// API基础URL
const API_BASE = '/api';
// 页面加载完成后初始化
document.addEventListener('DOMContentLoaded', function() {
// 添加设备类到body
if (isMobile) {
document.body.classList.add('mobile-device');
}
if (isTouchDevice) {
document.body.classList.add('touch-device');
}
const urlParams = new URLSearchParams(window.location.search);
const albumId = urlParams.get('id');
@@ -13,11 +28,32 @@ document.addEventListener('DOMContentLoaded', function() {
} else {
showError('缺少相册ID参数');
}
// 初始化键盘导航和触摸手势
initLightboxControls();
});
// 显示图片骨架屏
function showImageSkeleton(count = 8) {
const container = document.getElementById('images-container');
container.innerHTML = Array(count).fill(0).map(() => `
<div class="image-item">
<div class="image-loading">
<i class="fas fa-spinner"></i>
</div>
<div class="image-caption">
<small>加载中...</small>
</div>
</div>
`).join('');
}
// 加载相册详情
async function loadAlbum(albumId) {
try {
// 显示骨架屏
showImageSkeleton();
const response = await fetch(`/api/album/${albumId}`);
if (!response.ok) {
if (response.status === 404) {
@@ -32,6 +68,9 @@ async function loadAlbum(albumId) {
updateAlbumInfo();
displayImages();
// 初始化图片懒加载
initLazyLoading();
} catch (error) {
console.error('加载相册失败:', error);
showError('加载相册失败: ' + error.message);
@@ -46,6 +85,21 @@ function updateAlbumInfo() {
document.title = `${currentAlbum.title} - 图片展示服务`;
}
// 智能判断图片方向 - 更精确的判断逻辑
function getImageOrientation(width, height) {
if (!width || !height) return 'square';
const ratio = width / height;
// 更精确的阈值判断
if (ratio > 1.5) return 'landscape'; // 宽幅图片
if (ratio < 0.67) return 'portrait'; // 竖幅图片
if (ratio > 1.2) return 'wide'; // 较宽图片
if (ratio < 0.83) return 'tall'; // 较高图片
return 'square'; // 方形或接近方形的图片
}
// 显示图片列表
function displayImages() {
const container = document.getElementById('images-container');
@@ -56,121 +110,358 @@ function displayImages() {
}
container.innerHTML = images.map((image, index) => {
// 优先使用缩略图API,如果没有则使用原始URL
// 智能判断图片方向
const orientation = getImageOrientation(image.width, image.height);
// 使用懒加载技术
let imageUrl = '/assets/placeholder.svg';
let dataSrc = '';
if (image.id) {
imageUrl = `/api/thumbnail/${image.id}`;
dataSrc = `/api/thumbnail/${image.id}`;
imageUrl = '/assets/placeholder.svg'; // 初始使用占位图
} else if (image.original_url) {
imageUrl = image.original_url;
dataSrc = image.original_url;
imageUrl = '/assets/placeholder.svg';
}
const title = image.title || `图片 ${index + 1}`;
// 检查图片是否已被收藏
const isFavorited = isImageFavorited(image.id || image.original_url);
return `
<div class="image-item" onclick="openLightbox(${index})">
<img src="${imageUrl}" alt="${title}" onerror="this.src='/assets/placeholder.svg'">
<div class="image-item ${orientation}" onclick="openLightbox(${index})">
<img
src="${imageUrl}"
${dataSrc ? `data-src="${dataSrc}"` : ''}
alt="${title}"
class="lazy"
onerror="this.src='/assets/placeholder.svg'"
>
<div class="image-caption">
${image.width ? `<small>${image.width}×${image.height}</small>` : ''}
${image.file_size ? `<small>${(image.file_size / 1024 ).toFixed(2)} KB</small>` : ''}
${image.file_size ? `<small>${(image.file_size / 1024).toFixed(2)} KB</small>` : ''}
</div>
</div>
`;
}).join('');
}
// 打开图片查看器
// 打开图片查看器 - 使用previewModal相同逻辑
function openLightbox(index) {
currentImageIndex = index;
const lightbox = document.getElementById('lightbox');
const lightboxImg = document.getElementById('lightbox-img');
const lightboxInfo = document.getElementById('lightbox-info');
const image = images[index];
// 在lightbox中优先使用原始图片以获得更好的显示效果
let imageUrl = '/assets/placeholder.svg';
if (image.id) {
imageUrl = `/api/original/${image.id}`;
} else if (image.original_url) {
imageUrl = image.original_url;
}
// 更新lightbox内容
updateLightboxContent(index);
lightboxImg.src = imageUrl;
const title = image.title || `图片 ${index + 1}`;
let infoText = `${title} (${index + 1}/${images.length})`;
if (image.width && image.height) {
infoText += ` | ${image.width}×${image.height}`;
}
if (image.file_size) {
infoText += ` | ${(image.file_size / 1024 ).toFixed(2)} KB`;
}
lightboxInfo.textContent = infoText;
lightbox.style.display = 'flex';
// 显示lightbox
lightbox.classList.add('active');
document.body.style.overflow = 'hidden';
}
// 关闭图片查看器
function closeLightbox() {
const lightbox = document.getElementById('lightbox');
lightbox.style.display = 'none';
lightbox.classList.remove('active');
document.body.style.overflow = 'auto';
}
// 下一张图片
function nextImage() {
currentImageIndex = (currentImageIndex + 1) % images.length;
updateLightboxImage();
const newIndex = (currentImageIndex + 1) % images.length;
updateLightboxContent(newIndex);
}
// 上一张图片
function prevImage() {
currentImageIndex = (currentImageIndex - 1 + images.length) % images.length;
updateLightboxImage();
const newIndex = (currentImageIndex - 1 + images.length) % images.length;
updateLightboxContent(newIndex);
}
// 更新图片查看器显示
function updateLightboxImage() {
const lightboxImg = document.getElementById('lightbox-img');
const lightboxInfo = document.getElementById('lightbox-info');
// 更新lightbox内容(不关闭面板)
function updateLightboxContent(newIndex) {
currentImageIndex = newIndex;
const image = images[newIndex];
// 更新标题和相册信息
const titleElement = document.getElementById('lightbox-title');
const albumElement = document.getElementById('lightbox-album');
if (titleElement) titleElement.textContent = image.title || `图片 ${newIndex + 1}`;
if (albumElement) albumElement.textContent = `来自: ${currentAlbum.title}`;
// 更新计数器
const counterElement = document.getElementById('lightbox-counter');
if (counterElement) counterElement.textContent = `${newIndex + 1} / ${images.length}`;
// 更新导航按钮状态
const prevButton = document.getElementById('lightbox-prev');
const nextButton = document.getElementById('lightbox-next');
if (prevButton) prevButton.disabled = newIndex === 0;
if (nextButton) nextButton.disabled = newIndex === images.length - 1;
// 检查收藏状态
checkLightboxFavoriteStatus();
// 更新元数据
const dimensionsElement = document.getElementById('lightbox-dimensions');
const sizeElement = document.getElementById('lightbox-size');
if (dimensionsElement) {
dimensionsElement.innerHTML = `<i class="fas fa-ruler-combined"></i> ${image.width || 0} × ${image.height || 0}`;
}
if (sizeElement) {
const fileSizeKB = image.file_size ? (image.file_size / 1024).toFixed(2) : '0';
sizeElement.innerHTML = `<i class="fas fa-weight-hanging"></i> ${fileSizeKB} KB`;
}
// 更新图片
const imageElement = document.getElementById('lightbox-img');
const loadingElement = document.querySelector('#lightbox .preview-loading');
if (imageElement && loadingElement) {
// 显示加载状态
imageElement.style.opacity = '0';
loadingElement.style.display = 'flex';
// 加载新图片
const newImage = new Image();
// 在lightbox中优先使用原始图片以获得更好的显示效果
let imageUrl = '/assets/placeholder.svg';
if (image.id) {
imageUrl = `/api/original/${image.id}`;
} else if (image.original_url) {
imageUrl = image.original_url;
}
newImage.src = imageUrl;
newImage.alt = image.title || `图片 ${newIndex + 1}`;
newImage.className = 'preview-image';
newImage.onload = function() {
// 替换图片
if (imageElement.parentNode) {
imageElement.parentNode.replaceChild(newImage, imageElement);
// 重新设置ID
newImage.id = 'lightbox-img';
}
// 隐藏加载状态
loadingElement.style.display = 'none';
newImage.style.opacity = '1';
};
newImage.onerror = function() {
// 图片加载失败
loadingElement.innerHTML = '<i class="fas fa-exclamation-triangle"></i><span>图片加载失败</span>';
};
}
}
// 初始化图片懒加载
function initLazyLoading() {
if ('IntersectionObserver' in window) {
const imageObserver = new IntersectionObserver((entries, observer) => {
entries.forEach(entry => {
if (entry.isIntersecting) {
const img = entry.target;
if (img.dataset.src) {
img.src = img.dataset.src;
img.classList.remove('lazy');
delete img.dataset.src;
}
imageObserver.unobserve(img);
}
});
}, {
rootMargin: '50px 0px',
threshold: 0.1
});
document.querySelectorAll('img.lazy').forEach(img => {
imageObserver.observe(img);
});
} else {
// 不支持IntersectionObserver的浏览器回退方案
document.querySelectorAll('img.lazy').forEach(img => {
if (img.dataset.src) {
img.src = img.dataset.src;
img.classList.remove('lazy');
delete img.dataset.src;
}
});
}
}
// 初始化lightbox控制
function initLightboxControls() {
// 键盘导航
document.addEventListener('keydown', function(event) {
const lightbox = document.getElementById('lightbox');
if (lightbox.classList.contains('active')) {
switch(event.key) {
case 'Escape':
closeLightbox();
break;
case 'ArrowLeft':
prevImage();
break;
case 'ArrowRight':
nextImage();
break;
}
}
});
// 点击背景关闭
document.getElementById('lightbox').addEventListener('click', function(event) {
if (event.target === this) closeLightbox();
});
// 触摸手势支持
if (isTouchDevice) {
let touchStartX = 0;
let touchStartY = 0;
document.addEventListener('touchstart', function(event) {
touchStartX = event.touches[0].clientX;
touchStartY = event.touches[0].clientY;
});
document.addEventListener('touchend', function(event) {
const lightbox = document.getElementById('lightbox');
if (!lightbox.classList.contains('active')) return;
const touchEndX = event.changedTouches[0].clientX;
const touchEndY = event.changedTouches[0].clientY;
const deltaX = touchEndX - touchStartX;
const deltaY = touchEndY - touchStartY;
// 水平滑动距离大于垂直滑动距离,且水平滑动距离足够大
if (Math.abs(deltaX) > Math.abs(deltaY) && Math.abs(deltaX) > 50) {
if (deltaX > 0) {
prevImage();
} else {
nextImage();
}
}
// 轻点关闭(如果移动距离很小)
if (Math.abs(deltaX) < 10 && Math.abs(deltaY) < 10) {
closeLightbox();
}
});
}
}
// 从lightbox添加收藏
function addToFavoritesFromLightbox() {
const image = images[currentImageIndex];
// 在lightbox中优先使用原始图片以获得更好的显示效果
let imageUrl = '/assets/placeholder.svg';
if (image.id) {
imageUrl = `/api/original/${image.id}`;
} else if (image.original_url) {
imageUrl = image.original_url;
const imageId = image.id;
if (!imageId) {
alert('无法收藏此图片:缺少图片ID');
return;
}
lightboxImg.src = imageUrl;
const title = image.title || `图片 ${currentImageIndex + 1}`;
let infoText = `${title} (${currentImageIndex + 1}/${images.length})`;
if (image.width && image.height) {
infoText += ` | ${image.width}×${image.height}`;
}
if (image.file_size) {
infoText += ` | ${(image.file_size / 1024 ).toFixed(2)} KB`;
// 检查是否已经收藏
const favoriteBtn = document.getElementById('lightbox-favorite-btn');
if (favoriteBtn.classList.contains('favorited')) {
// 取消收藏
fetch(`${API_BASE}/favorites/image/${imageId}`, {
method: 'DELETE'
})
.then(response => {
if (!response.ok) {
throw new Error('取消收藏失败');
}
return response.json();
})
.then(() => {
favoriteBtn.classList.remove('favorited');
favoriteBtn.innerHTML = '<i class="fas fa-heart"></i> 加入收藏';
showFavoriteToast('已取消收藏', false);
})
.catch(error => {
console.error('取消收藏失败:', error);
alert('取消收藏失败,请稍后重试');
});
} else {
// 添加收藏
const favoriteData = {
image_id: imageId,
album_id: currentAlbum.id
};
fetch(`${API_BASE}/favorites`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(favoriteData)
})
.then(response => {
if (!response.ok) {
throw new Error('添加收藏失败');
}
return response.json();
})
.then(() => {
favoriteBtn.classList.add('favorited');
favoriteBtn.innerHTML = '<i class="fas fa-heart"></i> 已收藏';
showFavoriteToast('已添加到收藏夹', true);
})
.catch(error => {
console.error('添加收藏失败:', error);
alert('添加收藏失败,请稍后重试');
});
}
lightboxInfo.textContent = infoText;
// 添加动画效果
const heartIcon = favoriteBtn.querySelector('i');
if (heartIcon) {
heartIcon.style.transform = 'scale(1.3)';
setTimeout(() => {
heartIcon.style.transform = 'scale(1)';
}, 300);
}
}
// 键盘导航
document.addEventListener('keydown', function(event) {
const lightbox = document.getElementById('lightbox');
if (lightbox.style.display === 'flex') {
if (event.key === 'Escape') closeLightbox();
if (event.key === 'ArrowRight') nextImage();
if (event.key === 'ArrowLeft') prevImage();
}
});
// 点击背景关闭
document.getElementById('lightbox').addEventListener('click', function(event) {
if (event.target === this) closeLightbox();
});
// 检查图片收藏状态并更新lightbox按钮
function checkLightboxFavoriteStatus() {
const image = images[currentImageIndex];
const imageId = image.id;
const favoriteBtn = document.getElementById('lightbox-favorite-btn');
console.log(image)
if (!imageId || !favoriteBtn) return;
// 检查收藏状态
fetch(`${API_BASE}/favorites/status/${imageId}`)
.then(response => {
if (!response.ok) {
throw new Error('检查收藏状态失败');
}
return response.json();
})
.then(status => {
if (status.is_favorited) {
favoriteBtn.classList.add('favorited');
favoriteBtn.innerHTML = '<i class="fas fa-heart"></i> 已收藏';
} else {
favoriteBtn.classList.remove('favorited');
favoriteBtn.innerHTML = '<i class="fas fa-heart"></i> 加入收藏';
}
})
.catch(error => {
console.error('检查收藏状态失败:', error);
// 失败时默认显示"加入收藏"
favoriteBtn.classList.remove('favorited');
favoriteBtn.innerHTML = '<i class="fas fa-heart"></i> 加入收藏';
});
}
// 显示错误信息
function showError(message) {
@@ -179,4 +470,178 @@ function showError(message) {
document.getElementById('album-title').textContent = '加载失败';
document.getElementById('album-info').innerHTML = '';
}
}
// 移动端优化:防止双击缩放
function preventDoubleTapZoom() {
if (isTouchDevice) {
let lastTouchEnd = 0;
document.addEventListener('touchend', function(event) {
const now = (new Date()).getTime();
if (now - lastTouchEnd <= 300) {
event.preventDefault();
}
lastTouchEnd = now;
}, false);
}
}
// 性能监控
function logPerformance() {
if ('performance' in window) {
window.addEventListener('load', () => {
setTimeout(() => {
const navigationTiming = performance.getEntriesByType('navigation')[0];
console.log('相册页面加载时间:', navigationTiming.loadEventEnd - navigationTiming.navigationStart, 'ms');
}, 0);
});
}
}
// 检查图片是否已收藏
function isImageFavorited(imageId) {
// 这里需要从后端API获取收藏状态
// 暂时返回false,实际实现中需要调用API
return false;
}
// 切换收藏状态
function toggleFavorite(event, imageIndex) {
event.stopPropagation(); // 阻止事件冒泡,避免打开lightbox
const image = images[imageIndex];
const imageId = image.id;
if (!imageId) {
alert('无法收藏此图片:缺少图片ID');
return;
}
// 检查当前收藏状态
const isFavorited = event.target.classList.contains('favorited');
if (isFavorited) {
// 取消收藏
fetch(`${API_BASE}/favorites/image/${imageId}`, {
method: 'DELETE'
})
.then(response => {
if (!response.ok) {
throw new Error('取消收藏失败');
}
return response.json();
})
.then(() => {
event.target.classList.remove('favorited');
showFavoriteToast('已取消收藏', false);
})
.catch(error => {
console.error('取消收藏失败:', error);
alert('取消收藏失败,请稍后重试');
});
} else {
// 添加收藏
const favoriteData = {
image_id: imageId,
album_id: currentAlbum.id
};
fetch(`${API_BASE}/favorites`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(favoriteData)
})
.then(response => {
if (!response.ok) {
throw new Error('添加收藏失败');
}
return response.json();
})
.then(() => {
event.target.classList.add('favorited');
showFavoriteToast('已添加到收藏夹', true);
})
.catch(error => {
console.error('添加收藏失败:', error);
alert('添加收藏失败,请稍后重试');
});
}
// 添加动画效果
let heartIcon;
// 确保找到正确的图标元素
if (event.target.tagName === 'I') {
heartIcon = event.target;
} else if (event.target.tagName === 'BUTTON') {
heartIcon = event.target.querySelector('i');
} else {
heartIcon = event.target.closest('.favorite-btn')?.querySelector('i');
}
if (heartIcon) {
heartIcon.style.transform = 'scale(1.3)';
setTimeout(() => {
heartIcon.style.transform = 'scale(1)';
}, 300);
}
}
// 显示收藏提示
function showFavoriteToast(message, isAdd) {
// 创建提示元素
let toast = document.getElementById('favorite-toast');
if (!toast) {
toast = document.createElement('div');
toast.id = 'favorite-toast';
toast.style.cssText = `
position: fixed;
top: 20px;
right: 20px;
background: ${isAdd ? '#10b981' : '#ef4444'};
color: white;
padding: 12px 20px;
border-radius: 25px;
box-shadow: 0 4px 12px rgba(0,0,0,0.15);
z-index: 1000;
opacity: 0;
transform: translateX(100px);
transition: all 0.3s ease;
display: flex;
align-items: center;
gap: 8px;
`;
document.body.appendChild(toast);
}
toast.innerHTML = `<i class="fas ${isAdd ? 'fa-heart' : 'fa-heart-broken'}"></i> ${message}`;
toast.style.background = isAdd ? '#10b981' : '#ef4444';
// 显示动画
setTimeout(() => {
toast.style.opacity = '1';
toast.style.transform = 'translateX(0)';
}, 10);
// 隐藏动画
setTimeout(() => {
toast.style.opacity = '0';
toast.style.transform = 'translateX(100px)';
setTimeout(() => {
if (toast.parentNode) {
toast.parentNode.removeChild(toast);
}
}, 300);
}, 2000);
}
// 初始化性能监控和移动端优化
logPerformance();
preventDoubleTapZoom();
// 导出函数供全局使用
window.openLightbox = openLightbox;
window.closeLightbox = closeLightbox;
window.prevImage = prevImage;
window.nextImage = nextImage;
window.toggleFavorite = toggleFavorite;

View File

@@ -1,17 +1,78 @@
// 全局变量
let allAlbums = [];
let searchTimeout = null;
// API基础URL
const API_BASE = '/api';
// 设备检测
const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
const isTouchDevice = 'ontouchstart' in window || navigator.maxTouchPoints > 0;
// 页面加载完成后初始化
document.addEventListener('DOMContentLoaded', function() {
document.addEventListener('DOMContentLoaded', function () {
// 添加设备类到body
if (isMobile) {
document.body.classList.add('mobile-device');
}
if (isTouchDevice) {
document.body.classList.add('touch-device');
}
loadAlbums();
initSearch();
});
// 初始化搜索功能
function initSearch() {
const searchInput = document.getElementById('search-input');
// 防抖搜索
searchInput.addEventListener('input', function () {
clearTimeout(searchTimeout);
searchTimeout = setTimeout(debouncedSearch, 300);
});
// 移动端优化:搜索框聚焦时自动滚动到可视区域
if (isMobile) {
searchInput.addEventListener('focus', function () {
setTimeout(() => {
searchInput.scrollIntoView({behavior: 'smooth', block: 'center'});
}, 100);
});
}
}
// 防抖搜索
function debouncedSearch() {
searchAlbums();
}
// 显示骨架屏
function showSkeleton(count = 6) {
const container = document.getElementById('albums-container');
container.innerHTML = Array(count).fill(0).map(() => `
<div class="skeleton-card">
<div class="skeleton-cover skeleton"></div>
<div class="skeleton-content">
<div class="skeleton-title skeleton"></div>
<div class="skeleton-meta">
<div class="skeleton-meta-item skeleton"></div>
<div class="skeleton-meta-item skeleton"></div>
</div>
<div class="skeleton-button skeleton"></div>
</div>
</div>
`).join('');
}
// 加载所有相册
async function loadAlbums() {
try {
// 显示骨架屏
showSkeleton();
const response = await fetch(`${API_BASE}/albums`);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
@@ -19,6 +80,9 @@ async function loadAlbums() {
allAlbums = await response.json();
displayAlbums(allAlbums);
updateStats(allAlbums);
// 初始化图片懒加载
initLazyLoading();
} catch (error) {
console.error('加载相册失败:', error);
showError('加载相册数据失败,请刷新页面重试');
@@ -28,27 +92,33 @@ async function loadAlbums() {
// 搜索相册
async function searchAlbums() {
const searchTerm = document.getElementById('search-input').value.toLowerCase().trim();
if (searchTerm === '') {
// 显示所有相册
displayAlbums(allAlbums);
updateStats(allAlbums);
return;
}
try {
// 显示搜索中的骨架屏
showSkeleton(4);
const response = await fetch(`${API_BASE}/search?q=${encodeURIComponent(searchTerm)}`);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const filteredAlbums = await response.json();
displayAlbums(filteredAlbums);
if (filteredAlbums.length === 0) {
document.getElementById('stats').innerHTML = `没有找到包含 "${searchTerm}" 的相册`;
} else {
document.getElementById('stats').innerHTML = `找到 ${filteredAlbums.length} 个包含 "${searchTerm}" 的相册`;
}
// 初始化图片懒加载
initLazyLoading();
} catch (error) {
console.error('搜索失败:', error);
showError('搜索失败,请重试');
@@ -58,26 +128,35 @@ async function searchAlbums() {
// 显示相册列表
function displayAlbums(albums) {
const container = document.getElementById('albums-container');
if (albums.length === 0) {
container.innerHTML = '<div class="no-results"><i class="fas fa-search"></i><br>没有找到匹配的相册</div>';
return;
}
container.innerHTML = albums.map(album => {
// 处理封面图片URL
// 处理封面图片URL - 使用懒加载
let coverImageUrl = '/assets/placeholder.svg';
let dataSrc = '';
if (album.cover_image_id) {
coverImageUrl = `/api/thumbnail/${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 `
<div class="album-card">
<div class="album-card" data-album-id="${album.id}">
<div class="album-cover">
<img src="${coverImageUrl}" alt="${album.title}" onerror="this.src='/assets/placeholder.svg'">
<img
src="${coverImageUrl}"
${dataSrc ? `data-src="${dataSrc}"` : ''}
alt="${album.title}"
class="lazy"
onerror="this.src='/assets/placeholder.svg'"
>
</div>
<div class="album-info">
<h3>${album.title}</h3>
@@ -94,6 +173,41 @@ function displayAlbums(albums) {
}).join('');
}
// 初始化图片懒加载
function initLazyLoading() {
if ('IntersectionObserver' in window) {
const imageObserver = new IntersectionObserver((entries, observer) => {
entries.forEach(entry => {
if (entry.isIntersecting) {
const img = entry.target;
if (img.dataset.src) {
img.src = img.dataset.src;
img.classList.remove('lazy');
delete img.dataset.src;
}
imageObserver.unobserve(img);
}
});
}, {
rootMargin: '50px 0px',
threshold: 0.1
});
document.querySelectorAll('img.lazy').forEach(img => {
imageObserver.observe(img);
});
} else {
// 不支持IntersectionObserver的浏览器回退方案
document.querySelectorAll('img.lazy').forEach(img => {
if (img.dataset.src) {
img.src = img.dataset.src;
img.classList.remove('lazy');
delete img.dataset.src;
}
});
}
}
// 更新统计信息
function updateStats(albums) {
const totalImages = albums.reduce((sum, album) => sum + album.image_count, 0);
@@ -112,4 +226,442 @@ function handleKeyPress(event) {
if (event.key === 'Enter') {
searchAlbums();
}
}
}
// 性能监控
function logPerformance() {
if ('performance' in window) {
window.addEventListener('load', () => {
setTimeout(() => {
const navigationTiming = performance.getEntriesByType('navigation')[0];
console.log('页面加载时间:', navigationTiming.loadEventEnd - navigationTiming.navigationStart, 'ms');
}, 0);
});
}
}
// 移动端优化:防止双击缩放
function preventDoubleTapZoom() {
if (isTouchDevice) {
let lastTouchEnd = 0;
document.addEventListener('touchend', function (event) {
const now = (new Date()).getTime();
if (now - lastTouchEnd <= 300) {
event.preventDefault();
}
lastTouchEnd = now;
}, false);
}
}
// 初始化性能监控和移动端优化
logPerformance();
preventDoubleTapZoom();
// 随机打开相册
function openRandomAlbum() {
if (allAlbums.length === 0) {
alert('暂无相册数据,请稍后再试');
return;
}
const randomIndex = Math.floor(Math.random() * allAlbums.length);
const randomAlbum = allAlbums[randomIndex];
// 添加随机动画效果
const randomButton = document.querySelector('.random-button');
randomButton.style.transform = 'scale(0.95)';
setTimeout(() => {
randomButton.style.transform = '';
}, 200);
// 跳转到随机相册
window.location.href = `/album?id=${randomAlbum.id}`;
}
// 显示收藏夹
function showFavorites() {
// 从后端API获取收藏列表
fetch(`${API_BASE}/favorites`)
.then(response => {
if (!response.ok) {
throw new Error('获取收藏列表失败');
}
return response.json();
})
.then(favoriteImages => {
if (favoriteImages.length === 0) {
alert('收藏夹为空,快去收藏一些喜欢的图片吧!');
return;
}
// 创建收藏夹页面或跳转到收藏夹视图
displayFavorites(favoriteImages);
})
.catch(error => {
console.error('获取收藏列表失败:', error);
alert('获取收藏列表失败,请稍后重试');
});
}
// 显示收藏夹内容
function displayFavorites(favoriteImages) {
const container = document.getElementById('albums-container');
container.innerHTML = `
${favoriteImages.length === 0 ? `
<div class="empty-favorites">
<div class="empty-icon">
<i class="fas fa-heart-broken"></i>
</div>
<h3>收藏夹空空如也</h3>
<p>快去收藏一些喜欢的图片吧!</p>
<button class="explore-button" onclick="loadAlbums()">
<i class="fas fa-compass"></i> 探索相册
</button>
</div>
` : `${favoriteImages.map((fav, index) => `
<div class="favorite-card" onclick="openFavoriteImage('${fav.favorite.album_id}')">
<div class="card-image">
<img src="${API_BASE}/thumbnail/${fav.image.id}"
alt="${fav.image.title || '收藏的图片'}"
loading="lazy">
<div class="card-overlay">
<div class="overlay-content">
<button class="quick-view" onclick="event.stopPropagation(); previewFavorite(${index})">
<i class="fas fa-expand"></i>
</button>
<button class="remove-favorite" onclick="removeFavorite(event, '${fav.favorite.id}')">
<i class="fas fa-trash"></i>
</button>
</div>
</div>
<div class="favorite-badge">
<i class="fas fa-heart"></i>
</div>
</div>
<div class="card-content">
<div class="image-meta">
<span class="meta-item">
<i class="fas fa-calendar"></i>
${formatDate(fav.favorite.created_at)}
</span>
<span class="meta-item">
<i class="fas fa-ruler-combined"></i>
${fav.image.width}×${fav.image.height}
</span>
</div>
</div>
</div>
`).join('')}
`}
`;
// 更新统计信息 - 显示收藏数量
document.getElementById('stats').innerHTML = `<div class="favorites-header">
<div class="header-content">
<div class="header-left">
<div class="favorites-icon">
<i class="fas fa-heart"></i>
</div>
<div class="header-info">
<h1>我的收藏夹</h1>
<p class="favorites-count">共收藏了 <span class="count-number">${favoriteImages.length}</span> 张图片</p>
</div>
</div>
<div class="header-right">
<div class="action-buttons">
<button class="back-button" onclick="loadAlbums()">
<i class="fas fa-arrow-left"></i> 返回首页
</button>
</div>
</div>
</div>
</div>`;
}
// 格式化日期
function formatDate(dateString) {
const date = new Date(dateString);
return date.toLocaleDateString('zh-CN', {
year: 'numeric',
month: 'short',
day: 'numeric'
});
}
// 全局变量存储收藏列表和当前预览索引
let currentFavorites = [];
let currentPreviewIndex = -1;
// 预览收藏的图片
function previewFavorite(index) {
// 获取收藏列表
fetch(`${API_BASE}/favorites`)
.then(response => {
if (!response.ok) {
throw new Error('获取收藏列表失败');
}
return response.json();
})
.then(favorites => {
if (favorites && favorites.length > index) {
currentFavorites = favorites;
currentPreviewIndex = index;
showPreviewModal(index);
} else {
alert('图片不存在或已被删除');
}
})
.catch(error => {
console.error('预览图片失败:', error);
alert('预览图片失败,请稍后重试');
});
}
// 显示预览模态框
function showPreviewModal(index) {
const favorite = currentFavorites[index];
// 构建模态框HTML
const modalHtml = `
<div class="preview-modal" id="previewModal">
<div class="preview-overlay" onclick="closePreviewModal()"></div>
<div class="preview-container">
<div class="preview-header">
<div class="preview-title">
<span class="preview-info">来自: ${favorite.album_title}</span>
</div>
<div class="preview-actions">
<button class="preview-nav preview-prev" onclick="navigatePreview(-1)" ${index === 0 ? 'disabled' : ''}>
<i class="fas fa-chevron-left"></i>
</button>
<span class="preview-counter">${index + 1} / ${currentFavorites.length}</span>
<button class="preview-nav preview-next" onclick="navigatePreview(1)" ${index === currentFavorites.length - 1 ? 'disabled' : ''}>
<i class="fas fa-chevron-right"></i>
</button>
<button class="preview-close" onclick="closePreviewModal()">
<i class="fas fa-times"></i>
</button>
</div>
</div>
<div class="preview-content">
<div class="preview-image-container">
<img src="${API_BASE}/original/${favorite.image.id}"
alt="${favorite.image.title || '预览图片'}"
class="preview-image"
id="preview-image"
loading="eager">
</div>
</div>
<div class="preview-footer">
<div class="preview-meta">
<span class="meta-item">
<i class="fas fa-calendar"></i>
${formatDate(favorite.favorite.created_at)}
</span>
<span class="meta-item">
<i class="fas fa-ruler-combined"></i>
${favorite.image.width} × ${favorite.image.height}
</span>
<span class="meta-item">
<i class="fas fa-heart"></i>
已收藏
</span>
</div>
<div class="preview-controls">
<button class="preview-action" onclick="openFavoriteImage('${favorite.favorite.album_id}')">
<i class="fas fa-folder-open"></i> 打开相册
</button>
<button class="preview-action preview-remove" onclick="removeFavoriteFromPreview('${favorite.favorite.id}')">
<i class="fas fa-trash"></i> 取消收藏
</button>
</div>
</div>
</div>
</div>
`;
// 添加到页面
document.body.insertAdjacentHTML('beforeend', modalHtml);
// 显示模态框
setTimeout(() => {
const modal = document.getElementById('previewModal');
modal.classList.add('active');
}, 10);
// 监听键盘事件
document.addEventListener('keydown', handlePreviewKeydown);
}
// 关闭预览模态框
function closePreviewModal() {
const modal = document.getElementById('previewModal');
if (modal) {
modal.classList.remove('active');
setTimeout(() => {
modal.remove();
}, 300);
}
// 移除键盘事件监听
document.removeEventListener('keydown', handlePreviewKeydown);
}
// 导航预览图片
function navigatePreview(direction) {
const newIndex = currentPreviewIndex + direction;
if (newIndex >= 0 && newIndex < currentFavorites.length) {
updatePreviewContent(newIndex);
}
}
// 更新预览内容(不关闭面板)
function updatePreviewContent(newIndex) {
const favorite = currentFavorites[newIndex];
currentPreviewIndex = newIndex;
// 更新标题和相册信息
const titleElement = document.querySelector('.preview-title h3');
const infoElement = document.querySelector('.preview-info');
if (titleElement) titleElement.textContent = favorite.image.title || '未命名图片';
if (infoElement) infoElement.textContent = `来自: ${favorite.album_title}`;
// 更新计数器
const counterElement = document.querySelector('.preview-counter');
if (counterElement) counterElement.textContent = `${newIndex + 1} / ${currentFavorites.length}`;
// 更新导航按钮状态
const prevButton = document.querySelector('.preview-prev');
const nextButton = document.querySelector('.preview-next');
if (prevButton) prevButton.disabled = newIndex === 0;
if (nextButton) nextButton.disabled = newIndex === currentFavorites.length - 1;
// 更新元数据
const metaElements = document.querySelectorAll('.preview-meta .meta-item');
if (metaElements.length >= 3) {
metaElements[0].innerHTML = `<i class="fas fa-calendar"></i> ${formatDate(favorite.favorite.created_at)}`;
metaElements[1].innerHTML = `<i class="fas fa-ruler-combined"></i> ${favorite.image.width} × ${favorite.image.height}`;
}
// 更新操作按钮
const openAlbumButton = document.querySelector('.preview-action:first-child');
const removeButton = document.querySelector('.preview-remove');
if (openAlbumButton) {
openAlbumButton.onclick = () => openFavoriteImage(favorite.favorite.album_id);
}
if (removeButton) {
removeButton.onclick = () => removeFavoriteFromPreview(favorite.favorite.id);
}
// 更新图片
const imageElement = document.getElementById('preview-image');
if (imageElement ) {
// 显示加载状态
imageElement.style.opacity = '0';
// 加载新图片
const newImage = new Image();
newImage.src = `${API_BASE}/original/${favorite.image.id}`;
newImage.alt = favorite.image.title || '预览图片';
newImage.className = 'preview-image';
newImage.onload = function() {
// 替换图片
if (imageElement.parentNode) {
imageElement.parentNode.replaceChild(newImage, imageElement);
// 重新设置ID
newImage.id = 'preview-image';
}
newImage.style.opacity = '1';
};
newImage.onerror = function() {
// 图片加载失败
imageElement.innerHTML = '<i class="fas fa-exclamation-triangle"></i><span>图片加载失败</span>';
};
}
}
// 处理键盘事件
function handlePreviewKeydown(event) {
if (event.key === 'Escape') {
closePreviewModal();
} else if (event.key === 'ArrowLeft') {
navigatePreview(-1);
} else if (event.key === 'ArrowRight') {
navigatePreview(1);
}
}
// 从预览中移除收藏
function removeFavoriteFromPreview(favoriteId) {
if (confirm('确定要从收藏夹移除这张图片吗?')) {
fetch(`${API_BASE}/favorites/${favoriteId}`, {
method: 'DELETE'
})
.then(response => {
if (!response.ok) {
throw new Error('取消收藏失败');
}
return response.json();
})
.then(() => {
closePreviewModal();
// 重新显示收藏夹
showFavorites();
})
.catch(error => {
console.error('取消收藏失败:', error);
alert('取消收藏失败,请稍后重试');
});
}
}
// 排序收藏夹
function sortFavorites(mode) {
// 这里可以实现排序功能
alert('排序功能开发中...');
}
// 从收藏夹移除图片
function removeFavorite(event, favoriteId) {
event.stopPropagation(); // 阻止事件冒泡
if (confirm('确定要从收藏夹移除这张图片吗?')) {
fetch(`${API_BASE}/favorites/${favoriteId}`, {
method: 'DELETE'
})
.then(response => {
if (!response.ok) {
throw new Error('取消收藏失败');
}
return response.json();
})
.then(() => {
// 重新显示收藏夹
showFavorites();
})
.catch(error => {
console.error('取消收藏失败:', error);
alert('取消收藏失败,请稍后重试');
});
}
}
// 打开收藏的图片
function openFavoriteImage(favoriteId) {
// 这里可以跳转到对应的相册页面
// 在实际实现中,我们需要根据favoriteId获取相册信息
window.location.href = `/album?id=${favoriteId}`;
}
// 导出函数供全局使用
window.handleKeyPress = handleKeyPress;
window.searchAlbums = searchAlbums;
window.openRandomAlbum = openRandomAlbum;
window.showFavorites = showFavorites;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,10 +1,10 @@
[database]
url = "sqlite:data/imager.db"
url = "sqlite:./data/imager.db"
[server]
host = "127.0.0.1"
host = "0.0.0.0"
port = 8080
[storage]
images_dir = "albums"
thumbnails_dir = "thumbnails"
images_dir = "./albums"
thumbnails_dir = "./thumbnails"

View File

@@ -26,8 +26,23 @@ CREATE TABLE IF NOT EXISTS images (
FOREIGN KEY (album_id) REFERENCES albums(id) ON DELETE CASCADE
);
-- 创建收藏表
CREATE TABLE IF NOT EXISTS favorites (
id TEXT PRIMARY KEY,
user_id TEXT NOT NULL,
image_id TEXT NOT NULL,
album_id TEXT NOT NULL,
created_at DATETIME NOT NULL,
FOREIGN KEY (image_id) REFERENCES images(id) ON DELETE CASCADE,
FOREIGN KEY (album_id) REFERENCES albums(id) ON DELETE CASCADE
);
-- 创建索引以提高查询性能
CREATE INDEX IF NOT EXISTS idx_albums_created_at ON albums(created_at);
CREATE INDEX IF NOT EXISTS idx_images_album_id ON images(album_id);
CREATE INDEX IF NOT EXISTS idx_images_created_at ON images(created_at);
CREATE INDEX IF NOT EXISTS idx_albums_title ON albums(title);
CREATE INDEX IF NOT EXISTS idx_albums_title ON albums(title);
CREATE INDEX IF NOT EXISTS idx_favorites_user_id ON favorites(user_id);
CREATE INDEX IF NOT EXISTS idx_favorites_image_id ON favorites(image_id);
CREATE INDEX IF NOT EXISTS idx_favorites_album_id ON favorites(album_id);
CREATE UNIQUE INDEX IF NOT EXISTS idx_favorites_user_image ON favorites(user_id, image_id);

View File

@@ -404,4 +404,176 @@ impl Database {
Ok(None)
}
}
// 收藏功能数据库操作
// 获取用户的收藏列表
pub async fn get_user_favorites(&self, user_id: &str) -> Result<Vec<FavoriteWithImage>, sqlx::Error> {
let rows = sqlx::query(
r#"
SELECT
f.id as favorite_id,
f.user_id,
f.image_id,
f.album_id,
f.created_at as favorite_created_at,
i.id as image_id,
i.album_id,
i.filename,
i.original_url,
i.title,
i.description,
i.file_size,
i.width,
i.height,
i.mime_type,
i.created_at as image_created_at,
a.title as album_title
FROM favorites f
JOIN images i ON f.image_id = i.id
JOIN albums a ON f.album_id = a.id
WHERE f.user_id = ?
ORDER BY f.created_at DESC
"#
)
.bind(user_id)
.fetch_all(&self.pool)
.await?;
let mut favorites = Vec::new();
for row in rows {
let favorite_id_str = row.get::<String, _>("favorite_id");
let favorite_id = match Uuid::parse_str(&favorite_id_str) {
Ok(uuid) => uuid,
Err(e) => {
eprintln!("无效的收藏UUID格式: {} - 错误: {}", favorite_id_str, e);
continue;
}
};
let image_id_str = row.get::<String, _>("image_id");
let image_id = match Uuid::parse_str(&image_id_str) {
Ok(uuid) => uuid,
Err(e) => {
eprintln!("无效的图片UUID格式: {} - 错误: {}", image_id_str, e);
continue;
}
};
let album_id_str = row.get::<String, _>("album_id");
let album_id = match Uuid::parse_str(&album_id_str) {
Ok(uuid) => uuid,
Err(e) => {
eprintln!("无效的相册UUID格式: {} - 错误: {}", album_id_str, e);
continue;
}
};
let favorite = Favorite {
id: favorite_id,
user_id: row.get("user_id"),
image_id,
album_id,
created_at: row.get::<String, _>("favorite_created_at"),
};
let image = Image {
id: image_id,
album_id,
filename: row.get("filename"),
original_url: row.get("original_url"),
title: row.get("title"),
description: row.get("description"),
file_size: row.get("file_size"),
width: row.get("width"),
height: row.get("height"),
mime_type: row.get("mime_type"),
created_at: row.get::<String, _>("image_created_at"),
};
favorites.push(FavoriteWithImage {
favorite,
image,
album_title: row.get("album_title"),
});
}
Ok(favorites)
}
// 检查图片是否被用户收藏
pub async fn get_favorite_status(&self, user_id: &str, image_id: Uuid) -> Result<FavoriteStatus, sqlx::Error> {
let row = sqlx::query(
"SELECT id FROM favorites WHERE user_id = ? AND image_id = ?"
)
.bind(user_id)
.bind(image_id.to_string())
.fetch_optional(&self.pool)
.await?;
if let Some(row) = row {
let favorite_id_str = row.get::<String, _>("id");
let favorite_id = match Uuid::parse_str(&favorite_id_str) {
Ok(uuid) => Some(uuid),
Err(e) => {
eprintln!("无效的收藏UUID格式: {} - 错误: {}", favorite_id_str, e);
None
}
};
Ok(FavoriteStatus {
is_favorited: true,
favorite_id,
})
} else {
Ok(FavoriteStatus {
is_favorited: false,
favorite_id: None,
})
}
}
// 添加收藏
pub async fn add_favorite(&self, user_id: &str, favorite_data: CreateFavorite) -> Result<Uuid, sqlx::Error> {
let favorite_id = Uuid::new_v4();
let now = chrono::Utc::now().to_rfc3339();
sqlx::query(
"INSERT INTO favorites (id, user_id, image_id, album_id, created_at) VALUES (?, ?, ?, ?, ?)"
)
.bind(favorite_id.to_string())
.bind(user_id)
.bind(favorite_data.image_id.to_string())
.bind(favorite_data.album_id.to_string())
.bind(&now)
.execute(&self.pool)
.await?;
Ok(favorite_id)
}
// 移除收藏(通过收藏ID)
pub async fn remove_favorite(&self, favorite_id: Uuid) -> Result<(), sqlx::Error> {
sqlx::query(
"DELETE FROM favorites WHERE id = ?"
)
.bind(favorite_id.to_string())
.execute(&self.pool)
.await?;
Ok(())
}
// 移除收藏(通过用户ID和图片ID)
pub async fn remove_favorite_by_image(&self, user_id: &str, image_id: Uuid) -> Result<(), sqlx::Error> {
sqlx::query(
"DELETE FROM favorites WHERE user_id = ? AND image_id = ?"
)
.bind(user_id)
.bind(image_id.to_string())
.execute(&self.pool)
.await?;
Ok(())
}
}

View File

@@ -1,7 +1,9 @@
use std::fs;
use std::path::Path;
use std::sync::Arc;
use image::GenericImageView;
use serde::Deserialize;
use tokio::task;
use crate::config::Config;
use crate::database::Database;
use crate::models::*;
@@ -12,7 +14,7 @@ struct AlbumIndex {
images: Vec<String>,
}
pub async fn import_existing_data(config: &Config, db: &Database) -> Result<(), Box<dyn std::error::Error>> {
pub async fn import_existing_data(config: &Config, db: Arc<Database>) -> Result<(), Box<dyn std::error::Error>> {
println!("开始扫描图片目录并导入新相册...");
let albums_dir = Path::new(&config.storage.images_dir);
@@ -30,13 +32,12 @@ pub async fn import_existing_data(config: &Config, db: &Database) -> Result<(),
println!("数据库中现有相册数量: {}", existing_albums.len());
let entries = fs::read_dir(albums_dir)?;
let mut imported_count = 0;
// 第一阶段:快速扫描所有相册文件夹
let entries: Vec<_> = fs::read_dir(albums_dir)?.collect::<Result<Vec<_>, _>>()?;
let mut album_folders = Vec::new();
for entry in entries {
let entry = entry?;
let path = entry.path();
if path.is_dir() {
if let Some(folder_name) = path.file_name().and_then(|s| s.to_str()) {
// 检查是否已存在同名相册
@@ -44,198 +45,260 @@ pub async fn import_existing_data(config: &Config, db: &Database) -> Result<(),
println!("跳过已存在的相册: {}", folder_name);
continue;
}
println!("发现新相册: {}", folder_name);
// 读取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) => {
println!(" 从index.json读取相册标题: {}", index.title);
index.title
}
Err(e) => {
println!(" 解析index.json失败: {}, 使用文件夹名作为标题", e);
folder_name.to_string()
}
}
}
Err(e) => {
println!(" 读取index.json失败: {}, 使用文件夹名作为标题", e);
folder_name.to_string()
}
}
} else {
println!(" index.json不存在,使用文件夹名作为标题");
folder_name.to_string()
};
// 创建新相册
let new_album = CreateAlbum {
title: album_title.clone(),
document: folder_name.to_string(),
description: Some(format!("从文件夹 {} 自动导入的相册", folder_name)),
};
let album_id = db.create_album(new_album).await?;
println!(" 创建相册: {} (ID: {})", album_title, album_id);
// 读取图片URL列表(如果有index.json)
let image_urls = if index_file_path.exists() {
match fs::read_to_string(&index_file_path) {
Ok(content) => {
match serde_json::from_str::<AlbumIndex>(&content) {
Ok(index) => {
println!(" 从index.json读取到 {} 个图片URL", index.images.len());
Some(index.images)
}
Err(_) => None
}
}
Err(_) => None
}
} else {
None
};
// 扫描文件夹中的图片文件
let image_entries = fs::read_dir(&path)?;
let mut image_files = Vec::new();
for image_entry in image_entries {
let image_entry = image_entry?;
let image_path = image_entry.path();
if image_path.is_file() {
if let Some(extension) = image_path.extension().and_then(|s| s.to_str()) {
let valid_extensions = ["jpg", "jpeg", "png", "gif", "webp", "bmp"];
if valid_extensions.contains(&extension.to_lowercase().as_str()) {
let filename = image_path.file_name()
.and_then(|s| s.to_str())
.unwrap_or("unknown.jpg")
.to_string();
image_files.push((filename, image_path));
}
}
}
}
// 按数字顺序排序文件名
image_files.sort_by(|a, b| {
// 提取文件名中的数字部分进行排序
let num_a = a.0.chars()
.take_while(|c| c.is_ascii_digit())
.collect::<String>()
.parse::<u32>()
.unwrap_or(0);
let num_b = b.0.chars()
.take_while(|c| c.is_ascii_digit())
.collect::<String>()
.parse::<u32>()
.unwrap_or(0);
num_a.cmp(&num_b)
});
let mut image_count = 0;
let mut images_to_insert = Vec::new();
// 收集所有图片信息
for (filename, image_path) in image_files {
image_count += 1;
// 获取对应的URL(如果有的话)
let original_url = if let Some(ref urls) = image_urls {
if urls.len() >= image_count {
Some(urls[image_count - 1].clone())
} else {
None
}
} else {
None
};
// 生成图片标题
let image_title = if let Some(ref urls) = image_urls {
if urls.len() >= image_count {
Some(format!("图片 {}", image_count))
} else {
Some(format!("图片 {}", image_count))
}
} else {
Some(format!("图片 {}", image_count))
};
// 获取图片的实际信息
let (file_size, width, height) = match get_image_info(&image_path) {
Ok(info) => info,
Err(e) => {
eprintln!("获取图片信息失败: {} - {}", image_path.display(), e);
(0, 0, 0)
}
};
let image = CreateImage {
album_id,
filename: format!("{}/{}", folder_name, filename).clone(),
original_url: original_url.clone(),
title: image_title,
description: Some(format!("从文件夹 {} 导入的图片", folder_name)),
file_size,
width,
height,
mime_type: match image_path.extension().and_then(|s| s.to_str()).unwrap_or("jpg").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(),
_ => "image/jpeg".to_string(),
},
};
images_to_insert.push(image.clone());
}
// 批量插入图片
if !images_to_insert.is_empty() {
println!(" 批量插入 {} 张图片...", images_to_insert.len());
match db.add_images(images_to_insert.clone()).await {
Ok(ids) => {
println!(" 批量插入成功,共插入 {} 张图片", ids.len());
}
Err(e) => {
eprintln!(" 批量插入失败: {}", e);
// 如果批量插入失败,尝试逐条插入
println!(" 尝试逐条插入图片...");
let mut success_count = 0;
for image in images_to_insert {
match db.add_image(image).await {
Ok(_) => success_count += 1,
Err(e) => eprintln!(" 单条插入失败: {}", e),
}
}
println!(" 逐条插入完成,成功 {} 张", success_count);
}
}
}
println!(" 相册 {} 导入完成,共导入 {} 张图片", folder_name, image_count);
imported_count += 1;
album_folders.push((folder_name.to_string(), path));
}
}
}
println!("导入完成!共导入 {} 个新相册", imported_count);
println!("发现 {} 个新相册需要导入", album_folders.len());
if album_folders.is_empty() {
println!("没有新相册需要导入");
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);
}
// 等待所有任务完成
let mut total_imported = 0;
let mut successful_albums = 0;
for task in tasks {
match task.await {
Ok(count) => {
if count > 0 {
successful_albums += 1;
total_imported += count;
}
}
Err(e) => {
eprintln!("任务执行失败: {}", e);
}
}
}
println!("🎉 导入完成!成功导入 {} 个相册,共 {} 张图片", successful_albums, total_imported);
Ok(())
}
/// 导入单个相册的辅助函数
async fn import_single_album(db: &Database, folder_name: &str, path: &Path) -> Result<usize, Box<dyn std::error::Error>> {
println!("📁 开始导入相册: {}", folder_name);
// 读取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) => {
println!(" 从index.json读取相册标题: {}", index.title);
index.title
}
Err(e) => {
println!(" 解析index.json失败: {}, 使用文件夹名作为标题", e);
folder_name.to_string()
}
}
}
Err(e) => {
println!(" 读取index.json失败: {}, 使用文件夹名作为标题", e);
folder_name.to_string()
}
}
} else {
println!(" index.json不存在,使用文件夹名作为标题");
folder_name.to_string()
};
// 创建新相册
let new_album = CreateAlbum {
title: album_title.clone(),
document: folder_name.to_string(),
description: Some(format!("从文件夹 {} 自动导入的相册", folder_name)),
};
let album_id = db.create_album(new_album).await?;
println!(" 创建相册: {} (ID: {})", album_title, album_id);
// 读取图片URL列表(如果有index.json)
let image_urls = if index_file_path.exists() {
match fs::read_to_string(&index_file_path) {
Ok(content) => {
match serde_json::from_str::<AlbumIndex>(&content) {
Ok(index) => {
println!(" 从index.json读取到 {} 个图片URL", index.images.len());
Some(index.images)
}
Err(_) => None
}
}
Err(_) => None
}
} else {
None
};
// 快速扫描图片文件
let image_files = scan_image_files(path, folder_name)?;
if image_files.is_empty() {
println!(" 相册 {} 中没有找到图片文件", folder_name);
return Ok(0);
}
println!(" 发现 {} 张图片,开始处理...", image_files.len());
// 并行处理图片信息获取
let mut image_tasks = Vec::new();
for (index, (filename, image_path)) in image_files.iter().enumerate() {
let image_url = image_urls.as_ref().and_then(|urls| {
if urls.len() > index {
Some(urls[index].clone())
} else {
None
}
});
let filename_clone = filename.clone();
let image_path_clone = image_path.clone();
let album_id_clone = album_id;
let folder_name_clone = folder_name.to_string();
let task = task::spawn_blocking(move || {
// 在阻塞线程中处理图片信息
let (file_size, width, height) = match get_image_info(&image_path_clone) {
Ok(info) => info,
Err(e) => {
eprintln!("获取图片信息失败: {} - {}", image_path_clone.display(), e);
(0, 0, 0)
}
};
CreateImage {
album_id: album_id_clone,
filename: format!("{}/{}", folder_name_clone, filename_clone),
original_url: image_url,
title: Some(format!("图片 {}", index + 1)),
description: Some(format!("从文件夹 {} 导入的图片", folder_name_clone)),
file_size,
width,
height,
mime_type: match image_path_clone.extension().and_then(|s| s.to_str()).unwrap_or("jpg").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(),
_ => "image/jpeg".to_string(),
},
}
});
image_tasks.push(task);
}
// 收集所有图片信息
let mut images_to_insert = Vec::new();
for task in image_tasks {
match task.await {
Ok(image) => images_to_insert.push(image),
Err(e) => eprintln!("图片处理任务失败: {}", e),
}
}
// 批量插入图片
if !images_to_insert.is_empty() {
println!(" 批量插入 {} 张图片...", images_to_insert.len());
match db.add_images(images_to_insert).await {
Ok(ids) => {
println!(" 批量插入成功,共插入 {} 张图片", ids.len());
Ok(ids.len())
}
Err(e) => {
eprintln!(" 批量插入失败: {}", e);
Ok(0)
}
}
} else {
Ok(0)
}
}
/// 快速扫描图片文件
fn scan_image_files(path: &Path, _folder_name: &str) -> Result<Vec<(String, std::path::PathBuf)>, Box<dyn std::error::Error>> {
let mut image_files = Vec::new();
for entry in fs::read_dir(path)? {
let entry = entry?;
let image_path = entry.path();
if image_path.is_file() {
if let Some(extension) = image_path.extension().and_then(|s| s.to_str()) {
let valid_extensions = ["jpg", "jpeg", "png", "gif", "webp", "bmp"];
if valid_extensions.contains(&extension.to_lowercase().as_str()) {
let filename = image_path.file_name()
.and_then(|s| s.to_str())
.unwrap_or("unknown.jpg")
.to_string();
image_files.push((filename, image_path));
}
}
}
}
// 按数字顺序排序文件名
image_files.sort_by(|a, b| {
// 提取文件名中的数字部分进行排序
let num_a = a.0.chars()
.take_while(|c| c.is_ascii_digit())
.collect::<String>()
.parse::<u32>()
.unwrap_or(0);
let num_b = b.0.chars()
.take_while(|c| c.is_ascii_digit())
.collect::<String>()
.parse::<u32>()
.unwrap_or(0);
num_a.cmp(&num_b)
});
Ok(image_files)
}
/// 获取图片的实际信息(文件大小、宽度、高度)
fn get_image_info(image_path: &Path) -> Result<(i64, i32, i32), Box<dyn std::error::Error>> {
// 获取文件大小

View File

@@ -1,14 +1,14 @@
mod config;
mod models;
mod database;
mod image_processor;
mod routes;
mod import;
mod models;
mod routes;
use actix_files as afs;
use actix_web::{web, App, HttpServer, HttpResponse};
use std::sync::Arc;
use actix_web::{App, HttpResponse, HttpServer, web};
use std::fs;
use std::sync::Arc;
#[actix_web::main]
async fn main() -> std::io::Result<()> {
@@ -20,10 +20,10 @@ async fn main() -> std::io::Result<()> {
std::process::exit(1);
}
};
println!("启动图片展示服务...");
println!("服务地址: http://{}", config.server_address());
// 初始化数据库
let db = match database::Database::new(&config).await {
Ok(db) => {
@@ -35,21 +35,21 @@ async fn main() -> std::io::Result<()> {
std::process::exit(1);
}
};
// 在后台线程中自动导入新相册(不阻塞HTTP服务启动)
let config_clone = config.clone();
let db_clone = Arc::clone(&db);
tokio::spawn(async move {
println!("[后台任务] 开始扫描图片目录并导入新相册...");
match import::import_existing_data(&config_clone, &db_clone).await {
match import::import_existing_data(&config_clone, db_clone).await {
Ok(_) => println!("[后台任务] 相册导入完成"),
Err(e) => eprintln!("[后台任务] 相册导入失败: {}", e),
}
});
// 初始化图片处理器
let image_processor = Arc::new(image_processor::ImageProcessor::new(config.storage.clone()));
println!("API接口:");
println!(" - GET /api/albums - 获取所有相册");
println!(" - GET /api/search?q=关键词 - 搜索相册");
@@ -57,16 +57,21 @@ async fn main() -> std::io::Result<()> {
println!(" - POST /api/albums - 创建新相册");
println!(" - GET /api/thumbnail/:id - 获取缩略图");
println!(" - GET /api/original/:id - 获取原始图片");
println!(" - GET /api/favorites - 获取收藏列表");
println!(" - GET /api/favorites/status/:id - 检查收藏状态");
println!(" - POST /api/favorites - 添加收藏");
println!(" - DELETE /api/favorites/:id - 取消收藏");
println!(" - DELETE /api/favorites/image/:id - 通过图片ID取消收藏");
println!("按 Ctrl+C 停止服务");
// 创建数据目录
std::fs::create_dir_all(&config.storage.images_dir).unwrap_or(());
std::fs::create_dir_all(&config.storage.thumbnails_dir).unwrap_or(());
std::fs::create_dir_all("./data").unwrap_or(());
fs::create_dir_all(&config.storage.images_dir).unwrap_or(());
fs::create_dir_all(&config.storage.thumbnails_dir).unwrap_or(());
fs::create_dir_all(&config.database.url[7..]).unwrap_or(());
// 在闭包外提取需要的路径
let server_address = config.server_address();
HttpServer::new(move || {
App::new()
.app_data(web::Data::new(Arc::clone(&db)))
@@ -77,26 +82,41 @@ async fn main() -> std::io::Result<()> {
.route("/api/album/{id}", web::get().to(routes::get_album_detail))
.route("/api/albums", web::post().to(routes::create_album))
.route("/api/thumbnail/{id}", web::get().to(routes::get_thumbnail))
.route("/api/original/{id}", web::get().to(routes::get_original_image))
.route(
"/api/original/{id}",
web::get().to(routes::get_original_image),
)
// 收藏功能API路由
.route("/api/favorites", web::get().to(routes::get_favorites))
.route("/api/favorites/status/{id}", web::get().to(routes::check_favorite_status))
.route("/api/favorites", web::post().to(routes::add_favorite))
.route("/api/favorites/{id}", web::delete().to(routes::remove_favorite))
.route("/api/favorites/image/{id}", web::delete().to(routes::remove_favorite_by_image))
// 静态文件服务
.service(afs::Files::new("/assets", "./assets").show_files_listing())
// HTML页面路由
.route("/", web::get().to(|| async {
match fs::read_to_string("./assets/index.html") {
Ok(content) => HttpResponse::Ok()
.content_type("text/html; charset=utf-8")
.body(content),
Err(_) => HttpResponse::NotFound().body("首页文件不存在")
}
}))
.route("/album", web::get().to(|| async {
match fs::read_to_string("./assets/album.html") {
Ok(content) => HttpResponse::Ok()
.content_type("text/html; charset=utf-8")
.body(content),
Err(_) => HttpResponse::NotFound().body("相册页面文件不存在")
}
}))
.route(
"/",
web::get().to(|| async {
match fs::read_to_string("./assets/index.html") {
Ok(content) => HttpResponse::Ok()
.content_type("text/html; charset=utf-8")
.body(content),
Err(_) => HttpResponse::NotFound().body("首页文件不存在"),
}
}),
)
.route(
"/album",
web::get().to(|| async {
match fs::read_to_string("./assets/album.html") {
Ok(content) => HttpResponse::Ok()
.content_type("text/html; charset=utf-8")
.body(content),
Err(_) => HttpResponse::NotFound().body("相册页面文件不存在"),
}
}),
)
})
.bind(server_address)?
.run()

View File

@@ -62,4 +62,32 @@ pub struct CreateImage {
pub width: i32,
pub height: i32,
pub mime_type: String,
}
#[derive(Debug, Serialize, Deserialize)]
pub struct Favorite {
pub id: Uuid,
pub user_id: String,
pub image_id: Uuid,
pub album_id: Uuid,
pub created_at: String,
}
#[derive(Debug, Serialize, Deserialize)]
pub struct CreateFavorite {
pub image_id: Uuid,
pub album_id: Uuid,
}
#[derive(Debug, Serialize, Deserialize)]
pub struct FavoriteWithImage {
pub favorite: Favorite,
pub image: Image,
pub album_title: String,
}
#[derive(Debug, Serialize, Deserialize)]
pub struct FavoriteStatus {
pub is_favorited: bool,
pub favorite_id: Option<Uuid>,
}

View File

@@ -18,6 +18,133 @@ pub async fn get_albums(db: web::Data<Arc<Database>>) -> impl Responder {
}
}
// 收藏功能API路由
// 获取用户的收藏列表
pub async fn get_favorites(
db: web::Data<Arc<Database>>,
) -> impl Responder {
// 这里使用固定用户ID,实际项目中应该从认证信息中获取
let user_id = "default_user".to_string();
match db.get_user_favorites(&user_id).await {
Ok(favorites) => HttpResponse::Ok().json(favorites),
Err(e) => {
eprintln!("获取收藏列表失败: {}", e);
HttpResponse::InternalServerError().json(serde_json::json!({
"error": "获取收藏列表失败"
}))
}
}
}
// 检查图片是否被收藏
pub async fn check_favorite_status(
db: web::Data<Arc<Database>>,
path: web::Path<String>,
) -> impl Responder {
let image_id = match Uuid::parse_str(&path.into_inner()) {
Ok(id) => id,
Err(_) => {
return HttpResponse::BadRequest().json(serde_json::json!({
"error": "无效的图片ID"
}));
}
};
// 这里使用固定用户ID,实际项目中应该从认证信息中获取
let user_id = "default_user".to_string();
match db.get_favorite_status(&user_id, image_id).await {
Ok(status) => HttpResponse::Ok().json(status),
Err(e) => {
eprintln!("检查收藏状态失败: {}", e);
HttpResponse::InternalServerError().json(serde_json::json!({
"error": "检查收藏状态失败"
}))
}
}
}
// 添加收藏
pub async fn add_favorite(
db: web::Data<Arc<Database>>,
favorite_data: web::Json<CreateFavorite>,
) -> impl Responder {
// 这里使用固定用户ID,实际项目中应该从认证信息中获取
let user_id = "default_user".to_string();
match db.add_favorite(&user_id, favorite_data.into_inner()).await {
Ok(favorite_id) => HttpResponse::Created().json(serde_json::json!({
"id": favorite_id,
"message": "收藏成功"
})),
Err(e) => {
eprintln!("添加收藏失败: {}", e);
HttpResponse::InternalServerError().json(serde_json::json!({
"error": "添加收藏失败"
}))
}
}
}
// 取消收藏
pub async fn remove_favorite(
db: web::Data<Arc<Database>>,
path: web::Path<String>,
) -> impl Responder {
let favorite_id = match Uuid::parse_str(&path.into_inner()) {
Ok(id) => id,
Err(_) => {
return HttpResponse::BadRequest().json(serde_json::json!({
"error": "无效的收藏ID"
}));
}
};
match db.remove_favorite(favorite_id).await {
Ok(_) => HttpResponse::Ok().json(serde_json::json!({
"message": "取消收藏成功"
})),
Err(e) => {
eprintln!("取消收藏失败: {}", e);
HttpResponse::InternalServerError().json(serde_json::json!({
"error": "取消收藏失败"
}))
}
}
}
// 通过图片ID取消收藏
pub async fn remove_favorite_by_image(
db: web::Data<Arc<Database>>,
path: web::Path<String>,
) -> impl Responder {
let image_id = match Uuid::parse_str(&path.into_inner()) {
Ok(id) => id,
Err(_) => {
return HttpResponse::BadRequest().json(serde_json::json!({
"error": "无效的图片ID"
}));
}
};
// 这里使用固定用户ID,实际项目中应该从认证信息中获取
let user_id = "default_user".to_string();
match db.remove_favorite_by_image(&user_id, image_id).await {
Ok(_) => HttpResponse::Ok().json(serde_json::json!({
"message": "取消收藏成功"
})),
Err(e) => {
eprintln!("取消收藏失败: {}", e);
HttpResponse::InternalServerError().json(serde_json::json!({
"error": "取消收藏失败"
}))
}
}
}
pub async fn get_original_image(
db: web::Data<Arc<Database>>,
image_processor: web::Data<Arc<ImageProcessor>>,
@@ -263,4 +390,4 @@ pub async fn get_thumbnail(
}))
}
}
}
}