Update eh_logic.py

eh_logic.py

@@ -1,14 +1,25 @@
 import os
 import shutil
 import subprocess
+import gradio as gr  # 引入 gradio 用于类型提示和进度条
 from utils import BASE_DIR, PDF_FINAL_DIR, sanitize_filename, manual_merge_pdf
 
-def run_eh_download(eh_url, cookies_str):
+def run_eh_download(eh_url, cookies_str, progress=gr.Progress()):
+    """
+    progress=gr.Progress() 是 Gradio 的魔法参数。
+    只要函数参数里写了这个，Gradio 就会自动在界面显示进度条。
+    """
+    
+    # --- Debug: 打印到后台控制台，确认函数被调用 ---
+    print(f"[-] Debug:收到任务 URL: {eh_url}")
+
     # 1. 检查参数
     if not eh_url:
         yield None, "❌ 请输入画廊链接", "参数缺失"
         return
     
+    progress(0, desc="正在初始化环境...")
+    
     # 2. 目录准备
     eh_base_dir = os.path.join(BASE_DIR, "eh_temp")
     if os.path.exists(eh_base_dir):
@@ -19,46 +30,80 @@ def run_eh_download(eh_url, cookies_str):
     os.makedirs(eh_base_dir, exist_ok=True)
     
     # 3. 处理 Cookies
+    progress(0.1, desc="正在写入 Cookies...")
     cookie_file_path = os.path.join(BASE_DIR, "eh_cookies.txt")
     with open(cookie_file_path, "w", encoding="utf-8") as f:
         f.write(cookies_str)
 
-    yield None, "🚀 启动 gallery-dl 解析...", "开始解析"
-
     # 4. 构建命令
+    # 增加 --verbose 参数，这样如果卡住，日志会显示更多细节
     cmd = [
         "gallery-dl",
+        "--verbose", 
         "--directory", eh_base_dir,
         "--cookies", cookie_file_path,
         eh_url
     ]
 
+    # --- Debug: 打印完整命令 ---
+    # 你可以复制这行命令直接在终端运行，看看是不是环境问题
+    print(f"[-] Debug: 即将执行命令: {' '.join(cmd)}")
+    
+    yield None, f"🚀 正在启动进程...\n命令: {' '.join(cmd)}", "启动中"
+    progress(0.2, desc="正在连接 E站 (若卡住请检查Cookies)...")
+
     # 5. 执行下载
     try:
+        # bufsize=0 和 universal_newlines=True 确保输出不被缓存，实时显示
         process = subprocess.Popen(
             cmd, 
             stdout=subprocess.PIPE, 
             stderr=subprocess.STDOUT,
-            text=True
+            text=True,
+            bufsize=1 
         )
         
         logs = ""
+        img_count = 0
+        
+        # 逐行读取日志
         for line in process.stdout:
-            logs += line
-            if "Example" in line or "http" in line or "#" in line:
-                yield None, f"📥 下载中...\n{line.strip()}", "下载中"
+            line = line.strip()
+            if not line: continue
+            
+            logs += line + "\n"
+            
+            # --- 进度条逻辑 ---
+            # gallery-dl 的 verbose 输出里，下载图片通常包含 "#" 或 "http"
+            if "#" in line and "http" in line:
+                img_count += 1
+                # 更新进度条描述
+                progress(None, desc=f"正在下载第 {img_count} 张图片...")
+            
+            # 遇到特定关键词更新状态
+            if "Connection" in line:
+                 progress(None, desc="正在建立连接...")
+            elif "403 Forbidden" in line:
+                 progress(None, desc="❌ 403 拒绝访问 (Cookies无效)")
+
+            # 实时推送到前端日志框
+            # 限制日志长度防止前端卡顿，只显示最近 10 行
+            yield None, f"{line}", f"已下载: {img_count}"
         
         process.wait()
 
         if process.returncode != 0:
-            yield None, f"❌ 下载失败，请检查 Cookies 或链接。\n日志片段:\n{logs[-500:]}", "下载失败"
+            print(f"[-] Debug: 进程退出码: {process.returncode}")
+            yield None, f"❌ 下载失败 (Code {process.returncode})。\n请查看上方日志检查 Cookies 是否过期。", "失败"
             return
 
     except Exception as e:
+        print(f"[-] Debug: Python 异常: {e}")
         yield None, f"❌ 调用出错: {e}", "系统错误"
         return
 
     # 6. 寻找图片目录
+    progress(0.9, desc="下载完成，正在搜索文件...")
     target_img_dir = None
     for root, dirs, files in os.walk(eh_base_dir):
         if any(f.lower().endswith(('.jpg', '.png', '.jpeg')) for f in files):
@@ -66,7 +111,7 @@ def run_eh_download(eh_url, cookies_str):
             break
     
     if not target_img_dir:
-        yield None, "❌ 未找到下载的图片 (可能是 Sad Panda 问题)", "未找到图片"
+        yield None, "❌ 未找到下载的图片，可能是 Sad Panda 或下载被中断。", "空目录"
         return
 
     # 7. 合并 PDF
@@ -75,11 +120,14 @@ def run_eh_download(eh_url, cookies_str):
     final_pdf_name = f"[EH] {safe_title}.pdf"
     final_pdf_path = os.path.join(PDF_FINAL_DIR, final_pdf_name)
 
-    yield None, "🔨 正在合并 PDF...", "正在合并"
+    progress(0.95, desc="正在合并 PDF (大文件可能较慢)...")
+    yield None, "🔨 正在合并 PDF...", "合并中"
+    
     try:
         manual_merge_pdf(target_img_dir, final_pdf_path)
     except Exception as e:
         yield None, f"❌ 合并失败: {e}", "合并失败"
         return
 
+    progress(1.0, desc="全部完成！")
     yield [final_pdf_path], f"✅ 处理完成！\n文件: {final_pdf_name}", "完成"