chore: 性能优化

- 调度队列历史记录归入配置类管理 - 添加.gitignore - 工作流删除冗余部分 - 自动代理与人工排查结束后MAA恢复到全局配置 #40 - 网络相关操作由子线程执行
2025-04-20 00:01:49 +08:00
parent e8d592ae76
commit 5e4660670f
17 changed files with 331 additions and 391 deletions
--- a/app/ui/Widget.py
+++ b/app/ui/Widget.py
@@ -870,6 +870,31 @@ class TimeEditSettingCard(SettingCard):
        self.TimeEdit.setTime(QTime.fromString(value, "HH:mm"))


+class HistoryCard(HeaderCardWidget):
+
+    def __init__(self, qconfig: QConfig, configItem: ConfigItem, parent=None):
+        super().__init__(parent)
+        self.setTitle("历史运行记录")
+
+        self.qconfig = qconfig
+        self.configItem = configItem
+
+        self.text = TextBrowser()
+        self.text.setMinimumHeight(300)
+
+        if configItem:
+            self.setValue(self.qconfig.get(configItem))
+            configItem.valueChanged.connect(self.setValue)
+
+        self.viewLayout.addWidget(self.text)
+
+    def setValue(self, content: str):
+        if self.configItem:
+            self.qconfig.set(self.configItem, content)
+
+        self.text.setPlainText(content)
+
+
 class UrlItem(QWidget):
    """Url item"""

--- a/app/ui/dispatch_center.py
+++ b/app/ui/dispatch_center.py
@@ -143,9 +143,11 @@ class DispatchCenter(QWidget):
        task.update_log_text.connect(
            self.script_list["主调度台"].info.log_text.text.setText
        )
-        task.accomplish.connect(lambda: self.disconnect_main_board(task.name))
+        task.accomplish.connect(
+            lambda logs: self.disconnect_main_board(task.name, logs)
+        )

-    def disconnect_main_board(self, name: str) -> None:
+    def disconnect_main_board(self, name: str, logs: list) -> None:
        """断开主调度台"""

        self.script_list["主调度台"].top_bar.Lable.hide()
@@ -156,9 +158,15 @@ class DispatchCenter(QWidget):
        self.script_list["主调度台"].top_bar.button.clicked.connect(
            self.script_list["主调度台"].top_bar.start_task
        )
-        self.script_list["主调度台"].info.log_text.text.setText(
-            Config.get_history(name)["History"]
-        )
+        if len(logs) > 0:
+            history = ""
+            for log in logs:
+                history += (
+                    f"任务名称：{log[0]}，{log[1]["History"].replace("\n","\n    ")}\n"
+                )
+            self.script_list["主调度台"].info.log_text.text.setText(history)
+        else:
+            self.script_list["主调度台"].info.log_text.text.setText("没有任务被执行")

    def update_top_bar(self):
        """更新顶栏"""
--- a/app/ui/home.py
+++ b/app/ui/home.py
@@ -45,13 +45,11 @@ from qfluentwidgets import (
 )
 import re
 import shutil
-import requests
 import json
-import time
 from datetime import datetime
 from pathlib import Path

-from app.core import Config, MainInfoBar
+from app.core import Config, MainInfoBar, Network
 from .Widget import Banner, IconButton


@@ -199,24 +197,21 @@ class Home(QWidget):
        elif Config.get(Config.function_HomeImageMode) == "主题图像":

            # 从远程服务器获取最新主题图像
-            for _ in range(3):
-                try:
-                    response = requests.get(
-                        "https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/theme_image.json",
-                        timeout=10,
-                    )
-                    theme_image = response.json()
-                    break
-                except Exception as e:
-                    err = e
-                    time.sleep(0.1)
+            Network.set_info(
+                mode="get",
+                url="https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/theme_image.json",
+            )
+            Network.start()
+            Network.loop.exec()
+            if Network.stutus_code == 200:
+                theme_image = Network.response_json
            else:
-                logger.error(f"获取最新主题图像时出错：\n{err}")
+                logger.warning(f"获取最新主题图像时出错：{Network.error_message}")
                MainInfoBar.push_info_bar(
-                    "error",
-                    "主题图像获取失败",
-                    f"获取最新主题图像信息时出错！",
-                    -1,
+                    "warning",
+                    "获取最新主题图像时出错",
+                    f"网络错误：{Network.stutus_code}",
+                    5000,
                )
                return None

@@ -239,15 +234,22 @@ class Home(QWidget):
                > time_local
            ):

-                response = requests.get(theme_image["url"], timeout=10)
-                if response.status_code == 200:
+                Network.set_info(
+                    mode="get_file",
+                    url=theme_image["url"],
+                    path=Config.app_path / "resources/images/Home/BannerTheme.jpg",
+                )
+                Network.start()
+                Network.loop.exec()

