refactor(source): 重构 cloudflare优化器并改进下载功能

- 重构 IpOptimizer 类，优化 CloudflareSpeedTest 工具的调用和处理
- 改进下载功能，包括手动停止下载、错误处理和日志记录
- 更新配置文件，增加日志文件路径和用户代理模板

source/main_window.py

@@ -4,25 +4,115 @@ import shutil
 import webbrowser
 import requests
 import py7zr
+import json
+from urllib.parse import urlparse
 from collections import deque
 from PySide6 import QtWidgets
-from PySide6.QtCore import QTimer, Qt
+from PySide6.QtCore import QTimer, Qt, QThread, Signal
 from PySide6.QtGui import QIcon, QAction
-from PySide6.QtWidgets import QMainWindow, QFileDialog, QApplication
+from PySide6.QtWidgets import QMainWindow, QFileDialog, QApplication, QMessageBox, QPushButton
 
 from Ui_install import Ui_MainWindows
 from animations import MultiStageAnimations
 from config import (
-    APP_NAME, APP_VERSION, PLUGIN, GAME_INFO, BLOCK_SIZE, 
-    PLUGIN_HASH, UA, CONFIG_URL
+    APP_NAME, APP_VERSION, PLUGIN, GAME_INFO, BLOCK_SIZE,
+    PLUGIN_HASH, UA, CONFIG_URL, LOG_FILE
 )
 from utils import (
-    load_base64_image, HashManager, AdminPrivileges, msgbox_frame
+    load_base64_image, HashManager, AdminPrivileges, msgbox_frame,
+    load_config, save_config, HostsManager, censor_url
 )
 from download import DownloadThread, ProgressWindow
-from ip_optimizer import get_optimal_ip
+from ip_optimizer import IpOptimizer
 from pic_data import img_data
 
+
+class Logger:
+    def __init__(self, filename, stream):
+        self.terminal = stream
+        self.log = open(filename, "w", encoding="utf-8")
+
+    def write(self, message):
+        censored_message = censor_url(message)
+        self.terminal.write(censored_message)
+        self.log.write(censored_message)
+        self.flush()
+
+    def flush(self):
+        self.terminal.flush()
+        self.log.flush()
+
+    def close(self):
+        self.log.close()
+
+class IpOptimizerThread(QThread):
+    finished = Signal(str)
+
+    def __init__(self, url, parent=None):
+        super().__init__(parent)
+        self.url = url
+        self.optimizer = IpOptimizer()
+
+    def run(self):
+        optimal_ip = self.optimizer.get_optimal_ip(self.url)
+        self.finished.emit(optimal_ip if optimal_ip else "")
+
+    def stop(self):
+        self.optimizer.stop()
+
+class HashThread(QThread):
+    pre_finished = Signal(dict)
+    after_finished = Signal(dict)
+
+    def __init__(self, mode, install_paths, plugin_hash, installed_status, parent=None):
+        super().__init__(parent)
+        self.mode = mode
+        self.install_paths = install_paths
+        self.plugin_hash = plugin_hash
+        self.installed_status = installed_status
+        # 每个线程都应该有自己的HashManager实例
+        self.hash_manager = HashManager(BLOCK_SIZE)
+
+    def run(self):
+        if self.mode == "pre":
+            updated_status = self.hash_manager.cfg_pre_hash_compare(
+                self.install_paths, self.plugin_hash, self.installed_status
+            )
+            self.pre_finished.emit(updated_status)
+        elif self.mode == "after":
+            result = self.hash_manager.cfg_after_hash_compare(
+                self.install_paths, self.plugin_hash, self.installed_status
+            )
+            self.after_finished.emit(result)
+
+
+class ExtractionThread(QThread):
+    finished = Signal(bool, str, str)  # success, error_message, game_version
+
+    def __init__(self, _7z_path, game_folder, plugin_path, game_version, parent=None):
+        super().__init__(parent)
+        self._7z_path = _7z_path
+        self.game_folder = game_folder
+        self.plugin_path = plugin_path
+        self.game_version = game_version
+
+    def run(self):
+        try:
+            with py7zr.SevenZipFile(self._7z_path, mode="r") as archive:
+                archive.extractall(path=PLUGIN)
+            
+            os.makedirs(self.game_folder, exist_ok=True)
+            shutil.copy(self.plugin_path, self.game_folder)
+            
+            if self.game_version == "NEKOPARA After":
+                sig_path = os.path.join(PLUGIN, GAME_INFO[self.game_version]["sig_path"])
+                shutil.copy(sig_path, self.game_folder)
+                
+            self.finished.emit(True, "", self.game_version)
+        except (py7zr.Bad7zFile, FileNotFoundError, Exception) as e:
+            self.finished.emit(False, f"\n文件操作失败，请重试\n\n【错误信息】：{e}\n", self.game_version)
+
+
 class MainWindow(QMainWindow):
     def __init__(self):
         super().__init__()
