fix: 修复批量下载完成判断与资源勾选同步

- 提前登记整批下载任务，使用线程池并确保完成通知只触发一次
- 为共享 HTTP 会话设置默认超时，覆盖解析、目录及封面请求
- 保留搜索重建后的图片引用，避免封面与复选框消失
- 将分类勾选限定在当前筛选结果内
- 同步网址编辑与勾选状态，支持粘贴、删除和撤销
- 消除进度测试对执行顺序的依赖，补充下载、超时及界面回归测试

Author: happycola233

src/tchmaterial_parser/network.py

@@ -8,11 +8,16 @@
 
 import requests
 
-session = requests.Session() # 初始化请求
-session.trust_env = False # 不读取系统或环境变量中的代理配置
-
 REQUEST_TIMEOUT = (10, 60) # 连接 / 相邻两次收数据的超时秒数；requests 没有全局默认超时，缺失时卡住的请求会永久挂起
 
+class TimeoutSession(requests.Session):
+    def request(self, method: str, url: str, **kwargs) -> requests.Response:
+        kwargs.setdefault("timeout", REQUEST_TIMEOUT)
+        return super().request(method, url, **kwargs)
+
+session = TimeoutSession() # 详情、目录、音频与封面请求统一使用默认超时
+session.trust_env = False # 不读取系统或环境变量中的代理配置
+
 headers = { # 设置请求头部，包含认证信息
     "Authorization": "Bearer 0",
     "Origin": "https://basic.smartedu.cn",

src/tchmaterial_parser/ui/download_panel.py

@@ -6,6 +6,7 @@
 import tkinter as tk
 from collections import Counter
 from collections.abc import Callable
+from concurrent.futures import ThreadPoolExecutor
 from tkinter import ttk, messagebox, filedialog
 from urllib.parse import urlsplit, urlunsplit
 from xml.etree import ElementTree
@@ -228,7 +229,7 @@ def show_parse_progress(current: int, total: int) -> None: # 后台解析大量
     ui_call(progress_label.config, text=f"正在解析链接 {current}/{total}")
 
 def refresh_download_progress() -> None: # 汇总全部任务状态刷新进度条与标签，没有 Content-Length 或出现失败时也能看到进展
-    states = list(download_states) # 下载线程会并发追加状态，先取快照避免遍历时被修改
+    states = list(download_states)
     all_downloaded_size = sum(state["downloaded_size"] for state in states)
     all_total_size = sum(state["total_size"] for state in states)
     finished_number = len([state for state in states if state["finished"]])
@@ -368,19 +369,56 @@ def restore_download_btn() -> None: # 未产生下载任务时恢复界面状态
                 messagebox.showwarning("警告", "以下 “行” 无法解析：\n" + "\n".join(failed_urls)) # 显示警告对话框
             return
 
-        for resource, save_path in download_targets:
-            thread_it(download_file, resource.url, save_path, resource.chapters) # 开始下载（多线程，防止窗口卡死）
-
         progress_label.config(text=f"正在下载 {len(download_targets)} 个文件")
+        directory = dir_path if len(resources_info_list) > 1 else os.path.dirname(download_targets[0][1])
+        start_download_batch(download_targets, directory)
 
         if failed_urls:
             messagebox.showwarning("警告", "以下 “行” 无法解析：\n" + "\n".join(failed_urls)) # 显示警告对话框
 
     parse_urls_in_background(list(urls), bookmark_var.get(), start_downloads)
 
-def download_file(url: str, save_path: str, chapters: list[dict] | None = None) -> None: # 下载文件
-    current_state = { "download_url": url, "save_path": save_path, "downloaded_size": 0, "total_size": 0, "finished": False, "failed_reason": None }
-    download_states.append(current_state)
+def create_download_state(url: str, save_path: str) -> dict:
+    return { "download_url": url, "save_path": save_path, "downloaded_size": 0, "total_size": 0, "finished": False, "failed_reason": None }
+
+def start_download_batch(targets: list[tuple[ResourceInfo, str]], directory: str) -> None:
+    global download_states
+    # 所有排队任务先登记，快速失败或完成的线程也不会漏算尚未启动的任务。
+    states = [create_download_state(resource.url, save_path) for resource, save_path in targets]
+    download_states = states
+
+    def worker() -> None:
+        # 批量勾选可能产生数千个文件，仅保留少量工作线程，其余任务排队。
+        with ThreadPoolExecutor(max_workers=3) as executor:
+            futures = [
+                executor.submit(download_file, resource.url, save_path, resource.chapters, state)
+                for (resource, save_path), state in zip(targets, states)
+            ]
+            for future in futures:
+                future.result()
+        ui_call(finish_download_batch, states, directory) # 全部线程退出后，仅由批次通知一次
+
+    thread_it(worker)
+
+def finish_download_batch(states: list[dict], directory: str) -> None: # 在主线程统一恢复控件并显示整批结果
+    download_progress_bar.config(value=0)
+    progress_label.config(text="等待下载")
+    download_btn.config(state="normal")
+
+    failed_states = [state for state in states if state["failed_reason"]]
+    if failed_states:
+        failed_message = "\n\n".join(
+            f"{os.path.relpath(state['save_path'], directory)}\n{state['failed_reason']}"
+            for state in failed_states
+        )
+        messagebox.showwarning("下载完成", f"文件已下载到：{directory}\n以下文件下载失败：\n{failed_message}")
+    else:
+        messagebox.showinfo("下载完成", f"文件已下载到：{directory}")
+
+def download_file(url: str, save_path: str, chapters: list[dict] | None = None, current_state: dict | None = None) -> None: # 下载文件
+    if current_state is None: # 保留单独下载文件的调用方式
+        current_state = create_download_state(url, save_path)
+        download_states.append(current_state)
     temp_path = f"{save_path}.tmp"
 
     response = None
@@ -389,7 +427,6 @@ def download_file(url: str, save_path: str, chapters: list[dict] | None = None)
             response, attempted_urls = request_download(url)
 
             if not response.ok: # 服务器返回表示错误的 HTTP 状态码
-                current_state["finished"] = True
                 current_state["failed_reason"] = download_failure_reason(response, attempted_urls)
             else:
                 current_state["total_size"] = int(response.headers.get("Content-Length", 0))
@@ -407,7 +444,6 @@ def download_file(url: str, save_path: str, chapters: list[dict] | None = None)
                 if current_state["total_size"] > 0 and current_state["downloaded_size"] != current_state["total_size"]: # 文件下载不完整
                     current_state["failed_reason"] = f"文件下载不完整，需下载 {current_state['total_size']} 字节，实际下载 {current_state['downloaded_size']} 字节"
                     current_state["downloaded_size"], current_state["total_size"] = 0, 0
-                    current_state["finished"] = True
                     try:
                         os.remove(temp_path)
                     except Exception:
@@ -418,12 +454,10 @@ def download_file(url: str, save_path: str, chapters: list[dict] | None = None)
                         add_bookmarks(temp_path, chapters)
 
                     os.replace(temp_path, save_path) # 重命名临时文件为目标文件
-                    current_state["finished"] = True
 
     except Exception as e:
         print_error(e)
         current_state["downloaded_size"], current_state["total_size"] = 0, 0
-        current_state["finished"] = True
         current_state["failed_reason"] = redact_access_token(traceback.format_exc().rstrip())
         try:
             os.remove(temp_path)
@@ -432,28 +466,10 @@ def download_file(url: str, save_path: str, chapters: list[dict] | None = None)
     finally:
         if response is not None:
             response.close()
+        current_state["finished"] = True
 
     refresh_download_progress() # 每个任务结束时刷新一次，重试等待期间也能看到完成数与失败数
 
-    if all(state["finished"] for state in download_states): # 所有文件下载完成
-        ui_call(download_progress_bar.config, value=0) # 重置进度条
-        ui_call(progress_label.config, text="等待下载") # 清空进度标签
-        ui_call(download_btn.config, state="normal") # 设置下载按钮为启用状态
-
-        failed_states = [state for state in download_states if state["failed_reason"]]
-        if failed_states: # 存在下载失败的文件
-            failed_message = "\n\n".join(
-                f"{os.path.basename(state['save_path'])}\n{state['failed_reason']}"
-                for state in failed_states
-            )
-            ui_call(
-                messagebox.showwarning,
-                "下载完成",
-                f"文件已下载到：{os.path.dirname(save_path)}\n以下文件下载失败：\n{failed_message}",
-            )
-        else:
-            ui_call(messagebox.showinfo, "下载完成", f"文件已下载到：{os.path.dirname(save_path)}")
-
 def format_bytes(size: float) -> str: # 将数据单位进行格式化，返回以 KB、MB、GB、TB、PB 为单位的数据大小
     for x in ["字节", "KB", "MB", "GB", "TB"]:
         if size < 1024.0:

src/tchmaterial_parser/ui/resource_tree.py

@@ -130,6 +130,7 @@ def build_resource_tree(pane: ttk.Frame, resource_list: dict[str, dict], url_tex
     tree_preview_images: dict[str, ImageTk.PhotoImage] = {} # 缓存大尺寸封面，用于悬停预览
     loading_tree_images: set[str] = set()
     checked_items: set[str] = set() # 已勾选末级资源的树项路径，搜索重建树视图后仍保留
+    leaf_urls = {item_id: build_resource_url(item_id, data) for item_id, data in iter_leaf_resources(resource_list)}
     checkbox_pils: dict[str, Image.Image] = {} # 三态复选框底图，跟随主题配色重建
     checkbox_icons: dict[str, ImageTk.PhotoImage] = {} # 无封面树项直接使用的复选框图标（已含右侧间距）
     tree_font = tkfont.nametofont("AppBodyFont")
@@ -151,12 +152,13 @@ def build_tree_items(parent: str, items: dict[str, dict], parent_names: tuple[st
             path_names = (*parent_names, display_name)
             tree_item_data[item_id] = option_data
             tree_item_paths[item_id] = path_names
+            tree_item_images[item_id] = compose_item_image(item_id)
             treeview.insert(
                 parent,
                 "end",
                 iid=item_id,
                 text=display_name,
-                image=compose_item_image(item_id),
+                image=tree_item_images[item_id],
                 open=expand_all or not parent,
             )
             children: dict[str, dict] = option_data.get("children", {})
@@ -186,7 +188,7 @@ def on_theme_changed() -> None: # 主题切换后重建复选框配色并刷新
             refresh_item_image(item_id)
 
     def item_check_state(item_id: str) -> str: # 末级资源为勾选/未勾选两态，分类按后代整体勾选情况显示三态
-        node = find_tree_node(resource_list, item_id)
+        node = tree_item_data.get(item_id) or find_tree_node(resource_list, item_id)
         if node is None:
             return "unchecked"
         children = node.get("children")
@@ -273,7 +275,7 @@ def refresh_resource_tree() -> None: # 根据搜索词重建树视图
         ui_call(load_visible_tree_icons)
 
     def insert_resource_urls(urls: list[str]) -> None: # 将链接追加到 URL 输入框，跳过已存在的行
-        existing_lines = set(url_text.get("1.0", "end").splitlines())
+        existing_lines = {line.strip() for line in url_text.get("1.0", "end").splitlines()}
         new_urls = [url for url in dict.fromkeys(urls) if url and url not in existing_lines] # 保序去重，并跳过已存在的链接
         if not new_urls:
             return
@@ -289,7 +291,7 @@ def remove_resource_urls(urls: list[str]) -> None: # 从 URL 输入框移除已
             return
         url_set = set(urls)
         lines = url_text.get("1.0", "end").splitlines()
-        kept_lines = [line for line in lines if line not in url_set]
+        kept_lines = [line for line in lines if line.strip() not in url_set]
         if len(kept_lines) == len(lines):
             return
         url_text.delete("1.0", "end")
@@ -300,7 +302,8 @@ def update_checked_count() -> None: # 更新已勾选教材数量提示
         checked_count_label.config(text=f"已选 {len(checked_items)} 项" if checked_items else "")
 
     def toggle_item(item_id: str) -> None: # 切换树项勾选状态：分类按三态决定目标状态并级联其下所有末级资源
-        node = find_tree_node(resource_list, item_id)
+        sync_checked_items() # 文本修改事件尚未处理时，也以最新输入为准
+        node = tree_item_data.get(item_id) # 搜索时只操作当前筛选出的子树
         if node is None:
             return
         children = node.get("children")
@@ -313,33 +316,37 @@ def toggle_item(item_id: str) -> None: # 切换树项勾选状态：分类按三
         set_items_checked(leafs, checked)
 
     def set_items_checked(leafs: list[tuple[str, dict]], checked: bool) -> None: # 批量更新末级资源勾选状态，级联刷新图标并同步 URL 输入框
-        changed_leafs: list[tuple[str, dict]] = []
-        for leaf_id, leaf_data in leafs:
-            if checked == (leaf_id in checked_items):
-                continue
-            if checked:
-                checked_items.add(leaf_id)
-            else:
-                checked_items.discard(leaf_id)
-            changed_leafs.append((leaf_id, leaf_data))
-        if not changed_leafs:
+        urls = [leaf_urls[leaf_id] for leaf_id, _leaf_data in leafs]
+        if checked:
+            insert_resource_urls(urls)
+        else:
+            remove_resource_urls(urls)
+        sync_checked_items()
+
+    def sync_checked_items() -> None: # 粘贴、删除、撤销以及树项操作统一以输入框中的链接为准
+        urls = {line.strip() for line in url_text.get("1.0", "end").splitlines()}
+        new_checked_items = {item_id for item_id, url in leaf_urls.items() if url in urls}
+        changed_ids = checked_items.symmetric_difference(new_checked_items)
+        if not changed_ids:
             return
+        checked_items.clear()
+        checked_items.update(new_checked_items)
 
         refresh_ids: set[str] = set() # 状态变化的末级资源及其各级祖先分类都需要刷新图标
-        for leaf_id, _leaf_data in changed_leafs:
+        for leaf_id in changed_ids:
             segments = leaf_id.split(":")
             refresh_ids.update(":".join(segments[:index]) for index in range(1, len(segments) + 1))
         for refresh_id in refresh_ids:
             if refresh_id in tree_item_data:
                 refresh_item_image(refresh_id)
 
-        urls = [build_resource_url(leaf_id, leaf_data) for leaf_id, leaf_data in changed_leafs]
-        if checked:
-            insert_resource_urls(urls)
-        else:
-            remove_resource_urls(urls)
         update_checked_count()
 
+    def on_urls_modified(_event: tk.Event) -> None:
+        if url_text.edit_modified():
+            url_text.edit_modified(False)
+            sync_checked_items()
+
     def on_tree_press(event: tk.Event) -> str | None: # 按下鼠标时隐藏悬停提示；左键点击标题或封面（含复选框）时切换勾选，点击箭头或缩进保持展开收起
         hide_tree_tooltip()
         if event.num != 1 or treeview.identify("element", event.x, event.y) not in ("text", "image"):
@@ -476,6 +483,9 @@ def on_tree_shift_mousewheel(event: tk.Event) -> str:
     theme.on_theme_applied(on_theme_changed) # 主题切换后重建复选框配色并刷新树项图标
     update_checked_count()
     refresh_resource_tree() # 初始展示完整资源树并展开一级目录
+    sync_checked_items()
+    url_text.edit_modified(False)
+    url_text.bind("<<Modified>>", on_urls_modified, add="+")
     search_var.trace_add("write", schedule_search)
     treeview.configure(yscrollcommand=on_tree_view_change)
     treeview.bind("<space>", on_tree_space)