kjqwdw/pixiv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构批量下载逻辑，优化历史显示和下载管理

Browse Source
This commit is contained in:
kjqwer
2025-08-25 09:10:00 +08:00
parent 29ef34b5a9
commit 4033e4eed2
10 changed files with 1240 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/routes/download.js
+67
View File
@@ -583,4 +583,71 @@ router.get('/stream/:taskId', async (req, res) => {
});
});
/**
* 清理历史记录
* POST /api/download/cleanup/history
*/
router.post('/cleanup/history', async (req, res) => {
try {
const { keepCount = 500 } = req.body;
const downloadService = req.backend.getDownloadService();
const result = await downloadService.cleanupHistory(parseInt(keepCount));
res.json({
success: true,
data: result
});
} catch (error) {
res.status(500).json({
success: false,
error: error.message
});
}
});
/**
* 清理已完成的任务
* POST /api/download/cleanup/tasks
*/
router.post('/cleanup/tasks', async (req, res) => {
try {
const { keepActive = true, keepCompleted = 100 } = req.body;
const downloadService = req.backend.getDownloadService();
const result = await downloadService.cleanupTasks(keepActive, parseInt(keepCompleted));
res.json({
success: true,
data: result
});
} catch (error) {
res.status(500).json({
success: false,
error: error.message
});
}
});
/**
* 获取系统统计信息
* GET /api/download/stats
*/
router.get('/stats', async (req, res) => {
try {
const downloadService = req.backend.getDownloadService();
const result = await downloadService.getSystemStats();
res.json({
success: true,
data: result
});
} catch (error) {
res.status(500).json({
success: false,
error: error.message
});
}
});
module.exports = router;
backend/services/download-executor.js
+248 -41
View File
@@ -1,15 +1,16 @@
const fs = require('fs-extra');
const path = require('path');
const fs = require('fs-extra');
/**
* 下载执行器 - 负责具体的下载逻辑执行
*/
class DownloadExecutor {
constructor(fileManager, taskManager, progressManager, historyManager) {
constructor(fileManager, taskManager, progressManager, historyManager, downloadService) {
this.fileManager = fileManager;
this.taskManager = taskManager;
this.progressManager = progressManager;
this.historyManager = historyManager;
this.downloadService = downloadService; // 添加下载服务引用
}
/**
@@ -17,38 +18,53 @@ class DownloadExecutor {
*/
async executeArtworkDownload(task, images, size, artworkDir, artwork) {
try {
// 检查哪些文件已经存在（断点续传）
const existingFiles = new Set();
if (await this.fileManager.directoryExists(artworkDir)) {
const files = await this.fileManager.listDirectory(artworkDir);
for (const file of files) {
if (/\.(jpg|jpeg|png|gif|webp)$/i.test(file)) {
existingFiles.add(file);
}
}
}
// 逐个下载图片，实时更新进度
const results = [];
for (let index = 0; index < images.length; index++) {
if (task.status === 'cancelled') {
break;
}
const image = images[index];
const imageUrl = image[size] || image.original;
// 使用安全处理的标题创建文件名
const safeTitle = this.fileManager.createSafeDirectoryName(artwork.title || 'Untitled');
const fileName = `${safeTitle}_${artwork.id}_${index + 1}${this.fileManager.getFileExtension(imageUrl)}`;
// 从图片对象中获取指定尺寸的URL
const imageObj = images[index];
let imageUrl;
// 根据size参数选择对应的URL
switch (size) {
case 'original':
imageUrl = imageObj.original;
break;
case 'large':
imageUrl = imageObj.large;
break;
case 'medium':
imageUrl = imageObj.medium;
break;
case 'square_medium':
imageUrl = imageObj.square_medium;
break;
default:
imageUrl = imageObj.original || imageObj.large || imageObj.medium;
}
// 确保imageUrl是字符串
if (typeof imageUrl !== 'string') {
console.error(`图片URL不是字符串:`, imageUrl);
task.failed_files++;
this.progressManager.notifyProgressUpdate(task.id, task);
results.push({ success: false, error: '图片URL格式错误' });
continue;
}
const fileName = `image_${index + 1}.${this.getFileExtension(imageUrl)}`;
const filePath = path.join(artworkDir, fileName);
// 如果文件已存在，跳过下载
if (existingFiles.has(fileName)) {
// 检查文件是否已存在
if (await this.fileManager.fileExists(filePath)) {
task.completed_files++;
task.progress = Math.round((task.completed_files / task.total_files) * 100);
await this.taskManager.saveTasks();
this.progressManager.notifyProgressUpdate(task.id, task);
results.push({ success: true, file: fileName, skipped: true });
continue;
}
@@ -95,7 +111,7 @@ class DownloadExecutor {
completed_files: task.completed_files,
failed_files: task.failed_files,
start_time: task.start_time,
end_time: task.end_time,
end_time: task.end_time instanceof Date ? task.end_time.toISOString() : task.end_time,
status: task.status,
};
@@ -118,23 +134,66 @@ class DownloadExecutor {
try {
const results = [];
const recentCompleted = []; // 最近完成的作品列表
// 分批下载
for (let i = 0; i < task.filtered_ids.length; i += concurrent) {
for (let i = 0; i < artworkIds.length; i += concurrent) {
if (task.status === 'cancelled') {
break;
}
const batch = task.filtered_ids.slice(i, i + concurrent);
const batch = artworkIds.slice(i, i + concurrent);
const batchPromises = batch.map(async artworkId => {
try {
// 这里需要调用主下载服务的方法，暂时返回模拟结果
task.completed++;
// 使用专门的批量下载方法，避免创建重复任务
const downloadResult = await this.downloadService.downloadSingleArtworkForBatch(artworkId, {
size,
quality,
format,
skipExisting: true
});
if (downloadResult.success) {
// 检查是否跳过下载
if (downloadResult.skipped) {
// 跳过下载，不计入失败，但也不计入完成
const result = { artwork_id: artworkId, success: true, skipped: true };
results.push(result);
return result;
} else {
// 真正下载成功
task.completed_files++;
// 添加到最近完成列表
const completedItem = {
artwork_id: artworkId,
artwork_title: downloadResult.artwork_title || `作品 ${artworkId}`,
artist_name: downloadResult.artist_name || '未知作者'
};
recentCompleted.unshift(completedItem);
// 只保留最近5个
if (recentCompleted.length > 5) {
recentCompleted.pop();
}
// 更新任务的recent_completed
task.recent_completed = [...recentCompleted];
const result = { artwork_id: artworkId, success: true };
results.push(result);
return result;
}
} else {
// 下载失败
task.failed_files++;
const result = { artwork_id: artworkId, success: false, error: downloadResult.error };
results.push(result);
return result;
}
} catch (error) {
task.failed++;
// 异常情况
task.failed_files++;
const result = { artwork_id: artworkId, success: false, error: error.message };
results.push(result);
return result;
@@ -142,22 +201,38 @@ class DownloadExecutor {
});
await Promise.all(batchPromises);
task.progress = Math.round((task.completed / task.total) * 100);
// 更新进度并通知
task.progress = Math.round((task.completed_files / task.total_files) * 100);
await this.taskManager.saveTasks();
this.progressManager.notifyProgressUpdate(task.id, task);
// 添加延迟避免请求过于频繁
if (i + concurrent < task.filtered_ids.length) {
if (i + concurrent < artworkIds.length) {
await new Promise(resolve => setTimeout(resolve, 1000));
}
}
// 更新任务状态
task.status = task.failed === 0 ? 'completed' : 'partial';
task.status = task.failed_files === 0 ? 'completed' : 'partial';
task.end_time = new Date();
task.results = results;
await this.taskManager.saveTasks();
this.progressManager.notifyProgressUpdate(task.id, task);
// 添加到历史记录
const historyItem = {
id: task.id,
type: 'batch',
total_files: task.total_files,
completed_files: task.completed_files,
failed_files: task.failed_files,
start_time: task.start_time,
end_time: task.end_time instanceof Date ? task.end_time.toISOString() : task.end_time,
status: task.status,
};
await this.historyManager.addHistoryItem(historyItem);
} catch (error) {
task.status = 'failed';
task.error = error.message;
@@ -175,6 +250,7 @@ class DownloadExecutor {
try {
const results = [];
const recentCompleted = []; // 最近完成的作品列表
// 分批下载作品
for (let i = 0; i < newArtworks.length; i += maxConcurrent) {
@@ -185,13 +261,55 @@ class DownloadExecutor {
const batch = newArtworks.slice(i, i + maxConcurrent);
const batchPromises = batch.map(async artwork => {
try {
// 这里需要调用主下载服务的方法，暂时返回模拟结果
task.completed++;
// 使用专门的批量下载方法，避免创建重复任务
const downloadResult = await this.downloadService.downloadSingleArtworkForBatch(artwork.id, {
size,
quality,
format,
skipExisting: true
});
if (downloadResult.success) {
// 检查是否跳过下载
if (downloadResult.skipped) {
// 跳过下载，不计入失败，但也不计入完成
const result = { artwork_id: artwork.id, success: true, skipped: true };
results.push(result);
return result;
} else {
// 真正下载成功
task.completed_files++;
// 添加到最近完成列表
const completedItem = {
artwork_id: artwork.id,
artwork_title: downloadResult.artwork_title || artwork.title || `作品 ${artwork.id}`,
artist_name: downloadResult.artist_name || artwork.user?.name || '未知作者'
};
recentCompleted.unshift(completedItem);
// 只保留最近5个
if (recentCompleted.length > 5) {
recentCompleted.pop();
}
// 更新任务的recent_completed
task.recent_completed = [...recentCompleted];
const result = { artwork_id: artwork.id, success: true };
results.push(result);
return result;
}
} else {
// 下载失败
task.failed_files++;
const result = { artwork_id: artwork.id, success: false, error: downloadResult.error };
results.push(result);
return result;
}
} catch (error) {
task.failed++;
// 异常情况
task.failed_files++;
const result = { artwork_id: artwork.id, success: false, error: error.message };
results.push(result);
return result;
@@ -199,7 +317,9 @@ class DownloadExecutor {
});
await Promise.all(batchPromises);
task.progress = Math.round((task.completed / task.total) * 100);
// 更新进度并通知
task.progress = Math.round((task.completed_files / task.total_files) * 100);
await this.taskManager.saveTasks();
this.progressManager.notifyProgressUpdate(task.id, task);
@@ -210,11 +330,26 @@ class DownloadExecutor {
}
// 更新任务状态
task.status = task.failed === 0 ? 'completed' : 'partial';
task.status = task.failed_files === 0 ? 'completed' : 'partial';
task.end_time = new Date();
task.results = results;
await this.taskManager.saveTasks();
this.progressManager.notifyProgressUpdate(task.id, task);
// 添加到历史记录
const historyItem = {
id: task.id,
type: 'artist',
artist_name: task.artist_name,
total_files: task.total_files,
completed_files: task.completed_files,
failed_files: task.failed_files,
start_time: task.start_time,
end_time: task.end_time instanceof Date ? task.end_time.toISOString() : task.end_time,
status: task.status,
};
await this.historyManager.addHistoryItem(historyItem);
} catch (error) {
task.status = 'failed';
task.error = error.message;
@@ -232,6 +367,7 @@ class DownloadExecutor {
try {
const results = [];
const recentCompleted = []; // 最近完成的作品列表
// 分批下载作品
for (let i = 0; i < newArtworks.length; i += maxConcurrent) {
@@ -242,13 +378,55 @@ class DownloadExecutor {
const batch = newArtworks.slice(i, i + maxConcurrent);
const batchPromises = batch.map(async artwork => {
try {
// 这里需要调用主下载服务的方法，暂时返回模拟结果
task.completed++;
// 使用专门的批量下载方法，避免创建重复任务
const downloadResult = await this.downloadService.downloadSingleArtworkForBatch(artwork.id, {
size,
quality,
format,
skipExisting: true
});
if (downloadResult.success) {
// 检查是否跳过下载
if (downloadResult.skipped) {
// 跳过下载，不计入失败，但也不计入完成
const result = { artwork_id: artwork.id, success: true, skipped: true };
results.push(result);
return result;
} else {
// 真正下载成功
task.completed_files++;
// 添加到最近完成列表
const completedItem = {
artwork_id: artwork.id,
artwork_title: downloadResult.artwork_title || artwork.title || `作品 ${artwork.id}`,
artist_name: downloadResult.artist_name || artwork.user?.name || '未知作者'
};
recentCompleted.unshift(completedItem);
// 只保留最近5个
if (recentCompleted.length > 5) {
recentCompleted.pop();
}
// 更新任务的recent_completed
task.recent_completed = [...recentCompleted];
const result = { artwork_id: artwork.id, success: true };
results.push(result);
return result;
}
} else {
// 下载失败
task.failed_files++;
const result = { artwork_id: artwork.id, success: false, error: downloadResult.error };
results.push(result);
return result;
}
} catch (error) {
task.failed++;
// 异常情况
task.failed_files++;
const result = { artwork_id: artwork.id, success: false, error: error.message };
results.push(result);
return result;
@@ -256,7 +434,9 @@ class DownloadExecutor {
});
await Promise.all(batchPromises);
task.progress = Math.round((task.completed / task.total) * 100);
// 更新进度并通知
task.progress = Math.round((task.completed_files / task.total_files) * 100);
await this.taskManager.saveTasks();
this.progressManager.notifyProgressUpdate(task.id, task);
@@ -267,11 +447,25 @@ class DownloadExecutor {
}
// 更新任务状态
task.status = task.failed === 0 ? 'completed' : 'partial';
task.status = task.failed_files === 0 ? 'completed' : 'partial';
task.end_time = new Date();
task.results = results;
await this.taskManager.saveTasks();
this.progressManager.notifyProgressUpdate(task.id, task);
// 添加到历史记录
const historyItem = {
id: task.id,
type: 'ranking',
total_files: task.total_files,
completed_files: task.completed_files,
failed_files: task.failed_files,
start_time: task.start_time,
end_time: task.end_time instanceof Date ? task.end_time.toISOString() : task.end_time,
status: task.status,
};
await this.historyManager.addHistoryItem(historyItem);
} catch (error) {
task.status = 'failed';
task.error = error.message;
@@ -280,6 +474,19 @@ class DownloadExecutor {
this.progressManager.notifyProgressUpdate(task.id, task);
}
}
/**
* 获取文件扩展名
*/
getFileExtension(url) {
if (typeof url !== 'string') {
console.warn('URL不是字符串，使用默认扩展名:', url);
return 'jpg';
}
const match = url.match(/\.([a-zA-Z0-9]+)(?:\?|$)/);
return match ? match[1] : 'jpg';
}
}
module.exports = DownloadExecutor;
backend/services/download.js
+236 -16
View File
@@ -6,6 +6,7 @@ const FileManager = require('./file-manager');
const ProgressManager = require('./progress-manager');
const HistoryManager = require('./history-manager');
const DownloadExecutor = require('./download-executor');
const fs = require('fs-extra'); // Added for fs-extra
/**
* 下载服务 - 主服务类，协调各个管理器
@@ -32,7 +33,8 @@ class DownloadService {
this.taskManager = new TaskManager(this.dataPath);
this.progressManager = new ProgressManager();
this.historyManager = new HistoryManager(this.dataPath);
this.downloadExecutor = new DownloadExecutor(this.fileManager, this.taskManager, this.progressManager, this.historyManager);
// 先创建下载执行器，稍后在init方法中设置downloadService引用
this.downloadExecutor = new DownloadExecutor(this.fileManager, this.taskManager, this.progressManager, this.historyManager, this);
this.initialized = false;
}
@@ -148,6 +150,63 @@ class DownloadService {
};
}
/**
* 清理历史记录
*/
async cleanupHistory(keepCount = 500) {
try {
const result = await this.historyManager.cleanupHistoryManually(keepCount);
return {
success: true,
data: result
};
} catch (error) {
return {
success: false,
error: error.message
};
}
}
/**
* 清理已完成的任务
*/
async cleanupTasks(keepActive = true, keepCompleted = 100) {
try {
const result = await this.taskManager.cleanupTasksManually(keepActive, keepCompleted);
return {
success: true,
data: { cleaned: result }
};
} catch (error) {
return {
success: false,
error: error.message
};
}
}
/**
* 获取系统统计信息
*/
async getSystemStats() {
try {
const taskStats = this.taskManager.getTaskStats();
const historyStats = this.historyManager.getHistoryStats();
return {
tasks: taskStats,
history: historyStats,
activeConnections: this.progressManager.getTotalListenerCount()
};
} catch (error) {
return {
success: false,
error: error.message
};
}
}
// 代理方法 - 文件管理
async getDownloadedFiles() {
try {
@@ -409,9 +468,9 @@ class DownloadService {
const task = this.taskManager.createTask('batch', {
artwork_ids: artworkIds,
filtered_ids: filteredIds,
total: filteredIds.length,
completed: 0,
failed: 0,
total_files: filteredIds.length,
completed_files: 0,
failed_files: 0,
skipped: skippedCount,
results: [],
});
@@ -439,7 +498,7 @@ class DownloadService {
}
// 异步执行批量下载
this.downloadExecutor.executeBatchDownload(task, artworkIds, options);
this.downloadExecutor.executeBatchDownload(task, filteredIds, options);
return {
success: true,
@@ -460,6 +519,153 @@ class DownloadService {
}
}
/**
* 内部方法：下载单个作品（用于批量下载，不创建新任务）
*/
async downloadSingleArtworkForBatch(artworkId, options = {}) {
const { size = 'original', quality = 'high', format = 'auto', skipExisting = true } = options;
try {
// 检查是否已下载
if (skipExisting && (await this.isArtworkDownloaded(artworkId))) {
return {
success: true,
skipped: true,
message: '作品已存在且完整，跳过下载',
};
}
// 获取作品信息
const artworkResult = await this.artworkService.getArtworkDetail(artworkId);
if (!artworkResult.success) {
throw new Error(`获取作品信息失败: ${artworkResult.error}`);
}
const artwork = artworkResult.data;
// 确保作品信息完整
if (!artwork || !artwork.user || !artwork.title) {
throw new Error('作品信息不完整');
}
const artistName = this.fileManager.createSafeDirectoryName(artwork.user.name || 'Unknown Artist');
const artworkTitle = this.fileManager.createSafeDirectoryName(artwork.title || 'Untitled');
// 创建作品目录
const downloadPath = await this.fileManager.getDownloadPath();
const artistDir = path.join(downloadPath, artistName);
const artworkDirName = `${artworkId}_${artworkTitle}`;
const artworkDir = path.join(artistDir, artworkDirName);
// 如果是重新下载，先删除现有目录
if (!skipExisting && (await this.fileManager.directoryExists(artworkDir))) {
console.log(`删除现有作品目录: ${artworkDir}`);
await this.fileManager.removeDirectory(artworkDir);
}
await this.fileManager.ensureDirectory(artworkDir);
// 获取图片URL
const imagesResult = await this.artworkService.getArtworkImages(artworkId, size);
if (!imagesResult.success) {
throw new Error(`获取图片URL失败: ${imagesResult.error}`);
}
const images = imagesResult.data.images;
// 直接下载，不创建新任务
const results = [];
for (let index = 0; index < images.length; index++) {
// 从图片对象中获取指定尺寸的URL
const imageObj = images[index];
let imageUrl;
// 根据size参数选择对应的URL
switch (size) {
case 'original':
imageUrl = imageObj.original;
break;
case 'large':
imageUrl = imageObj.large;
break;
case 'medium':
imageUrl = imageObj.medium;
break;
case 'square_medium':
imageUrl = imageObj.square_medium;
break;
default:
imageUrl = imageObj.original || imageObj.large || imageObj.medium;
}
// 确保imageUrl是字符串
if (typeof imageUrl !== 'string') {
console.error(`图片URL不是字符串:`, imageUrl);
results.push({ success: false, error: '图片URL格式错误' });
continue;
}
const fileName = `image_${index + 1}.${this.getFileExtension(imageUrl)}`;
const filePath = path.join(artworkDir, fileName);
// 检查文件是否已存在
if (await this.fileManager.fileExists(filePath)) {
results.push({ success: true, file: fileName, skipped: true });
continue;
}
try {
// 确保目录存在
await this.fileManager.ensureDirectory(path.dirname(filePath));
await this.fileManager.downloadFile(imageUrl, filePath);
results.push({ success: true, file: fileName });
} catch (error) {
console.error(`下载图片失败 ${index + 1}: ${error.message}`);
results.push({ success: false, error: error.message });
}
}
// 保存作品信息
const infoPath = path.join(artworkDir, 'artwork_info.json');
await fs.writeJson(infoPath, artwork, { spaces: 2 });
// 检查下载结果
const failedCount = results.filter(r => !r.success).length;
const successCount = results.filter(r => r.success && !r.skipped).length;
return {
success: failedCount === 0,
artwork_id: artworkId,
artist_name: artistName,
artwork_title: artworkTitle,
total_files: images.length,
completed_files: successCount,
failed_files: failedCount,
results: results,
};
} catch (error) {
console.error(`下载作品 ${artworkId} 失败:`, error);
return {
success: false,
error: error.message,
artwork_id: artworkId,
};
}
}
/**
* 获取文件扩展名
*/
getFileExtension(url) {
if (typeof url !== 'string') {
console.warn('URL不是字符串，使用默认扩展名:', url);
return 'jpg';
}
const match = url.match(/\.([a-zA-Z0-9]+)(?:\?|$)/);
return match ? match[1] : 'jpg';
}
/**
* 下载作者作品
*/
@@ -467,12 +673,24 @@ class DownloadService {
const { type = 'art', limit = 50, size = 'original', quality = 'high', format = 'auto', skipExisting = true, maxConcurrent = 3, pageSize = 30 } = options;
try {
// 先获取作者信息
let artistName = '未知作者';
try {
const artistResult = await this.artistService.getArtistInfo(artistId);
if (artistResult.success && artistResult.data) {
artistName = artistResult.data.name || `作者 ${artistId}`;
}
} catch (err) {
console.warn(`获取作者 ${artistId} 信息失败:`, err.message);
}
// 创建任务记录
const task = this.taskManager.createTask('artist', {
artist_id: artistId,
total: 0,
completed: 0,
failed: 0,
artist_name: artistName,
total_files: 0,
completed_files: 0,
failed_files: 0,
skipped: 0,
results: [],
});
@@ -521,7 +739,7 @@ class DownloadService {
await this.taskManager.updateTask(task.id, {
skipped: skippedCount,
total: newArtworks.length,
total_files: newArtworks.length,
});
// 作者作品下载统计
@@ -538,6 +756,7 @@ class DownloadService {
data: {
task_id: task.id,
artist_id: artistId,
artist_name: artistName,
total_artworks: allArtworks.length,
completed_artworks: 0,
failed_artworks: 0,
@@ -555,9 +774,10 @@ class DownloadService {
data: {
task_id: task.id,
artist_id: artistId,
total_artworks: task.total,
completed_artworks: task.completed,
failed_artworks: task.failed,
artist_name: artistName,
total_artworks: task.total_files,
completed_artworks: task.completed_files,
failed_artworks: task.failed_files,
message: '作者作品下载任务已创建，正在后台执行',
},
};
@@ -581,9 +801,9 @@ class DownloadService {
const task = this.taskManager.createTask('ranking', {
mode: mode,
type: type,
total: 0,
completed: 0,
failed: 0,
total_files: 0,
completed_files: 0,
failed_files: 0,
skipped: 0,
results: [],
});
@@ -631,7 +851,7 @@ class DownloadService {
await this.taskManager.updateTask(task.id, {
skipped: skippedCount,
total: newArtworks.length,
total_files: newArtworks.length,
});
// 排行榜作品下载统计
backend/services/history-manager.js
+64 -5
View File
@@ -10,6 +10,10 @@ class HistoryManager {
this.historyFile = path.join(dataPath, 'download_history.json');
this.history = [];
this.initialized = false;
// 配置
this.maxHistoryItems = 500; // 最多保存500条历史记录
this.cleanupThreshold = 600; // 超过600条时开始清理
}
/**
@@ -19,8 +23,12 @@ class HistoryManager {
try {
await fs.ensureDir(this.dataPath);
await this.loadHistory();
// 初始化时清理历史记录
await this.cleanupHistory();
this.initialized = true;
// 历史记录管理器初始化完成
console.log('历史记录管理器初始化完成');
} catch (error) {
console.error('历史记录管理器初始化失败:', error);
this.initialized = false;
@@ -53,10 +61,47 @@ class HistoryManager {
}
/**
* 添加历史记录
* 添加历史记录（简化版本）
*/
async addHistoryItem(item) {
this.history.unshift(item);
// 简化历史记录信息
const simplifiedItem = {
id: item.id,
type: item.type,
status: item.status,
total_files: item.total_files,
completed_files: item.completed_files,
failed_files: item.failed_files,
start_time: item.start_time,
end_time: item.end_time,
// 只保存关键信息
artwork_id: item.artwork_id,
artist_name: item.artist_name,
artwork_title: item.artwork_title
};
this.history.unshift(simplifiedItem);
// 检查是否需要清理
if (this.history.length > this.cleanupThreshold) {
await this.cleanupHistory();
} else {
await this.saveHistory();
}
}
/**
* 清理历史记录
*/
async cleanupHistory() {
if (this.history.length <= this.maxHistoryItems) {
return;
}
console.log(`清理历史记录: ${this.history.length} -> ${this.maxHistoryItems}`);
// 保留最新的记录
this.history = this.history.slice(0, this.maxHistoryItems);
await this.saveHistory();
}
@@ -120,8 +165,7 @@ class HistoryManager {
completed: 0,
failed: 0,
partial: 0,
totalFiles: 0,
totalSize: 0
totalFiles: 0
};
for (const item of this.history) {
@@ -153,6 +197,21 @@ class HistoryManager {
(item.artist_name && item.artist_name.toLowerCase().includes(lowerQuery))
);
}
/**
* 手动清理历史记录（保留指定数量）
*/
async cleanupHistoryManually(keepCount = this.maxHistoryItems) {
if (this.history.length <= keepCount) {
return { cleaned: 0, remaining: this.history.length };
}
const cleanedCount = this.history.length - keepCount;
this.history = this.history.slice(0, keepCount);
await this.saveHistory();
return { cleaned: cleanedCount, remaining: this.history.length };
}
}
module.exports = HistoryManager;
backend/services/progress-manager.js
+11
View File
@@ -58,6 +58,17 @@ class ProgressManager {
: 0;
}
/**
* 获取总连接数
*/
getTotalListenerCount() {
let total = 0;
for (const listeners of this.progressListeners.values()) {
total += listeners.length;
}
return total;
}
/**
* 清理所有监听器
*/
backend/services/task-manager.js
+97 -5
View File
@@ -11,6 +11,10 @@ class TaskManager {
this.tasksFile = path.join(dataPath, 'download_tasks.json');
this.tasks = new Map(); // 内存中的任务状态
this.initialized = false;
// 配置
this.maxCompletedTasks = 100; // 最多保留100个已完成的任务
this.cleanupThreshold = 150; // 超过150个时开始清理
}
/**
@@ -20,8 +24,12 @@ class TaskManager {
try {
await fs.ensureDir(this.dataPath);
await this.loadTasks();
// 初始化时清理已完成的任务
await this.cleanupCompletedTasks();
this.initialized = true;
// 任务管理器初始化完成
console.log('任务管理器初始化完成');
} catch (error) {
console.error('任务管理器初始化失败:', error);
this.initialized = false;
@@ -99,7 +107,14 @@ class TaskManager {
}
Object.assign(task, updates);
// 如果任务完成，检查是否需要清理
if (['completed', 'failed', 'cancelled', 'partial'].includes(updates.status)) {
await this.checkAndCleanupTasks();
} else {
await this.saveTasks();
}
return true;
}
@@ -121,6 +136,24 @@ class TaskManager {
return Array.from(this.tasks.values());
}
/**
* 获取活跃任务（下载中或暂停）
*/
getActiveTasks() {
return Array.from(this.tasks.values()).filter(task =>
['downloading', 'paused'].includes(task.status)
);
}
/**
* 获取已完成的任务
*/
getCompletedTasks() {
return Array.from(this.tasks.values()).filter(task =>
['completed', 'failed', 'cancelled', 'partial'].includes(task.status)
);
}
/**
* 获取指定状态的任务
*/
@@ -128,23 +161,45 @@ class TaskManager {
return Array.from(this.tasks.values()).filter(task => task.status === status);
}
/**
* 检查并清理任务
*/
async checkAndCleanupTasks() {
const completedTasks = this.getCompletedTasks();
if (completedTasks.length > this.cleanupThreshold) {
await this.cleanupCompletedTasks();
} else {
await this.saveTasks();
}
}
/**
* 清理已完成的任务
*/
async cleanupCompletedTasks() {
const completedStatuses = ['completed', 'failed', 'cancelled', 'partial'];
const completedTasks = Array.from(this.tasks.entries())
.filter(([_, task]) => completedStatuses.includes(task.status))
.sort((a, b) => new Date(b[1].end_time) - new Date(a[1].end_time)); // 按完成时间排序
if (completedTasks.length <= this.maxCompletedTasks) {
await this.saveTasks();
return 0;
}
// 删除超出限制的已完成任务
const tasksToDelete = completedTasks.slice(this.maxCompletedTasks);
let cleanedCount = 0;
for (const [taskId, task] of this.tasks) {
if (completedStatuses.includes(task.status)) {
for (const [taskId, _] of tasksToDelete) {
this.tasks.delete(taskId);
cleanedCount++;
}
}
if (cleanedCount > 0) {
await this.saveTasks();
// 清理了已完成的任务
console.log(`清理已完成任务: ${cleanedCount} 个`);
}
return cleanedCount;
@@ -172,6 +227,43 @@ class TaskManager {
return stats;
}
/**
* 手动清理任务
*/
async cleanupTasksManually(keepActive = true, keepCompleted = this.maxCompletedTasks) {
let cleanedCount = 0;
if (keepActive) {
// 保留活跃任务
const activeTasks = this.getActiveTasks();
const completedTasks = this.getCompletedTasks()
.sort((a, b) => new Date(b.end_time) - new Date(a.end_time))
.slice(0, keepCompleted);
// 重建任务Map
const newTasks = new Map();
// 添加活跃任务
for (const task of activeTasks) {
newTasks.set(task.id, task);
}
// 添加要保留的已完成任务
for (const task of completedTasks) {
newTasks.set(task.id, task);
}
cleanedCount = this.tasks.size - newTasks.size;
this.tasks = newTasks;
} else {
// 清理所有已完成任务
cleanedCount = await this.cleanupCompletedTasks();
}
await this.saveTasks();
return cleanedCount;
}
}
module.exports = TaskManager;
ui/src/components/download/DownloadProgress.vue
+112
View File
@@ -42,6 +42,36 @@
</div>
</div>
<!-- 批量下载的详细进度 -->
<div v-if="task.type === 'batch' || task.type === 'artist'" class="batch-progress">
<div class="batch-stats">
<div class="stat-item">
<span class="stat-label">已完成:</span>
<span class="stat-value success">{{ task.completed_files }}</span>
</div>
<div class="stat-item">
<span class="stat-label">失败:</span>
<span class="stat-value error">{{ task.failed_files }}</span>
</div>
<div class="stat-item">
<span class="stat-label">剩余:</span>
<span class="stat-value">{{ task.total_files - task.completed_files - task.failed_files }}</span>
</div>
</div>
<!-- 最近完成的作品列表 -->
<div v-if="task.recent_completed && task.recent_completed.length > 0" class="recent-completed">
<h4>最近完成:</h4>
<div class="completed-list">
<div v-for="item in task.recent_completed.slice(0, 3)" :key="item.artwork_id" class="completed-item">
<span class="artwork-id">#{{ item.artwork_id }}</span>
<span v-if="item.artwork_title" class="artwork-title">{{ item.artwork_title }}</span>
<span v-if="item.artist_name" class="artist-name">by {{ item.artist_name }}</span>
</div>
</div>
</div>
</div>
<div class="task-status">
<span class="status-badge" :class="statusClass">
{{ getStatusText(task.status) }}
@@ -398,6 +428,81 @@ const cancelTask = async () => {
margin-top: 0.25rem;
}
/* 批量下载进度样式 */
.batch-progress {
margin: 1rem 0;
padding: 1rem;
background: #f8fafc;
border-radius: 0.5rem;
border: 1px solid #e2e8f0;
}
.batch-stats {
display: flex;
gap: 2rem;
margin-bottom: 1rem;
}
.stat-item {
display: flex;
align-items: center;
gap: 0.5rem;
}
.stat-label {
font-size: 0.875rem;
color: #6b7280;
font-weight: 500;
}
.stat-value {
font-size: 0.875rem;
font-weight: 600;
}
.stat-value.success {
color: #059669;
}
.stat-value.error {
color: #dc2626;
}
.recent-completed h4 {
font-size: 0.875rem;
font-weight: 600;
color: #374151;
margin: 0 0 0.5rem 0;
}
.completed-list {
display: flex;
flex-direction: column;
gap: 0.25rem;
}
.completed-item {
display: flex;
align-items: center;
gap: 0.5rem;
font-size: 0.75rem;
color: #6b7280;
}
.artwork-id {
font-weight: 600;
color: #3b82f6;
}
.artwork-title {
color: #374151;
font-weight: 500;
}
.artist-name {
color: #6b7280;
}
.task-error {
display: flex;
align-items: center;
@@ -413,4 +518,11 @@ const cancelTask = async () => {
.error-icon {
font-size: 1rem;
}
@media (max-width: 768px) {
.batch-stats {
flex-direction: column;
gap: 0.5rem;
}
}
</style>
ui/src/services/download.ts
+21
View File
@@ -128,6 +128,27 @@ class DownloadService {
return apiService.get('/api/download/downloaded-ids');
}
/**
* 清理历史记录
*/
async cleanupHistory(keepCount = 500) {
return apiService.post('/api/download/cleanup/history', { keepCount });
}
/**
* 清理已完成的任务
*/
async cleanupTasks(keepActive = true, keepCompleted = 100) {
return apiService.post('/api/download/cleanup/tasks', { keepActive, keepCompleted });
}
/**
* 获取系统统计信息
*/
async getSystemStats() {
return apiService.get('/api/download/stats');
}
/**
* 使用SSE监听下载进度
*/
ui/src/types/index.ts
+5
View File
@@ -110,6 +110,11 @@ export interface DownloadTask {
end_time?: string;
error?: string;
results?: any[];
recent_completed?: Array<{
artwork_id: number;
artwork_title?: string;
artist_name?: string;
}>;
}
// 搜索参数
ui/src/views/DownloadsView.vue
+362 -170
View File
@@ -4,13 +4,25 @@
<div class="page-header">
<h1>下载管理</h1>
<div class="header-actions">
<button @click="refreshData" class="btn btn-secondary" :disabled="loading">
<svg viewBox="0 0 24 24" fill="currentColor" class="w-4 h-4">
<button @click="refreshData" class="btn btn-primary" :disabled="loading">
<svg viewBox="0 0 24 24" fill="currentColor" class="btn-icon">
<path
d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
</svg>
刷新
</button>
<button @click="cleanupTasks" class="btn btn-secondary" :disabled="loading">
<svg viewBox="0 0 24 24" fill="currentColor" class="btn-icon">
<path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" />
</svg>
清理任务
</button>
<button @click="cleanupHistory" class="btn btn-secondary" :disabled="loading">
<svg viewBox="0 0 24 24" fill="currentColor" class="btn-icon">
<path d="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54.72-1.21-3.5-2.08V8H12z" />
</svg>
清理历史
</button>
</div>
</div>
@@ -26,9 +38,6 @@
<button @click="activeTab = 'history'" class="tab-btn" :class="{ active: activeTab === 'history' }">
下载历史
</button>
<button @click="activeTab = 'files'" class="tab-btn" :class="{ active: activeTab === 'files' }">
文件管理
</button>
</div>
<!-- 下载任务 -->
@@ -37,7 +46,7 @@
<LoadingSpinner text="加载中..." />
</div>
<div v-else-if="tasks.length === 0" class="empty-section">
<div v-else-if="activeTasks.length === 0" class="empty-section">
<div class="empty-content">
<svg viewBox="0 0 24 24" fill="currentColor" class="empty-icon">
<path
@@ -49,7 +58,7 @@
</div>
<div v-else class="tasks-list">
<div v-for="task in tasks" :key="task.id" class="task-card">
<div v-for="task in activeTasks" :key="task.id" class="task-card">
<div class="task-header">
<div class="task-info">
<h3 class="task-title">
@@ -75,6 +84,36 @@
</div>
</div>
<!-- 批量下载的详细进度 -->
<div v-if="task.type === 'batch' || task.type === 'artist'" class="batch-progress">
<div class="batch-stats">
<div class="stat-item">
<span class="stat-label">已完成:</span>
<span class="stat-value success">{{ task.completed_files }}</span>
</div>
<div class="stat-item">
<span class="stat-label">失败:</span>
<span class="stat-value error">{{ task.failed_files }}</span>
</div>
<div class="stat-item">
<span class="stat-label">剩余:</span>
<span class="stat-value">{{ task.total_files - task.completed_files - task.failed_files }}</span>
</div>
</div>
<!-- 最近完成的作品列表 -->
<div v-if="task.recent_completed && task.recent_completed.length > 0" class="recent-completed">
<h4>最近完成:</h4>
<div class="completed-list">
<div v-for="item in task.recent_completed.slice(0, 5)" :key="item.artwork_id" class="completed-item">
<span class="artwork-id">#{{ item.artwork_id }}</span>
<span v-if="item.artwork_title" class="artwork-title">{{ item.artwork_title }}</span>
<span v-if="item.artist_name" class="artist-name">by {{ item.artist_name }}</span>
</div>
</div>
</div>
</div>
<div class="task-details">
<div class="detail-item">
<span class="label">类型:</span>
@@ -125,11 +164,6 @@
{{ getStatusText(item.status) }}
</span>
</div>
<div class="history-actions">
<button @click="openFolder(item.download_path)" class="btn btn-text btn-sm">
打开文件夹
</button>
</div>
</div>
<div class="history-details">
@@ -141,10 +175,6 @@
<span class="label">文件数:</span>
<span class="value">{{ item.completed_files }}/{{ item.total_files }}</span>
</div>
<div class="detail-item">
<span class="label">下载路径:</span>
<span class="value path">{{ item.download_path }}</span>
</div>
<div class="detail-item">
<span class="label">完成时间:</span>
<span class="value">{{ formatDate(item.end_time) }}</span>
@@ -153,90 +183,43 @@
</div>
</div>
</div>
<!-- 文件管理 -->
<div v-if="activeTab === 'files'" class="tab-content">
<div v-if="loading" class="loading-section">
<LoadingSpinner text="加载中..." />
</div>
<div v-else-if="files.length === 0" class="empty-section">
<div class="empty-content">
<svg viewBox="0 0 24 24" fill="currentColor" class="empty-icon">
<path
d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z" />
</svg>
<h3>暂无下载文件</h3>
<p>下载完成后，文件将显示在这里</p>
</div>
</div>
<div v-else class="files-list">
<div v-for="file in files" :key="`${file.artist}_${file.artwork}`" class="file-card">
<div class="file-header">
<div class="file-info">
<h3 class="file-title">{{ file.artwork }}</h3>
<p class="file-artist">{{ file.artist }}</p>
</div>
<div class="file-actions">
<button @click="openFolder(file.path)" class="btn btn-text btn-sm">
打开
</button>
<button @click="deleteFile(file.artist, file.artwork)" class="btn btn-danger btn-sm">
删除
</button>
</div>
</div>
<div class="file-details">
<div class="detail-item">
<span class="label">文件数:</span>
<span class="value">{{ file.files.length }}</span>
</div>
<div class="detail-item">
<span class="label">大小:</span>
<span class="value">{{ formatFileSize(file.total_size) }}</span>
</div>
<div class="detail-item">
<span class="label">创建时间:</span>
<span class="value">{{ formatDate(file.created_at) }}</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted, onUnmounted } from 'vue';
import { ref, computed, onMounted, onUnmounted } from 'vue';
import { useAuthStore } from '@/stores/auth';
import downloadService from '@/services/download';
import type { DownloadTask } from '@/types';
const authStore = useAuthStore();
// 状态
const activeTab = ref<'tasks' | 'history' | 'files'>('tasks');
const activeTab = ref<'tasks' | 'history'>('tasks');
const loading = ref(false);
const error = ref<string | null>(null);
const tasks = ref<DownloadTask[]>([]);
const history = ref<any[]>([]);
const files = ref<any[]>([]);
// 定时器
let progressTimer: number | null = null;
// SSE连接管理
const sseConnections = ref<Map<string, () => void>>(new Map());
// 计算属性：只显示活跃任务
const activeTasks = computed(() => {
return tasks.value.filter(task =>
['downloading', 'paused'].includes(task.status)
);
});
// 获取任务标题
const getTaskTitle = (task: DownloadTask) => {
if (task.type === 'artwork') {
return `作品 ${task.artwork_id}`;
return task.artwork_title || `作品 ${task.artwork_id}`;
} else if (task.type === 'artist') {
return `作者作品`;
return `作者作品 - ${task.artist_name || '未知作者'}`;
} else if (task.type === 'batch') {
return `批量下载 ${task.total_files} 个作品`;
return `批量下载 (${task.total_files} 个作品)`;
}
return '未知任务';
};
@@ -248,7 +231,8 @@ const getStatusText = (status: string) => {
'completed': '已完成',
'failed': '失败',
'cancelled': '已取消',
'partial': '部分完成'
'partial': '部分完成',
'paused': '已暂停'
};
return statusMap[status] || status;
};
@@ -258,7 +242,8 @@ const getTypeText = (type: string) => {
const typeMap: Record<string, string> = {
'artwork': '单个作品',
'artist': '作者作品',
'batch': '批量下载'
'batch': '批量下载',
'ranking': '排行榜下载'
};
return typeMap[type] || type;
};
@@ -274,30 +259,35 @@ const getHistoryTitle = (item: any) => {
return `作者作品 (${artist})`;
} else if (item.type === 'batch') {
return `批量下载 (${item.total_files || 0} 个作品)`;
} else if (item.type === 'ranking') {
return `排行榜下载 (${item.total_files || 0} 个作品)`;
}
return '未知下载任务';
};
// 格式化日期
const formatDate = (dateString: string) => {
return new Date(dateString).toLocaleString('zh-CN');
};
if (!dateString) return '未知时间';
// 格式化文件大小
const formatFileSize = (bytes: number) => {
if (bytes === 0) return '0 B';
const k = 1024;
const sizes = ['B', 'KB', 'MB', 'GB'];
const i = Math.floor(Math.log(bytes) / Math.log(k));
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
try {
// 处理不同的日期格式
const date = new Date(dateString);
if (isNaN(date.getTime())) {
console.warn('无效的日期格式:', dateString);
return '时间格式错误';
}
return date.toLocaleString('zh-CN');
} catch (error) {
console.error('日期格式化错误:', error);
return '时间解析失败';
}
};
// 刷新数据
const refreshData = async () => {
await Promise.all([
fetchTasks(),
fetchHistory(),
fetchFiles()
fetchHistory()
]);
};
@@ -307,6 +297,13 @@ const fetchTasks = async () => {
const response = await downloadService.getAllTasks();
if (response.success) {
tasks.value = response.data || [];
// 为活跃任务建立SSE连接
activeTasks.value.forEach(task => {
if (!sseConnections.value.has(task.id)) {
startTaskStreaming(task.id);
}
});
} else {
throw new Error(response.error || '获取任务列表失败');
}
@@ -315,12 +312,14 @@ const fetchTasks = async () => {
}
};
// 获取历史记录
// 获取历史记录（只获取最近200条）
const fetchHistory = async () => {
try {
const response = await downloadService.getDownloadHistory();
if (response.success) {
history.value = response.data || [];
const response = await downloadService.getDownloadHistory(0, 200);
if (response.success && response.data) {
// 后端返回的结构是 { history: [], total: number, offset: number, limit: number }
history.value = response.data.history || [];
console.log('历史记录获取成功:', history.value.length, '条记录');
} else {
throw new Error(response.error || '获取历史记录失败');
}
@@ -329,17 +328,57 @@ const fetchHistory = async () => {
}
};
// 获取文件列表
const fetchFiles = async () => {
try {
const response = await downloadService.getDownloadedFiles();
if (response.success) {
files.value = response.data || [];
} else {
throw new Error(response.error || '获取文件列表失败');
// 开始SSE监听任务进度
const startTaskStreaming = (taskId: string) => {
// 如果已经有连接，先关闭
if (sseConnections.value.has(taskId)) {
sseConnections.value.get(taskId)!();
}
} catch (err) {
console.error('获取文件列表失败:', err);
console.log('开始SSE监听任务进度:', taskId);
const closeConnection = downloadService.streamTaskProgress(
taskId,
(task) => {
console.log('收到SSE进度更新:', {
taskId,
status: task.status,
progress: task.progress,
completed: task.completed_files,
total: task.total_files
});
// 更新任务状态
const index = tasks.value.findIndex(t => t.id === taskId);
if (index !== -1) {
tasks.value[index] = task;
}
// 如果任务完成，清理连接
if (['completed', 'failed', 'cancelled', 'partial'].includes(task.status)) {
console.log('任务完成，关闭SSE连接:', taskId);
stopTaskStreaming(taskId);
// 延迟刷新历史记录
setTimeout(() => {
fetchHistory();
}, 1000);
}
},
() => {
console.log('SSE连接完成:', taskId);
stopTaskStreaming(taskId);
}
);
sseConnections.value.set(taskId, closeConnection);
};
// 停止SSE监听
const stopTaskStreaming = (taskId: string) => {
if (sseConnections.value.has(taskId)) {
sseConnections.value.get(taskId)!();
sseConnections.value.delete(taskId);
}
};
@@ -358,30 +397,46 @@ const cancelTask = async (taskId: string) => {
}
};
// 删除文件
const deleteFile = async (artist: string, artwork: string) => {
if (!confirm(`确定要删除 "${artist}/${artwork}" 的所有文件吗？`)) {
return;
}
// 清理历史记录
const cleanupHistory = async () => {
if (confirm('确定要清理下载历史吗？这将保留最新的500条记录。')) {
try {
const response = await downloadService.deleteDownloadedFiles(artist, artwork);
loading.value = true;
const response = await downloadService.cleanupHistory(500);
if (response.success) {
await fetchFiles();
await fetchHistory(); // 重新获取历史记录
alert('下载历史已清理！');
} else {
throw new Error(response.error || '删除文件失败');
throw new Error(response.error || '清理历史失败');
}
} catch (err) {
error.value = err instanceof Error ? err.message : '删除文件失败';
console.error('删除文件失败:', err);
error.value = err instanceof Error ? err.message : '清理历史失败';
console.error('清理历史失败:', err);
} finally {
loading.value = false;
}
}
};
// 打开文件夹
const openFolder = (path: string) => {
// 这里可以调用系统API打开文件夹
console.log('打开文件夹:', path);
// 在实际应用中，可以通过electron或其他方式打开文件夹
// 清理任务
const cleanupTasks = async () => {
if (confirm('确定要清理已完成的任务吗？这将保留活跃任务和最新的100个已完成任务。')) {
try {
loading.value = true;
const response = await downloadService.cleanupTasks(true, 100);
if (response.success) {
await fetchTasks(); // 重新获取任务列表
alert('下载任务已清理！');
} else {
throw new Error(response.error || '清理任务失败');
}
} catch (err) {
error.value = err instanceof Error ? err.message : '清理任务失败';
console.error('清理任务失败:', err);
} finally {
loading.value = false;
}
}
};
// 清除错误
@@ -389,29 +444,18 @@ const clearError = () => {
error.value = null;
};
// 开始进度轮询
const startProgressPolling = () => {
progressTimer = setInterval(async () => {
const hasActiveTasks = tasks.value.some(task => task.status === 'downloading');
if (hasActiveTasks) {
await fetchTasks();
}
}, 2000);
};
// 停止进度轮询
const stopProgressPolling = () => {
if (progressTimer) {
clearInterval(progressTimer);
progressTimer = null;
}
// 清理所有SSE连接
const cleanupSSEConnections = () => {
sseConnections.value.forEach(closeConnection => {
closeConnection();
});
sseConnections.value.clear();
};
onMounted(async () => {
loading.value = true;
try {
await refreshData();
startProgressPolling();
} catch (err) {
error.value = err instanceof Error ? err.message : '加载数据失败';
} finally {
@@ -420,7 +464,7 @@ onMounted(async () => {
});
onUnmounted(() => {
stopProgressPolling();
cleanupSSEConnections();
});
</script>
@@ -451,6 +495,66 @@ onUnmounted(() => {
margin: 0;
}
.header-actions {
display: flex;
gap: 0.75rem;
align-items: center;
}
.btn {
display: inline-flex;
align-items: center;
gap: 0.5rem;
padding: 0.75rem 1.25rem;
border: none;
border-radius: 0.5rem;
font-size: 0.875rem;
font-weight: 500;
cursor: pointer;
transition: all 0.2s ease;
text-decoration: none;
white-space: nowrap;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
}
.btn:disabled {
opacity: 0.5;
cursor: not-allowed;
pointer-events: none;
}
.btn-icon {
width: 1.25rem;
height: 1.25rem;
flex-shrink: 0;
}
.btn-primary {
background: #3b82f6;
color: white;
border: 1px solid #3b82f6;
}
.btn-primary:hover:not(:disabled) {
background: #2563eb;
border-color: #2563eb;
transform: translateY(-1px);
box-shadow: 0 4px 6px -1px rgba(59, 130, 246, 0.3);
}
.btn-secondary {
background: white;
color: #374151;
border: 1px solid #d1d5db;
}
.btn-secondary:hover:not(:disabled) {
background: #f9fafb;
border-color: #9ca3af;
transform: translateY(-1px);
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
}
.tabs {
display: flex;
gap: 0.5rem;
@@ -521,14 +625,12 @@ onUnmounted(() => {
}
.tasks-list,
.history-list,
.files-list {
.history-list {
padding: 1.5rem;
}
.task-card,
.history-card,
.file-card {
.history-card {
border: 1px solid #e5e7eb;
border-radius: 0.75rem;
padding: 1.5rem;
@@ -539,15 +641,13 @@ onUnmounted(() => {
}
.task-card:hover,
.history-card:hover,
.file-card:hover {
.history-card:hover {
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
border-color: #d1d5db;
}
.task-header,
.history-header,
.file-header {
.history-header {
display: flex;
justify-content: space-between;
align-items: flex-start;
@@ -555,8 +655,7 @@ onUnmounted(() => {
}
.task-title,
.history-title,
.file-title {
.history-title {
font-size: 1.125rem;
font-weight: 600;
color: #1f2937;
@@ -603,6 +702,11 @@ onUnmounted(() => {
color: #d97706;
}
.task-status.paused {
background: #fef3c7;
color: #d97706;
}
.task-progress {
margin-bottom: 1rem;
}
@@ -628,9 +732,83 @@ onUnmounted(() => {
text-align: center;
}
/* 批量下载进度样式 */
.batch-progress {
margin-bottom: 1rem;
padding: 1rem;
background: #f8fafc;
border-radius: 0.5rem;
border: 1px solid #e2e8f0;
}
.batch-stats {
display: flex;
gap: 2rem;
margin-bottom: 1rem;
}
.stat-item {
display: flex;
align-items: center;
gap: 0.5rem;
}
.stat-label {
font-size: 0.875rem;
color: #6b7280;
font-weight: 500;
}
.stat-value {
font-size: 0.875rem;
font-weight: 600;
}
.stat-value.success {
color: #059669;
}
.stat-value.error {
color: #dc2626;
}
.recent-completed h4 {
font-size: 0.875rem;
font-weight: 600;
color: #374151;
margin: 0 0 0.5rem 0;
}
.completed-list {
display: flex;
flex-direction: column;
gap: 0.25rem;
}
.completed-item {
display: flex;
align-items: center;
gap: 0.5rem;
font-size: 0.75rem;
color: #6b7280;
}
.artwork-id {
font-weight: 600;
color: #3b82f6;
}
.artwork-title {
color: #374151;
font-weight: 500;
}
.artist-name {
color: #6b7280;
}
.task-details,
.history-details,
.file-details {
.history-details {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
gap: 0.5rem;
@@ -658,20 +836,8 @@ onUnmounted(() => {
color: #dc2626;
}
.detail-item .value.path {
font-family: monospace;
font-size: 0.75rem;
word-break: break-all;
}
.file-artist {
font-size: 0.875rem;
color: #6b7280;
margin: 0;
}
.btn-sm {
padding: 0.25rem 0.5rem;
padding: 0.5rem 0.75rem;
font-size: 0.75rem;
}
@@ -681,18 +847,44 @@ onUnmounted(() => {
border: 1px solid #dc2626;
}
.btn-danger:hover {
.btn-danger:hover:not(:disabled) {
background: #b91c1c;
border-color: #b91c1c;
transform: translateY(-1px);
box-shadow: 0 4px 6px -1px rgba(220, 38, 38, 0.3);
}
.btn-text {
background: none;
color: #3b82f6;
border: none;
@media (max-width: 768px) {
.container {
padding: 0 1rem;
}
.btn-text:hover {
background: #f3f4f6;
.page-header {
flex-direction: column;
gap: 1rem;
align-items: flex-start;
}
.header-actions {
width: 100%;
justify-content: flex-start;
flex-wrap: wrap;
gap: 0.5rem;
}
.btn {
padding: 0.625rem 1rem;
font-size: 0.8125rem;
}
.batch-stats {
flex-direction: column;
gap: 0.5rem;
}
.task-details,
.history-details {
grid-template-columns: 1fr;
}
}
</style>