重大界面美化和功能优化

新功能:
- 现代化渐变背景和卡片式布局
- 智能下载队列管理
- 实时进度条和状态同步
- 美观的浮动通知系统
- 键盘快捷键支持 (Enter提交)

修复问题:
- 修复进度条不同步问题
- 优化任务状态实时更新
- 改进队列处理逻辑
- 增强错误处理和重试机制
- 修复文件下载编码问题

用户体验提升:
- 输入ID立即显示在队列中
- 自动队列管理和任务调度
- 当前下载任务高亮显示
- 更频繁的状态刷新 (2秒)
- 响应式设计支持移动端

界面改进:
- 使用Font Awesome图标库
- 毛玻璃效果和阴影
- 状态徽章和动画效果
- 现代化按钮和表单设计
- 优化的颜色主题和排版

server.py

@@ -17,24 +17,41 @@ NAMES = {}
 # 后台下载任务处理线程
 def process_queue():
     while True:
-        book_id = TASK_QUEUE.get()
-        STATUS[book_id] = "in-progress"
-        save_path = os.path.join(DOWNLOAD_ROOT, book_id)
-        os.makedirs(save_path, exist_ok=True)
         try:
-            fetch_api_endpoints_from_server()
-            Run(book_id, save_path)
-            name, _, _ = get_book_info(book_id, get_headers())
-            filename = f"{name}.txt"
-            path = os.path.join(save_path, filename)
-            if os.path.exists(path):
-                FILE_PATHS[book_id] = f"/files/{book_id}/{filename}"
-                NAMES[book_id] = name
-                STATUS[book_id] = "done"
-            else:
+            book_id = TASK_QUEUE.get(timeout=1)  # 添加超时避免无限等待
+            if book_id in STATUS and STATUS[book_id] != "queued":
+                continue  # 跳过已经处理过的任务
+
+            STATUS[book_id] = "in-progress"
+            save_path = os.path.join(DOWNLOAD_ROOT, book_id)
+            os.makedirs(save_path, exist_ok=True)
+
+            try:
+                fetch_api_endpoints_from_server()
+                Run(book_id, save_path)
+                name, _, _ = get_book_info(book_id, get_headers())
+                if not name:
+                    name = f"小说_{book_id}"
+
+                filename = f"{name}.txt"
+                path = os.path.join(save_path, filename)
+
+                if os.path.exists(path):
+                    FILE_PATHS[book_id] = f"/files/{book_id}/{filename}"
+                    NAMES[book_id] = name
+                    STATUS[book_id] = "done"
+                    print(f"下载完成: {name}")
+                else:
+                    STATUS[book_id] = "error"
+                    print(f"下载失败: 文件不存在 - {book_id}")
+
+            except Exception as e:
                 STATUS[book_id] = "error"
-        except Exception:
-            STATUS[book_id] = "error"
+                print(f"下载异常: {book_id} - {str(e)}")
+
+        except:
+            # 队列为空时的超时，继续循环
+            continue
 
 
 app = FastAPI(
@@ -316,6 +333,22 @@ def root():
             color: #742a2a;
         }
 
