feat(core): 恢复基本所有原功能，数据文件版本更新

app/core/task_manager.py

@@ -26,76 +26,126 @@ v4.2
 """
 
 from loguru import logger
-from PySide6 import QtCore
-from typing import Dict, Union, List
+from PySide6.QtCore import QThread, QObject, Signal
+from qfluentwidgets import Dialog
+from pathlib import Path
+from typing import Dict, Union
 
 from .config import Config
 from .main_info_bar import MainInfoBar
 from app.models import MaaManager
-from app.services import Notify
 
 
-class Task(QtCore.QThread):
+class Task(QThread):
     """业务线程"""
 
-    push_info_bar = QtCore.Signal(str, str, str, int)
-    update_user_info = QtCore.Signal(list, list, list, list, list, list)
-    create_task_list = QtCore.Signal(list)
-    create_user_list = QtCore.Signal(list)
-    update_task_list = QtCore.Signal(list)
-    update_user_list = QtCore.Signal(list)
-    update_log_text = QtCore.Signal(str)
-    accomplish = QtCore.Signal(list)
+    push_info_bar = Signal(str, str, str, int)
+    question = Signal(str, str)
+    question_response = Signal(bool)
+    update_user_info = Signal(Path, list, list, list, list, list, list)
+    create_task_list = Signal(list)
+    create_user_list = Signal(list)
+    update_task_list = Signal(list)
+    update_user_list = Signal(list)
+    update_log_text = Signal(str)
+    accomplish = Signal(list)
 
     def __init__(
         self,
+        mode: str,
         name: str,
         info: Dict[str, Dict[str, Union[str, int, bool]]],
     ):
         super(Task, self).__init__()
 
+        self.mode = mode
         self.name = name
         self.info = info
 
         self.logs = []
 
+        self.question_response.connect(lambda: print("response"))
+
     def run(self):
 
-        self.member_dict = self.search_member()
-        self.task_list = [
-            [value, "等待"]
-            for _, value in self.info["Queue"].items()
-            if value != "禁用"
-        ]
+        if "设置MAA" in self.mode:
 
-        self.create_task_list.emit(self.task_list)
+            logger.info(f"任务开始：设置{self.name}")
+            self.push_info_bar.emit("info", "设置MAA", self.name, 3000)
 
-        for i in range(len(self.task_list)):
+            self.task = MaaManager(
+                self.mode,
+                Config.app_path / f"config/MaaConfig/{self.name}",
+                (
+                    None
+                    if "全局" in self.mode
+                    else Config.app_path
+                    / f"config/MaaConfig/{self.name}/beta/{self.info["SetMaaInfo"]["UserId"]}/{self.info["SetMaaInfo"]["SetType"]}"
+                ),
+            )
+            self.task.push_info_bar.connect(self.push_info_bar.emit)
+            self.task.accomplish.connect(lambda: self.accomplish.emit([]))
 
-            if self.isInterruptionRequested():
-                break
+            self.task.run()
 
-            self.task_list[i][1] = "运行"
-            self.update_task_list.emit(self.task_list)
+        else:
 
-            if self.task_list[i][0] not in Config.running_list:
+            self.member_dict = self.search_member()
+            self.task_list = [
+                [value, "等待"]
+                for _, value in self.info["Queue"].items()
+                if value != "禁用"
+            ]
+
+            self.create_task_list.emit(self.task_list)
+
+            for i in range(len(self.task_list)):
+
+                if self.isInterruptionRequested():
+                    break
+
+                self.task_list[i][1] = "运行"
+                self.update_task_list.emit(self.task_list)
+
+                if self.task_list[i][0] in Config.running_list:
+
+                    self.task_list[i][1] = "跳过"
+                    self.update_task_list.emit(self.task_list)
+                    logger.info(f"跳过任务：{self.task_list[i][0]}")
+                    self.push_info_bar.emit(
+                        "info", "跳过任务", self.task_list[i][0], 3000
+                    )
+                    continue
 
                 Config.running_list.append(self.task_list[i][0])
                 logger.info(f"任务开始：{self.task_list[i][0]}")
-                self.push_info_bar.emit("info", "任务开始", self.task_list[i][0], 5000)
+                self.push_info_bar.emit("info", "任务开始", self.task_list[i][0], 3000)
 
                 if self.member_dict[self.task_list[i][0]][0] == "Maa":
 
                     self.task = MaaManager(
-                        "自动代理",
+                        self.mode[0:4],
                         self.member_dict[self.task_list[i][0]][1],
                     )
 
+                    self.task.question.connect(self.question.emit)
+                    self.question_response.disconnect()
+                    self.question_response.connect(self.task.question_response.emit)
                     self.task.push_info_bar.connect(self.push_info_bar.emit)
                     self.task.create_user_list.connect(self.create_user_list.emit)
                     self.task.update_user_list.connect(self.update_user_list.emit)
                     self.task.update_log_text.connect(self.update_log_text.emit)
-                    self.task.update_user_info.connect(self.update_user_info.emit)
+                    self.task.update_user_info.connect(
+                        lambda modes, uids, days, lasts, notes, numbs: self.update_user_info.emit(
+                            self.member_dict[self.task_list[i][0]][1],
+                            modes,
+                            uids,
+                            days,
+                            lasts,
+                            notes,
+                            numbs,
+                        )
+                    )
                     self.task.accomplish.connect(
                         lambda log: self.save_log(self.task_list[i][0], log)
                     )
@@ -106,15 +156,9 @@ class Task(QtCore.QThread):
 
                 self.task_list[i][1] = "完成"
                 logger.info(f"任务完成：{self.task_list[i][0]}")
-                self.push_info_bar.emit("info", "任务完成", self.task_list[i][0], 5000)
+                self.push_info_bar.emit("info", "任务完成", self.task_list[i][0], 3000)
 
-            else:
-
-                self.task_list[i][1] = "跳过"
-                logger.info(f"跳过任务：{self.task_list[i][0]}")
-                self.push_info_bar.emit("info", "跳过任务", self.task_list[i][0], 5000)
-
-        self.accomplish.emit(self.logs)
+            self.accomplish.emit(self.logs)
 
     def search_member(self) -> dict:
         """搜索所有脚本实例并固定相关配置信息"""
@@ -135,12 +179,12 @@ class Task(QtCore.QThread):
         self.logs.append([name, log])
 
 
-class TaskManager(QtCore.QObject):
+class TaskManager(QObject):
     """业务调度器"""
 
-    create_gui = QtCore.Signal(Task)
-    connect_gui = QtCore.Signal(Task)
-    push_info_bar = QtCore.Signal(str, str, str, int)
+    create_gui = Signal(Task)
+    connect_gui = Signal(Task)
+    push_info_bar = Signal(str, str, str, int)
 
     def __init__(self):
         super(TaskManager, self).__init__()
@@ -162,16 +206,20 @@ class TaskManager(QtCore.QObject):
         MainInfoBar.push_info_bar("info", "任务开始", name, 3000)
 
         Config.running_list.append(name)
-        self.task_list[name] = Task(name, info)
+        self.task_list[name] = Task(mode, name, info)
+        self.task_list[name].question.connect(
+            lambda title, content: self.push_dialog(name, title, content)
+        )
         self.task_list[name].push_info_bar.connect(MainInfoBar.push_info_bar)
+        self.task_list[name].update_user_info.connect(Config.change_user_info)
         self.task_list[name].accomplish.connect(
             lambda logs: self.remove_task(name, logs)
         )
 
-        if mode == "新窗口":
+        if "新窗口" in mode:
             self.create_gui.emit(self.task_list[name])
 
-        elif mode == "主窗口":
+        elif "主窗口" in mode:
             self.connect_gui.emit(self.task_list[name])
 
         self.task_list[name].start()
@@ -217,5 +265,14 @@ class TaskManager(QtCore.QObject):
         self.task_list.pop(name)
         Config.running_list.remove(name)
 
+    def push_dialog(self, name: str, title: str, content: str):
+        """推送对话框"""
+
+        choice = Dialog(title, content, None)
+        choice.yesButton.setText("是")
+        choice.cancelButton.setText("否")
+
+        self.task_list[name].question_response.emit(bool(choice.exec_()))
+
 
 Task_manager = TaskManager()