@@ -49,12 +139,25 @@ class MainWindow(QMainWindow):
         self.download_queue = deque()
         self.current_download_thread = None
         self.hash_manager = HashManager(BLOCK_SIZE)
+        self.hash_thread = None
+        self.extraction_thread = None
+        self.hash_msg_box = None
+        self.optimized_ip = None
+        self.optimization_done = False # 标记是否已执行过优选
+        self.logger = None
+        self.hosts_manager = HostsManager() # 实例化HostsManager
+        
+        # 加载配置
+        self.config = load_config()
         
         # 检查管理员权限和进程
         admin_privileges = AdminPrivileges()
         admin_privileges.request_admin_privileges()
         admin_privileges.check_and_terminate_processes()
         
+        # 备份hosts文件
+        self.hosts_manager.backup()
+        
         # 创建缓存目录
         if not os.path.exists(PLUGIN):
             try:
@@ -78,6 +181,16 @@ class MainWindow(QMainWindow):
         about_action.triggered.connect(self.show_about_dialog)
         self.ui.menu_2.addAction(project_home_action)
         self.ui.menu_2.addAction(about_action)
+
+        # “设置”菜单
+        self.debug_action = QAction("Debug模式", self, checkable=True)
+        self.debug_action.setChecked(self.config.get("debug_mode", False))
+        self.debug_action.triggered.connect(self.toggle_debug_mode)
+        self.ui.menu.addAction(self.debug_action)
+
+        # 根据初始配置决定是否开启Debug模式
+        if self.debug_action.isChecked():
+            self.start_logging()
         
         # 在窗口显示前设置初始状态
         self.animator.initialize()
@@ -87,6 +200,39 @@ class MainWindow(QMainWindow):
     
     def start_animations(self):
         self.animator.start_animations()