+        .current-download {
+            animation: pulse 2s infinite;
+        }
+
+        @keyframes pulse {
+            0% { opacity: 1; }
+            50% { opacity: 0.7; }
+            100% { opacity: 1; }
+        }
+
+        .progress-info {
+            font-size: 0.8rem;
+            color: #4a5568;
+            margin-top: 0.25rem;
+        }
+
         .search-container {
             display: flex;
             gap: 0.5rem;
@@ -484,10 +517,71 @@ def root():
     <script>
     // 工具函数
     function showNotification(message, type = 'info') {
-        // 简单的通知显示，可以后续扩展
+        // 创建通知元素
+        const notification = document.createElement('div');
+        notification.className = `notification notification-${type}`;
+        notification.innerHTML = `
+            <i class="fas ${getNotificationIcon(type)}"></i>
+            <span>${message}</span>
+        `;
+
+        // 添加样式
+        notification.style.cssText = `
+            position: fixed;
+            top: 20px;
+            right: 20px;
+            padding: 12px 16px;
+            border-radius: 8px;
+            color: white;
+            font-weight: 500;
+            z-index: 1000;
+            max-width: 300px;
+            box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+            transform: translateX(100%);
+            transition: transform 0.3s ease;
+            background: ${getNotificationColor(type)};
+        `;
+
+        document.body.appendChild(notification);
+
+        // 显示动画
+        setTimeout(() => {
+            notification.style.transform = 'translateX(0)';
+        }, 100);
+
+        // 自动隐藏
+        setTimeout(() => {
+            notification.style.transform = 'translateX(100%)';
+            setTimeout(() => {
+                if (notification.parentNode) {
+                    notification.parentNode.removeChild(notification);
+                }
+            }, 300);
+        }, type === 'error' ? 5000 : 3000);
+
         console.log(`${type.toUpperCase()}: ${message}`);
     }
 
+    function getNotificationIcon(type) {
+        const icons = {
+            'success': 'fa-check-circle',
+            'error': 'fa-exclamation-circle',
+            'warning': 'fa-exclamation-triangle',
+            'info': 'fa-info-circle'
+        };
+        return icons[type] || icons.info;
+    }
+
+    function getNotificationColor(type) {
+        const colors = {
+            'success': 'linear-gradient(135deg, #10b981, #059669)',
+            'error': 'linear-gradient(135deg, #ef4444, #dc2626)',
+            'warning': 'linear-gradient(135deg, #f59e0b, #d97706)',
+            'info': 'linear-gradient(135deg, #3b82f6, #2563eb)'
+        };
+        return colors[type] || colors.info;
+    }
+
     function setButtonLoading(button, loading = true) {
         if (loading) {
             button.disabled = true;
@@ -515,25 +609,79 @@ def root():
         setButtonLoading(btn, true);
 
         try {
-            // 根据当前队列决定是否排队
+            // 解析输入的ID
+            const ids = book_ids.split(/[\s,;]+/).filter(id => id);
+
+            // 先将所有ID加入队列
+            for (const bid of ids) {
+                await fetch(`/enqueue?book_id=${encodeURIComponent(bid)}`);
+            }
+
+            // 清空输入框
+            document.getElementById('book_ids').value = '';
+
+            // 立即刷新队列显示
+            fetchTasks();
+            showNotification(`已添加 ${ids.length} 个任务到队列`, 'success');
+
+            // 检查是否有正在进行的任务
             const tasks = await fetch('/tasks').then(res => res.json());
-            if (tasks.filter(t => t.status !== 'done').length > 0) {
-                const ids = book_ids.split(/[\s,;]+/).filter(id => id);
-                for (const bid of ids) {
-                    await fetch(`/enqueue?book_id=${encodeURIComponent(bid)}`);
+            const activeTasks = tasks.filter(t => t.status === 'in-progress');
+
+            // 如果没有正在进行的任务，开始处理第一个排队的任务
+            if (activeTasks.length === 0) {
+                const queuedTasks = tasks.filter(t => t.status === 'queued');
+                if (queuedTasks.length > 0) {
+                    // 开始下载第一个排队的任务
+                    const firstTask = queuedTasks[0];
+                    startDirectDownload(firstTask.book_id);
                 }
-                fetchTasks();
-                showNotification(`已添加 ${ids.length} 个任务到队列`, 'success');
-                setButtonLoading(btn, false);
-                return;
             }
 
-            // 显示进度条
+            setButtonLoading(btn, false);
+        } catch (error) {
+            setButtonLoading(btn, false);
+            showNotification('添加任务失败：' + error.message, 'error');
+        }
+    });
+
+    // 全局变量跟踪下载状态
+    let isDownloading = false;
+    let currentDownloadId = null;
+
+    // 直接下载函数
+    async function startDirectDownload(bookId) {
+        if (isDownloading) {
+            console.log('已有下载任务在进行中，跳过');
+            return;
+        }
+
+        isDownloading = true;
+        currentDownloadId = bookId;
+
+        try {
+            // 重置并显示进度条
             const progressContainer = document.getElementById('progress');
+            const progBar = document.getElementById('progBar');
+            const progText = document.getElementById('progText');
+
+            progBar.style.width = '0%';
+            progText.innerText = '0%';
             progressContainer.style.display = 'block';
             progressContainer.classList.add('fade-in');
 
-            const response = await fetch(`/download?book_ids=${encodeURIComponent(book_ids)}`);
+            // 清空之前的下载结果
+            const resultDiv = document.getElementById('downloadResult');
+            resultDiv.innerHTML = '';
+
+            showNotification(`开始下载小说 ${NAMES[bookId] || bookId}...`, 'info');
+
+            const response = await fetch(`/download?book_ids=${encodeURIComponent(bookId)}`);
+
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+            }
+
             const total = response.headers.get('Content-Length');
             const reader = response.body.getReader();
             let received = 0;
@@ -542,64 +690,135 @@ def root():
             function read() {
                 return reader.read().then(({done, value})=>{
                     if (done) {
-                        const blob = new Blob(chunks, {type: response.headers.get('Content-Type')});
-                        const url = URL.createObjectURL(blob);
-                        const cd = response.headers.get('Content-Disposition');
-                        let filename = 'download';
-                        if (cd) {
-                            const match = cd.match(/filename="?(.+)"?/);
-                            if (match) filename = match[1];
+                        try {
+                            const blob = new Blob(chunks, {type: response.headers.get('Content-Type')});
+                            const url = URL.createObjectURL(blob);
+                            const cd = response.headers.get('Content-Disposition');
+                            let filename = 'download.txt';
+                            if (cd) {
+                                const match = cd.match(/filename[*]?=['"]?([^'";\r\n]+)['"]?/);
+                                if (match) filename = decodeURIComponent(match[1]);
+                            }
+
+                            // 生成下载链接
+                            const link = document.createElement('a');
+                            link.href = url;
+                            link.download = filename;
+                            link.className = 'download-link fade-in';
+                            link.innerHTML = `<i class="fas fa-download"></i> ${filename}`;
+
+                            resultDiv.innerHTML = '';
+                            resultDiv.appendChild(link);
+
+                            // 隐藏进度条
+                            progressContainer.style.display = 'none';
+
+                            showNotification(`下载完成：${filename}`, 'success');
+
+                            // 标记下载完成
+                            isDownloading = false;
+                            currentDownloadId = null;
+
+                            // 刷新任务列表和已下载列表
+                            fetchTasks();
+                            fetchCompleted();
+
+                            // 检查是否还有排队的任务
+                            setTimeout(async () => {
+                                try {
+                                    const tasks = await fetch('/tasks').then(res => res.json());
+                                    const queuedTasks = tasks.filter(t => t.status === 'queued');
+                                    if (queuedTasks.length > 0 && !isDownloading) {
+                                        startDirectDownload(queuedTasks[0].book_id);
+                                    }
+                                } catch (error) {
+                                    console.error('检查队列任务失败:', error);
+                                }
+                            }, 1000);
+
+                        } catch (error) {
+                            console.error('处理下载结果失败:', error);
+                            showNotification('处理下载结果失败', 'error');
                         }
-
-                        // 生成下载链接
-                        const link = document.createElement('a');
-                        link.href = url;
-                        link.download = filename;
-                        link.className = 'download-link fade-in';
-                        link.innerHTML = `<i class="fas fa-download"></i> ${filename}`;
-
-                        const resultDiv = document.getElementById('downloadResult');
-                        resultDiv.innerHTML = '';
-                        resultDiv.appendChild(link);
-
-                        setButtonLoading(btn, false);
-                        progressContainer.style.display = 'none';
-                        showNotification('下载完成！', 'success');
                         return;
                     }
 
                     chunks.push(value);
                     received += value.length;
-                    if (total) {
-                        const percent = Math.round(received / total * 100);
-                        document.getElementById('progBar').style.width = percent + '%';
-                        document.getElementById('progText').innerText = percent + '%';
+
+                    // 更新进度条
+                    if (total && parseInt(total) > 0) {
+                        const percent = Math.min(100, Math.round((received / parseInt(total)) * 100));
+                        progBar.style.width = percent + '%';
+                        progText.innerText = percent + '%';
+                    } else {
+                        // 如果没有总长度信息，显示已接收的数据量
+                        const mb = (received / (1024 * 1024)).toFixed(1);
+                        progText.innerText = `已下载 ${mb} MB`;
+                        // 使用动画效果显示进度
+                        const animatedPercent = Math.min(90, (received / 1000000) * 10); // 假设进度
+                        progBar.style.width = animatedPercent + '%';
                     }
+
                     return read();
                 });
             }
-            read();
+
+            await read();
+
         } catch (error) {
-            setButtonLoading(btn, false);
-            document.getElementById('progress').style.display = 'none';
-            showNotification('下载失败：' + error.message, 'error');
+            console.error('下载失败:', error);
+
+            // 隐藏进度条
+            const progressContainer = document.getElementById('progress');
+            progressContainer.style.display = 'none';
+
+            showNotification(`下载失败：${error.message}`, 'error');
+
+            // 标记下载完成（即使失败）
+            isDownloading = false;
+            currentDownloadId = null;
+
+            // 即使失败也要继续处理下一个任务
+            setTimeout(async () => {
+                try {
+                    const tasks = await fetch('/tasks').then(res => res.json());
+                    const queuedTasks = tasks.filter(t => t.status === 'queued');
+                    if (queuedTasks.length > 0 && !isDownloading) {
+                        startDirectDownload(queuedTasks[0].book_id);
+                    }
+                } catch (error) {
+                    console.error('检查队列任务失败:', error);
+                }
+            }, 2000);
         }
-    });
+    }
+    // 全局变量存储任务名称
+    let NAMES = {};
+
     // 刷新队列和已下载列表
     function fetchTasks() {
         fetch('/tasks').then(res => res.json()).then(data => {
             const container = document.getElementById('taskList');
             const activeTasks = data.filter(task => task.status !== 'done');
 
+            // 更新全局名称缓存
+            data.forEach(task => {
+                if (task.name) {
+                    NAMES[task.book_id] = task.name;
+                }
+            });
+
             if (activeTasks.length === 0) {
                 container.innerHTML = '<div class="list-item"><span style="color: #a0aec0;"><i class="fas fa-check"></i> 暂无下载任务</span></div>';
                 return;
             }
 
             container.innerHTML = '';
-            activeTasks.forEach(task => {
+            activeTasks.forEach((task, index) => {
                 const div = document.createElement('div');
                 div.className = 'list-item fade-in';
+                div.setAttribute('data-book-id', task.book_id);
 
                 const statusClass = {
                     'queued': 'status-queued',
@@ -614,14 +833,18 @@ def root():
                 }[task.status] || 'fas fa-clock';
 
                 const statusText = {
-                    'queued': '排队中',
+                    'queued': index === 0 ? '即将开始' : '排队中',
                     'in-progress': '下载中',
                     'error': '失败'
                 }[task.status] || '未知';
 
+                // 如果是当前正在下载的任务，添加特殊标识
+                const isCurrentDownload = task.book_id === currentDownloadId;
+                const extraClass = isCurrentDownload ? ' current-download' : '';
+
                 div.innerHTML = `
                     <span><i class="fas fa-book"></i> ${task.name || task.book_id}</span>
-                    <span class="status-badge ${statusClass}">
+                    <span class="status-badge ${statusClass}${extraClass}">
                         <i class="${statusIcon}"></i> ${statusText}
                     </span>
                 `;
@@ -629,6 +852,8 @@ def root():
             });
         }).catch(error => {
             console.error('获取任务列表失败:', error);
+            const container = document.getElementById('taskList');
+            container.innerHTML = '<div class="list-item"><span style="color: #ef4444;"><i class="fas fa-exclamation-triangle"></i> 获取任务列表失败</span></div>';
         });
     }
 
@@ -748,8 +973,22 @@ def root():
             }
         }, 10000);
 
-        // 自动刷新队列
-        setInterval(fetchTasks, 3000);
+        // 自动刷新队列 - 更频繁的刷新以保持同步
+        setInterval(() => {
+            fetchTasks();
+            // 如果有下载任务在进行，检查是否需要启动下一个
+            if (!isDownloading) {
+                fetch('/tasks').then(res => res.json()).then(tasks => {
+                    const queuedTasks = tasks.filter(t => t.status === 'queued');
+                    const inProgressTasks = tasks.filter(t => t.status === 'in-progress');
+
+                    // 如果没有进行中的任务但有排队的任务，启动下载
+                    if (inProgressTasks.length === 0 && queuedTasks.length > 0) {
+                        startDirectDownload(queuedTasks[0].book_id);
+                    }
+                }).catch(console.error);
+            }
+        }, 2000);
 
         // 添加一些交互效果
         document.querySelectorAll('.card').forEach(card => {
@@ -760,6 +999,14 @@ def root():
                 card.style.transform = 'translateY(0)';
             });
         });