-                    with open(
-                        Config.app_path / "resources/images/Home/BannerTheme.jpg", "wb"
-                    ) as file:
-                        file.write(response.content)
+                if Network.stutus_code == 200:

-                    logger.info(f"主题图像「{theme_image["name"]}」下载成功")
+                    with (Config.app_path / "resources/theme_image.json").open(
+                        mode="w", encoding="utf-8"
+                    ) as f:
+                        json.dump(theme_image, f, ensure_ascii=False, indent=4)
+
+                    logger.success(f"主题图像「{theme_image["name"]}」下载成功")
                    MainInfoBar.push_info_bar(
                        "success",
                        "主题图像下载成功",
@@ -257,19 +259,14 @@ class Home(QWidget):

                else:

-                    logger.error("主题图像下载失败")
+                    logger.warning(f"下载最新主题图像时出错：{Network.error_message}")
                    MainInfoBar.push_info_bar(
-                        "error",
-                        "主题图像下载失败",
-                        f"主题图像下载失败：{response.status_code}",
-                        -1,
+                        "warning",
+                        "下载最新主题图像时出错",
+                        f"网络错误：{Network.stutus_code}",
+                        5000,
                    )

-                with (Config.app_path / "resources/theme_image.json").open(
-                    mode="w", encoding="utf-8"
-                ) as f:
-                    json.dump(theme_image, f, ensure_ascii=False, indent=4)
-
            else:

                logger.info("主题图像已是最新")
--- a/app/ui/member_manager.py
+++ b/app/ui/member_manager.py
@@ -49,15 +49,13 @@ from qfluentwidgets import (
    PrimaryToolButton,
 )
 from PySide6.QtCore import Qt, Signal
-import requests
-import time
 from datetime import datetime
 from functools import partial
 from pathlib import Path
 from typing import List
 import shutil

-from app.core import Config, MainInfoBar, TaskManager, MaaConfig, MaaUserConfig
+from app.core import Config, MainInfoBar, TaskManager, MaaConfig, MaaUserConfig, Network
 from app.services import Crypto
 from app.utils import DownloadManager
 from .Widget import (
@@ -337,21 +335,18 @@ class MemberManager(QWidget):
                    return None

                # 从mirrorc服务器获取最新版本信息
-                for _ in range(3):
-                    try:
-                        response = requests.get(
-                            "https://mirrorchyan.com/api/resources/MAA/latest?user_agent=AutoMaaGui&os=win&arch=x64&channel=stable",
-                            timeout=10,
-                        )
-                        maa_info = response.json()
-                        break
-                    except Exception as e:
-                        err = e
-                        time.sleep(0.1)
+                Network.set_info(
+                    mode="get",
+                    url="https://mirrorchyan.com/api/resources/MAA/latest?user_agent=AutoMaaGui&os=win&arch=x64&channel=stable",
+                )
+                Network.start()
+                Network.loop.exec()
+                if Network.stutus_code == 200:
+                    maa_info = Network.response_json
                else:
                    choice = MessageBox(
                        "错误",
-                        f"获取版本信息时出错：\n{err}",
+                        f"获取版本信息时出错：\n{Network.error_message}",
                        self.window(),
                    )
                    choice.cancelButton.hide()
--- a/app/ui/queue_manager.py
+++ b/app/ui/queue_manager.py
@@ -39,7 +39,6 @@ from qfluentwidgets import (
    FluentIcon,
    MessageBox,
    HeaderCardWidget,
-    TextBrowser,
    CommandBar,
 )
 from PySide6.QtCore import Qt
@@ -52,6 +51,7 @@ from .Widget import (
    LineEditSettingCard,
    TimeEditSettingCard,
    NoOptionComboBoxSettingCard,
+    HistoryCard,
 )


@@ -387,7 +387,11 @@ class QueueManager(QWidget):
                self.queue_set = self.QueueSetSettingCard(self.config, self)
                self.time = self.TimeSettingCard(self.config, self)
                self.task = self.TaskSettingCard(self.config, self)
-                self.history = self.HistoryCard(f"调度队列_{uid}", self)
+                self.history = HistoryCard(
+                    qconfig=self.config,
+                    configItem=self.config.Data_LastProxyHistory,
+                    parent=self,
+                )

                content_layout.addWidget(self.queue_set)
                content_layout.addWidget(self.time)
@@ -704,16 +708,3 @@ class QueueManager(QWidget):
                    Layout.addWidget(self.card_Member_10)

                    self.viewLayout.addLayout(Layout)
-
-            class HistoryCard(HeaderCardWidget):
-
-                def __init__(self, name: str, parent=None):
-                    super().__init__(parent)
-                    self.setTitle("历史运行记录")
-
-                    self.text = TextBrowser()
-                    self.text.setMinimumHeight(300)
-                    history = Config.get_history(name)
-                    self.text.setPlainText(history["History"])
-
-                    self.viewLayout.addWidget(self.text)
--- a/app/ui/setting.py
+++ b/app/ui/setting.py
@@ -26,11 +26,7 @@ v4.3
 """

 from loguru import logger
-from PySide6.QtWidgets import (
-    QWidget,
-    QApplication,
-    QVBoxLayout,
-)
+from PySide6.QtWidgets import QWidget, QVBoxLayout
 from PySide6.QtCore import Qt
 from qfluentwidgets import (
    ScrollArea,
@@ -48,14 +44,13 @@ import re
 import json
 import time
 import shutil
-import requests
 import subprocess
 from datetime import datetime
 from packaging import version
 from pathlib import Path
 from typing import Dict, List, Union

-from app.core import Config, MainInfoBar
+from app.core import Config, MainInfoBar, Network
 from app.services import Crypto, System, Notify
 from .Widget import (
    SwitchSettingCard,
@@ -93,7 +88,9 @@ class Setting(QWidget):
        )
        self.start.card_IfSelfStart.checkedChanged.connect(System.set_SelfStart)
        self.security.card_changePASSWORD.clicked.connect(self.change_PASSWORD)
-        self.updater.card_CheckUpdate.clicked.connect(self.check_update)
+        self.updater.card_CheckUpdate.clicked.connect(
+            lambda: self.check_update(if_click=True)
+        )
        self.other.card_Notice.clicked.connect(self.show_notice)

        content_layout.addWidget(self.function)
@@ -263,35 +260,36 @@ class Setting(QWidget):
                if choice.exec():
                    break

-    def check_update(self) -> None:
+    def check_update(self, if_click: bool = False) -> None:
        """检查版本更新，调起文件下载进程"""

        current_version = list(map(int, Config.VERSION.split(".")))

-        # 从远程服务器获取最新版本信息
-        for _ in range(3):
-            try:
-                response = requests.get(
-                    f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMaaGui&current_version={version_text(current_version)}&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&channel={Config.get(Config.update_UpdateType)}",
-                    timeout=10,
-                )
-                version_info: Dict[str, Union[int, str, Dict[str, str]]] = (
-                    response.json()
-                )
-                break
-            except Exception as e:
-                err = e
-                time.sleep(0.1)
-        else:
-            choice = MessageBox(
-                "错误",
-                f"获取版本信息时出错：\n{err}",
-                self.window(),
+        if Network.if_running and if_click:
+            MainInfoBar.push_info_bar(
+                "warning", "请求速度过快", "上个网络请求还未结束，请稍等片刻", 5000
            )
-            choice.cancelButton.hide()
-            choice.buttonLayout.insertStretch(1)
-            if choice.exec():
-                return None
+            return None
+        # 从远程服务器获取最新版本信息
+        Network.set_info(
+            mode="get",
+            url=f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMaaGui&current_version={version_text(current_version)}&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&channel={Config.get(Config.update_UpdateType)}",
+        )
+        Network.start()
+        Network.loop.exec()
+        if Network.stutus_code == 200:
+            version_info: Dict[str, Union[int, str, Dict[str, str]]] = (
+                Network.response_json
+            )
+        else:
+            logger.warning(f"获取版本信息时出错：{Network.error_message}")
+            MainInfoBar.push_info_bar(
+                "warning",
+                "获取版本信息时出错",
+                f"网络错误：{Network.stutus_code}",
+                5000,
+            )
+            return None

        if version_info["code"] != 0:

@@ -415,32 +413,26 @@ class Setting(QWidget):
        else:
            MainInfoBar.push_info_bar("success", "更新检查", "已是最新版本~", 3000)

-    def show_notice(self, if_show: bool = True):
+    def show_notice(self, if_show: bool = True) -> None:
        """显示公告"""

        # 从远程服务器获取最新公告
-        for _ in range(3):
-            try:
-                response = requests.get(
-                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/notice.json",
-                    timeout=10,
-                )
-                notice = response.json()
-                break
-            except Exception as e:
-                err = e
-                time.sleep(0.1)
+        Network.set_info(
+            mode="get",
+            url="https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/notice.json",
+        )
+        Network.start()
+        Network.loop.exec()
+        if Network.stutus_code == 200:
+            notice = Network.response_json
        else:
-            logger.warning(f"获取最新公告时出错：\n{err}")
-            if if_show:
-                choice = Dialog(
-                    "网络错误",
-                    f"获取最新公告时出错：\n{err}",
-                    self,
-                )
-                choice.cancelButton.hide()
-                choice.buttonLayout.insertStretch(1)
-                choice.exec()
+            logger.warning(f"获取最新公告时出错：{Network.error_message}")
+            MainInfoBar.push_info_bar(
+                "warning",
+                "获取最新公告时出错",
+                f"网络错误：{Network.stutus_code}",
+                5000,
+            )
            return None

        if (Config.app_path / "resources/notice.json").exists():