+
+    def toggle_debug_mode(self, checked):
+        self.config["debug_mode"] = checked
+        save_config(self.config)
+        if checked:
+            self.start_logging()
+        else:
+            self.stop_logging()
+
+    def start_logging(self):
+        if self.logger is None:
+            try:
+                if os.path.exists(LOG_FILE):
+                    os.remove(LOG_FILE)
+                # 保存原始的 stdout 和 stderr
+                self.original_stdout = sys.stdout
+                self.original_stderr = sys.stderr
+                # 创建 Logger 实例
+                self.logger = Logger(LOG_FILE, self.original_stdout)
+                sys.stdout = self.logger
+                sys.stderr = self.logger
+                print("--- Debug mode enabled ---")
+            except (IOError, OSError) as e:
+                QtWidgets.QMessageBox.critical(self, "错误", f"无法创建日志文件: {e}")
+                self.logger = None
+
+    def stop_logging(self):
+        if self.logger:
+            print("--- Debug mode disabled ---")
+            sys.stdout = self.original_stdout
+            sys.stderr = self.original_stderr
+            self.logger.close()
+            self.logger = None
         
     def get_install_paths(self):
         return {
@@ -108,9 +254,32 @@ class MainWindow(QMainWindow):
     def get_download_url(self) -> dict:
         try:
             headers = {"User-Agent": UA}
+            if self.debug_action.isChecked():
+                print("--- Starting to get download URL ---")
+                print(f"DEBUG: Requesting URL: {CONFIG_URL}")
+                print(f"DEBUG: Using Headers: {headers}")
+
             response = requests.get(CONFIG_URL, headers=headers, timeout=10)
+
+            if self.debug_action.isChecked():
+                print(f"DEBUG: Response Status Code: {response.status_code}")
+                print(f"DEBUG: Response Headers: {response.headers}")
+                print(f"DEBUG: Response Text: {response.text}")
+
             response.raise_for_status()
-            config_data = response.json()
+
+            # 从响应文本中提取有效的 JSON 部分
+            response_text = response.text
+            json_start_index = response_text.find('{')
+            if json_start_index == -1:
+                raise ValueError("响应中未找到有效的 JSON 对象")
+
+            json_text = response_text[json_start_index:]
+            config_data = json.loads(json_text)
+            
+            if self.debug_action.isChecked():
+                print(f"DEBUG: Parsed JSON data: {json.dumps(config_data, indent=2)}")
+
             # 修正键名检查，确保所有必需的键都存在
             required_keys = [f"vol.{i+1}.data" for i in range(4)] + ["after.data"]
             if not all(key in config_data for key in required_keys):
@@ -118,11 +287,16 @@ class MainWindow(QMainWindow):
                 raise ValueError(f"配置文件缺少必要的键: {', '.join(missing_keys)}")
             
             # 修正提取URL的逻辑，确保使用正确的键
-            return {
+            urls = {
                 f"vol{i+1}": config_data[f"vol.{i+1}.data"]["url"] for i in range(4)
             } | {
                 "after": config_data["after.data"]["url"]
             }
+            if self.debug_action.isChecked():
+                print(f"DEBUG: Extracted URLs: {urls}")
+                print("--- Finished getting download URL successfully ---")
+            return urls
+
         except requests.exceptions.RequestException as e:
             status_code = e.response.status_code if e.response is not None else "未知"
             try:
@@ -133,7 +307,9 @@ class MainWindow(QMainWindow):
                 json_title = "配置文件异常，无法解析错误类型"
                 json_message = "配置文件异常，无法解析错误信息"
 
-            print(f"获取下载配置时出错: {e}") # 添加详细错误日志
+            if self.debug_action.isChecked():
+                print(f"ERROR: Failed to get download config due to RequestException: {e}")
+            
             QtWidgets.QMessageBox.critical(
                 self,
                 f"错误 - {APP_NAME}",
@@ -141,6 +317,9 @@ class MainWindow(QMainWindow):
             )
             return {}
         except ValueError as e:
+            if self.debug_action.isChecked():
+                print(f"ERROR: Failed to parse download config due to ValueError: {e}")
+
             QtWidgets.QMessageBox.critical(
                 self,
                 f"错误 - {APP_NAME}",
@@ -166,20 +345,38 @@ class MainWindow(QMainWindow):
             return
             
         self.progress_window = ProgressWindow(self)
+        self.start_download_with_ip(self.optimized_ip, url, _7z_path, game_version, game_folder, plugin_path)
 
-        # --- IP 优选逻辑 ---
-        self.progress_window.game_label.setText("正在优化下载线路，请稍候...")
-        QApplication.processEvents() # 刷新UI以显示上述消息
-        
-        preferred_ip = get_optimal_ip(url)
+
+    def on_optimization_and_hosts_finished(self, ip):
+        self.optimized_ip = ip
+        self.optimization_done = True
+        if hasattr(self, 'optimizing_msg_box') and self.optimizing_msg_box:
+            if self.optimizing_msg_box.isVisible():
+                self.optimizing_msg_box.accept()
+            self.optimizing_msg_box = None
+
+        if not ip:
+            QtWidgets.QMessageBox.warning(self, f"优选失败 - {APP_NAME}", "\n未能找到合适的Cloudflare IP，将使用默认网络进行下载。\n")
+        else:
+            if self.download_queue:
+                first_url = self.download_queue[0][0]
+                hostname = urlparse(first_url).hostname
+                if self.hosts_manager.apply_ip(hostname, ip):
+                    QtWidgets.QMessageBox.information(self, f"成功 - {APP_NAME}", f"\n已将优选IP ({ip}) 应用到hosts文件。\n")
+                else:
+                    QtWidgets.QMessageBox.critical(self, f"错误 - {APP_NAME}", "\n修改hosts文件失败，请检查程序是否以管理员权限运行。\n")
         
+        self.setEnabled(True)
+        self.next_download_task()
+
+    def start_download_with_ip(self, preferred_ip, url, _7z_path, game_version, game_folder, plugin_path):
         if preferred_ip:
             print(f"已为 {game_version} 获取到优选IP: {preferred_ip}")
         else:
             print(f"未能为 {game_version} 获取优选IP，将使用默认线路。")
-        # --- IP 优选逻辑结束 ---
 
-        self.current_download_thread = DownloadThread(url, _7z_path, game_version, preferred_ip, self)
+        self.current_download_thread = DownloadThread(url, _7z_path, game_version, self)
         self.current_download_thread.progress.connect(self.progress_window.update_progress)
         self.current_download_thread.finished.connect(
             lambda success, error: self.install_setting(
@@ -194,10 +391,9 @@ class MainWindow(QMainWindow):
             )
         )
         
-        # 连接停止按钮的信号
         self.progress_window.stop_button.clicked.connect(self.current_download_thread.stop)
         self.current_download_thread.start()
-        self.progress_window.exec() # 使用exec()以模态方式显示对话框
+        self.progress_window.exec()
 
     def install_setting(
         self,
@@ -213,174 +409,131 @@ class MainWindow(QMainWindow):
         if progress_window.isVisible():
             progress_window.reject()
 
-        if not success: # 处理所有失败情况，包括手动停止
+        if not success:
             print(f"--- Download Failed: {game_version} ---")
             print(error)
             print("------------------------------------")
             msg_box = QtWidgets.QMessageBox(self)
             msg_box.setWindowTitle(f"下载失败 - {APP_NAME}")
-            # 如果是手动停止，显示特定信息
-            if error == "下载已手动停止。":
-                msg_box.setText(f"\n下载已手动终止: {game_version}\n\n是否重试？")
+            msg_box.setText(f"\n文件获取失败: {game_version}\n错误: {error}\n\n是否重试？")
+            
+            retry_button = msg_box.addButton("重试", QtWidgets.QMessageBox.ButtonRole.YesRole)
+            next_button = msg_box.addButton("下一个", QtWidgets.QMessageBox.ButtonRole.NoRole)
+            end_button = msg_box.addButton("结束", QtWidgets.QMessageBox.ButtonRole.RejectRole)
+            
+            msg_box.exec()
+            clicked_button = msg_box.clickedButton()
+
+            if clicked_button == retry_button:
+                self.download_setting(url, game_folder, game_version, _7z_path, plugin_path)
+            elif clicked_button == next_button:
+                self.next_download_task()
             else:
-                msg_box.setText(f"\n文件获取失败: {game_version}\n\n是否重试？")
-            
-            retry_button = msg_box.addButton("重试", QtWidgets.QMessageBox.ButtonRole.YesRole)
-            next_button = msg_box.addButton("下一个", QtWidgets.QMessageBox.ButtonRole.NoRole)
-            end_button = msg_box.addButton("结束", QtWidgets.QMessageBox.ButtonRole.RejectRole)
-            
-            icon_data = img_data.get("icon")
-            if icon_data:
-                pixmap = load_base64_image(icon_data)
-                if not pixmap.isNull():
-                    msg_box.setWindowIcon(QIcon(pixmap))
+                self.on_download_stopped()
+            return
 
-            msg_box.exec()
-            clicked_button = msg_box.clickedButton()
+        # --- Start Extraction in a new thread ---
+        self.hash_msg_box = self.hash_manager.hash_pop_window()
+        self.setEnabled(False)
+        
+        self.extraction_thread = ExtractionThread(_7z_path, game_folder, plugin_path, game_version, self)
+        self.extraction_thread.finished.connect(self.on_extraction_finished)
+        self.extraction_thread.start()
 
-            if clicked_button == retry_button:
-                self.download_setting(url, game_folder, game_version, _7z_path, plugin_path)
-            elif clicked_button == next_button:
-                self.next_download_task()
-            else: # End button or closed dialog
-                self.download_queue.clear()
-                self.after_hash_compare(PLUGIN_HASH)
-            return # 确保失败后不再执行成功逻辑
+    def on_extraction_finished(self, success, error_message, game_version):
+        if self.hash_msg_box and self.hash_msg_box.isVisible():
+            self.hash_msg_box.close()
+        self.setEnabled(True)
 
-        if success:
-            try:
-                msg_box = self.hash_manager.hash_pop_window()
-                QApplication.processEvents()
-                with py7zr.SevenZipFile(_7z_path, mode="r") as archive:
-                    archive.extractall(path=PLUGIN)
-                
-                # 创建游戏目录(如果不存在)
-                os.makedirs(game_folder, exist_ok=True)
-                
-                # 复制主文件
-                shutil.copy(plugin_path, game_folder)
-                
-                # 如果是After版本，还需要复制签名文件
-                if game_version == "NEKOPARA After":
-                    sig_path = os.path.join(PLUGIN, GAME_INFO[game_version]["sig_path"])
-                    shutil.copy(sig_path, game_folder)
-                    
-                self.installed_status[game_version] = True
-            except (py7zr.Bad7zFile, FileNotFoundError, Exception) as e:
-                QtWidgets.QMessageBox.critical(
-                    self,
-                    f"错误 - {APP_NAME}",
-                    f"\n文件操作失败，请重试\n\n【错误信息】：{e}\n",
-                )
-            finally:
-                msg_box.close()
-            self.next_download_task()
-            self.progress_window.close()
-            
-        if success:
-            try:
-                msg_box = self.hash_manager.hash_pop_window()
-                QApplication.processEvents()
-                with py7zr.SevenZipFile(_7z_path, mode="r") as archive:
-                    archive.extractall(path=PLUGIN)
-                
-                # 创建游戏目录(如果不存在)
-                os.makedirs(game_folder, exist_ok=True)
-                
-                # 复制主文件
-                shutil.copy(plugin_path, game_folder)
-                
-                # 如果是After版本，还需要复制签名文件
-                if game_version == "NEKOPARA After":
-                    sig_path = os.path.join(PLUGIN, GAME_INFO[game_version]["sig_path"])
-                    shutil.copy(sig_path, game_folder)
-                    
-                self.installed_status[game_version] = True
-            except (py7zr.Bad7zFile, FileNotFoundError, Exception) as e:
-                QtWidgets.QMessageBox.critical(
-                    self,
-                    f"错误 - {APP_NAME}",
-                    f"\n文件操作失败，请重试\n\n【错误信息】：{e}\n",
-                )
-            finally:
-                msg_box.close()
-            self.next_download_task()
+        if not success:
+            QtWidgets.QMessageBox.critical(self, f"错误 - {APP_NAME}", error_message)
+            self.installed_status[game_version] = False
         else:
-            print(f"--- Download Failed: {game_version} ---")
-            print(error)
-            print("------------------------------------")
-            msg_box = QtWidgets.QMessageBox(self)
-            msg_box.setWindowTitle(f"下载失败 {APP_NAME}")
-            msg_box.setText(f"\n文件获取失败: {game_version}\n\n是否重试？")
-            
-            retry_button = msg_box.addButton("重试", QtWidgets.QMessageBox.ButtonRole.YesRole)
-            next_button = msg_box.addButton("下一个", QtWidgets.QMessageBox.ButtonRole.NoRole)
-            end_button = msg_box.addButton("结束", QtWidgets.QMessageBox.ButtonRole.RejectRole)
-            
-            icon_data = img_data.get("icon")
-            if icon_data:
-                pixmap = load_base64_image(icon_data)
-                if not pixmap.isNull():
-                    msg_box.setWindowIcon(QIcon(pixmap))
-
-            msg_box.exec()
-            clicked_button = msg_box.clickedButton()
-
-            if clicked_button == retry_button:
-                self.download_setting(url, game_folder, game_version, _7z_path, plugin_path)
-            elif clicked_button == next_button:
-                self.next_download_task()
-            else: # End button or closed dialog
-                self.download_queue.clear()
-                self.after_hash_compare(PLUGIN_HASH)
-
-    def pre_hash_compare(self, install_path, game_version, plugin_hash):
-        msg_box = self.hash_manager.hash_pop_window()
-        self.hash_manager.cfg_pre_hash_compare(
-            install_path, game_version, plugin_hash, self.installed_status
-        )
-        msg_box.close()
+            self.installed_status[game_version] = True
+        
+        self.next_download_task()
 
     def download_action(self):
+        # 询问用户是否使用Cloudflare加速
+        msg_box = QMessageBox(self)
+        msg_box.setWindowTitle(f"下载优化 - {APP_NAME}")
+        msg_box.setText("\n是否愿意通过Cloudflare加速来优化下载速度？\n\n这将临时修改系统的hosts文件，并需要管理员权限。")
+        msg_box.setIcon(QMessageBox.Icon.Question)
+        
+        yes_button = msg_box.addButton("是，开启加速", QMessageBox.ButtonRole.YesRole)
+        no_button = msg_box.addButton("否，直接下载", QMessageBox.ButtonRole.NoRole)
+        
+        msg_box.exec()
+
+        use_optimization = msg_box.clickedButton() == yes_button
+
+        self.hash_msg_box = self.hash_manager.hash_pop_window()
+        self.setEnabled(False)
+
         install_paths = self.get_install_paths()
-        for game_version, install_path in install_paths.items():
-            self.pre_hash_compare(install_path, game_version, PLUGIN_HASH)
+        
+        self.hash_thread = HashThread("pre", install_paths, PLUGIN_HASH, self.installed_status, self)
+        # 将用户选择传递给哈希完成后的处理函数
+        self.hash_thread.pre_finished.connect(lambda status: self.on_pre_hash_finished(status, use_optimization))
+        self.hash_thread.start()
+
+    def on_pre_hash_finished(self, updated_status, use_optimization):
+        self.installed_status = updated_status
+        if self.hash_msg_box and self.hash_msg_box.isVisible():
+            self.hash_msg_box.accept()
+            self.hash_msg_box = None
 
         config = self.get_download_url()
         if not config:
             QtWidgets.QMessageBox.critical(
                 self, f"错误 - {APP_NAME}", "\n网络状态异常或服务器故障，请重试\n"
             )
+            self.setEnabled(True)
             return
 
-        # 处理1-4卷
+        # --- 填充下载队列 ---
         for i in range(1, 5):
             game_version = f"NEKOPARA Vol.{i}"
-            if not self.installed_status[game_version]:
-                url = config[f"vol{i}"]
+            if not self.installed_status.get(game_version, False):
+                url = config.get(f"vol{i}")
+                if not url: continue
                 game_folder = os.path.join(self.selected_folder, f"NEKOPARA Vol. {i}")
                 _7z_path = os.path.join(PLUGIN, f"vol.{i}.7z")
-                plugin_path = os.path.join(
-                    PLUGIN, GAME_INFO[game_version]["plugin_path"]
-                )
-                self.download_queue.append(
-                    (url, game_folder, game_version, _7z_path, plugin_path)
-                )
-        
-        # 处理After
-        game_version = "NEKOPARA After"
-        if not self.installed_status[game_version]:
-            url = config["after"]
-            game_folder = os.path.join(self.selected_folder, "NEKOPARA After")
-            _7z_path = os.path.join(PLUGIN, "after.7z")
-            plugin_path = os.path.join(
-                PLUGIN, GAME_INFO[game_version]["plugin_path"]
-            )
-            self.download_queue.append(
-                (url, game_folder, game_version, _7z_path, plugin_path)
-            )
+                plugin_path = os.path.join(PLUGIN, GAME_INFO[game_version]["plugin_path"])
+                self.download_queue.append((url, game_folder, game_version, _7z_path, plugin_path))
 
-        self.next_download_task()
+        game_version = "NEKOPARA After"
+        if not self.installed_status.get(game_version, False):
+            url = config.get("after")
+            if url:
+                game_folder = os.path.join(self.selected_folder, "NEKOPARA After")
+                _7z_path = os.path.join(PLUGIN, "after.7z")
+                plugin_path = os.path.join(PLUGIN, GAME_INFO[game_version]["plugin_path"])
+                self.download_queue.append((url, game_folder, game_version, _7z_path, plugin_path))
+
+        if not self.download_queue:
+            self.after_hash_compare(PLUGIN_HASH)
+            return
+
+        if use_optimization and not self.optimization_done:
+            first_url = self.download_queue[0][0]
+            self.optimizing_msg_box = msgbox_frame(
+                f"通知 - {APP_NAME}",
+                "\n正在优选Cloudflare IP，请稍候...\n\n这可能需要5-10分钟，请耐心等待喵~"
+            )
+            # 我们不再提供“跳过”按钮，因为用户已经做出了选择
+            self.optimizing_msg_box.setStandardButtons(QMessageBox.StandardButton.NoButton)
+            self.optimizing_msg_box.setWindowModality(Qt.WindowModality.ApplicationModal)
+            self.optimizing_msg_box.open()
+
+            self.ip_optimizer_thread = IpOptimizerThread(first_url)
+            # 优选完成后，需要修改hosts并开始下载
+            self.ip_optimizer_thread.finished.connect(self.on_optimization_and_hosts_finished)
+            self.ip_optimizer_thread.start()
+        else:
+            # 如果用户选择不优化，或已经优化过，直接开始下载
+            self.setEnabled(True)
+            self.next_download_task()
 
     def next_download_task(self):
         if not self.download_queue:
@@ -389,24 +542,66 @@ class MainWindow(QMainWindow):
         # 检查下载线程是否仍在运行，以避免在手动停止后立即开始下一个任务
         if self.current_download_thread and self.current_download_thread.isRunning():
             return
+        
+        # 在开始下载前，确保hosts文件已修改（如果需要）
+        # 这里的逻辑保持不变，因为hosts文件应该在队列开始前就被修改了
         url, game_folder, game_version, _7z_path, plugin_path = self.download_queue.popleft()
         self.download_setting(url, game_folder, game_version, _7z_path, plugin_path)
 
     def on_download_stopped(self):
-        """当用户点击停止按钮时调用的槽函数"""
+        """当用户点击停止按钮或选择结束时调用的槽函数"""
+        # 停止IP优选线程
+        if hasattr(self, 'ip_optimizer_thread') and self.ip_optimizer_thread and self.ip_optimizer_thread.isRunning():
+            self.ip_optimizer_thread.stop()
+            self.ip_optimizer_thread.wait()
+            if hasattr(self, 'optimizing_msg_box') and self.optimizing_msg_box:
+                if self.optimizing_msg_box.isVisible():
+                    self.optimizing_msg_box.accept()
+                self.optimizing_msg_box = None
+
+        # 停止当前可能仍在运行的下载线程
+        if self.current_download_thread and self.current_download_thread.isRunning():
+            self.current_download_thread.stop()
+            self.current_download_thread.wait() # 等待线程完全终止
+            
         # 清空下载队列，因为用户决定停止
         self.download_queue.clear()
+        
+        # 确保进度窗口已关闭
+        if hasattr(self, 'progress_window') and self.progress_window.isVisible():
+            self.progress_window.reject()
+
         # 可以在这里决定是否立即进行哈希比较或显示结果
-        self.after_hash_compare(PLUGIN_HASH)
+        print("下载已全部停止。")
+        self.setEnabled(True) # 恢复主窗口交互
+        self.show_result()
 
     def after_hash_compare(self, plugin_hash):
-        msg_box = self.hash_manager.hash_pop_window()
-        result = self.hash_manager.cfg_after_hash_compare(
-            self.get_install_paths(), plugin_hash, self.installed_status
-        )
-        msg_box.close()
+        self.hash_msg_box = self.hash_manager.hash_pop_window()
+        self.setEnabled(False)
+
+        install_paths = self.get_install_paths()
+        
+        self.hash_thread = HashThread("after", install_paths, plugin_hash, self.installed_status, self)
+        self.hash_thread.after_finished.connect(self.on_after_hash_finished)
+        self.hash_thread.start()
+
+    def on_after_hash_finished(self, result):
+        if self.hash_msg_box and self.hash_msg_box.isVisible():
+            self.hash_msg_box.close()
+        self.setEnabled(True)
+
+        if not result["passed"]:
+            game = result.get("game", "未知游戏")
+            message = result.get("message", "发生未知错误。")
+            msg_box = msgbox_frame(
+                f"文件校验失败 - {APP_NAME}",
+                message,
+                QtWidgets.QMessageBox.StandardButton.Ok,
+            )
+            msg_box.exec()
+
         self.show_result()
-        return result
 
     def show_result(self):
         installed_version = "\n".join(
@@ -445,6 +640,8 @@ class MainWindow(QMainWindow):
         self.shutdown_app(event)
 
     def shutdown_app(self, event=None):
+        self.hosts_manager.restore() # 恢复hosts文件
+        self.stop_logging()  # 确保在退出时停止日志记录
         reply = QtWidgets.QMessageBox.question(
             self,
             "退出程序",