+
+        // 添加键盘快捷键
+        document.getElementById('book_ids').addEventListener('keypress', (e) => {
+            if (e.key === 'Enter' && !e.shiftKey) {
+                e.preventDefault();
+                document.getElementById('downloadBtn').click();
+            }
+        });
     });
     </script>
 </body>
@@ -772,6 +1019,21 @@ def enqueue(book_id: str):
     # 如果已有任务在队列或处理中
     if STATUS.get(book_id) in ("queued", "in-progress"):
         return {"message": "已在队列", "status": STATUS[book_id]}
+
+    # 如果任务已完成，重新设置为排队状态
+    if STATUS.get(book_id) == "done":
+        STATUS[book_id] = "queued"
+        TASK_QUEUE.put(book_id)
+        return {"message": "重新添加到下载队列", "status": "queued"}
+
+    # 获取书籍信息并设置名称
+    try:
+        name, _, _ = get_book_info(book_id, get_headers())
+        if name:
+            NAMES[book_id] = name
+    except:
+        NAMES[book_id] = f"小说_{book_id}"
+
     TASK_QUEUE.put(book_id)
     STATUS[book_id] = "queued"
     return {"message": "已添加到下载队列", "status": "queued"}
@@ -808,51 +1070,84 @@ def download(book_ids: str):
     ids = [bid.strip() for bid in re.split(r'[\s,;]+', book_ids) if bid.strip()]
     if not ids:
         raise HTTPException(status_code=400, detail="请提供至少一个 book_id")
+
     # 在临时目录创建下载文件夹
     save_path = tempfile.mkdtemp(prefix="tomato_")
-    # mkdtemp 已创建空目录，无需清理
-
-    # 调用下载核心 - 支持批量ID
-    for bid in ids:
-        try:
-            Run(bid, save_path)
-        except Exception as e:
-            raise HTTPException(status_code=500, detail=f"下载 {bid} 失败: {str(e)}")
 
-    # 收集生成的 txt 文件
-    txt_files = glob.glob(os.path.join(save_path, "*.txt"))
-    if not txt_files:
-        raise HTTPException(status_code=404, detail="未生成txt文件，下载失败")
+    try:
+        # 调用下载核心 - 支持批量ID
+        for bid in ids:
+            try:
+                # 更新状态为下载中
+                STATUS[bid] = "in-progress"
+
+                # 获取书籍信息
+                name, _, _ = get_book_info(bid, get_headers())
+                if not name:
+                    name = f"小说_{bid}"
+                NAMES[bid] = name
 
-    # 将下载文件复制到共享目录并更新映射
-    for bid in ids:
+                # 执行下载
+                fetch_api_endpoints_from_server()
+                Run(bid, save_path)
+
+                # 检查文件是否生成
+                expected_filename = f"{name}.txt"
+                expected_path = os.path.join(save_path, expected_filename)
+
+                if os.path.exists(expected_path):
+                    # 复制到共享目录
+                    dest_dir = os.path.join(DOWNLOAD_ROOT, bid)
+                    os.makedirs(dest_dir, exist_ok=True)
+                    dst = os.path.join(dest_dir, expected_filename)
+                    shutil.copy(expected_path, dst)
+
+                    # 更新状态
+                    FILE_PATHS[bid] = f"/files/{bid}/{expected_filename}"
+                    STATUS[bid] = "done"
+                else:
+                    STATUS[bid] = "error"
+                    raise Exception(f"文件未生成: {expected_filename}")
+
+            except Exception as e:
+                STATUS[bid] = "error"
+                print(f"下载 {bid} 失败: {str(e)}")
+                raise HTTPException(status_code=500, detail=f"下载 {bid} 失败: {str(e)}")
+
+        # 收集生成的 txt 文件
+        txt_files = glob.glob(os.path.join(save_path, "*.txt"))
+        if not txt_files:
+            raise HTTPException(status_code=404, detail="未生成txt文件，下载失败")
+
+        # 如果只有一个文件，直接返回
+        if len(txt_files) == 1:
+            file_path = txt_files[0]
+            filename = os.path.basename(file_path)
+            return FileResponse(
+                path=file_path,
+                filename=filename,
+                media_type="text/plain; charset=utf-8",
+                headers={"Content-Disposition": f"attachment; filename*=UTF-8''{filename}"}
+            )
+
+        # 多文件时打包成 ZIP 并返回
+        zip_path = os.path.join(save_path, "novels.zip")
+        with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zf:
+            for fpath in txt_files:
+                zf.write(fpath, arcname=os.path.basename(fpath))
+
+        return FileResponse(
+            path=zip_path,
+            filename="novels.zip",
+            media_type="application/zip",
+            headers={"Content-Disposition": "attachment; filename=novels.zip"}
+        )
+
+    except Exception as e:
+        # 清理临时文件
         try:
-            name, _, _ = get_book_info(bid, get_headers())
-            filename = f"{name}.txt"
-            src = os.path.join(save_path, filename)
-            dest_dir = os.path.join(DOWNLOAD_ROOT, bid)
-            os.makedirs(dest_dir, exist_ok=True)
-            dst = os.path.join(dest_dir, filename)
-            if os.path.exists(src):
-                shutil.copy(src, dst)
-                NAMES[bid] = name
-                FILE_PATHS[bid] = f"/files/{bid}/{filename}"
-                STATUS[bid] = "done"
+            shutil.rmtree(save_path)
         except:
             pass
-    txt_files = glob.glob(os.path.join(save_path, "*.txt"))
-    if not txt_files:
-        raise HTTPException(status_code=404, detail="未生成txt文件，下载失败")
-
-    # 如果只有一个文件，直接返回
-    if len(txt_files) == 1:
-        file_path = txt_files[0]
-        return FileResponse(path=file_path, filename=os.path.basename(file_path), media_type="text/plain")
-
-    # 多文件时打包成 ZIP 并返回
-    zip_path = os.path.join(save_path, "novels.zip")
-    with zipfile.ZipFile(zip_path, "w") as zf:
-        for fpath in txt_files:
-            zf.write(fpath, arcname=os.path.basename(fpath))
-    return FileResponse(path=zip_path, filename="novels.zip", media_type="application/zip")
+        raise