automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(core): 升级日志监看方法

Browse Source
This commit is contained in:
DLmaster
2025-02-14 16:27:18 +08:00
parent 8936b1c41d
commit 292e7f51e0
8 changed files with 184 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/ui/dispatch_center.py
View File

@@ -52,7 +52,7 @@ from typing import List, Dict
import json
from app.core import Config, Task_manager, Task, MainInfoBar
from app.core import Config, TaskManager, Task, MainInfoBar
class DispatchCenter(QWidget):
@@ -92,7 +92,7 @@ class DispatchCenter(QWidget):
dispatch_box = DispatchBox(task.name, self)
dispatch_box.top_bar.button.clicked.connect(
lambda: Task_manager.stop_task(task.name)
lambda: TaskManager.stop_task(task.name)
)
task.create_task_list.connect(dispatch_box.info.task.create_task)
@@ -128,7 +128,7 @@ class DispatchCenter(QWidget):
self.script_list["主调度台"].top_bar.button.clicked.disconnect()
self.script_list["主调度台"].top_bar.button.setText("中止任务")
self.script_list["主调度台"].top_bar.button.clicked.connect(
lambda: Task_manager.stop_task(task.name)
lambda: TaskManager.stop_task(task.name)
)
task.create_task_list.connect(
self.script_list["主调度台"].info.task.create_task
@@ -276,7 +276,7 @@ class DispatchBox(QWidget):
info = json.load(f)
logger.info(f"用户添加任务：{name}")
Task_manager.add_task(f"{self.mode.currentText()}_主调度台", name, info)
TaskManager.add_task(f"{self.mode.currentText()}_主调度台", name, info)
elif self.object.currentText().split(" - ")[0] == "实例":
@@ -285,7 +285,7 @@ class DispatchBox(QWidget):
info = {"Queue": {"Member_1": name}}
logger.info(f"用户添加任务：{name}")
Task_manager.add_task(
TaskManager.add_task(
f"{self.mode.currentText()}_主调度台", "自定义队列", info
)

12
app/ui/main_window.py
View File

@@ -44,7 +44,7 @@ from qfluentwidgets import (
from PySide6.QtGui import QIcon, QCloseEvent
from PySide6.QtCore import Qt
from app.core import Config, Task_manager, Main_timer, MainInfoBar
from app.core import Config, TaskManager, MainTimer, MainInfoBar
from app.services import Notify, Crypto, System
from .setting import Setting
from .member_manager import MemberManager
@@ -166,8 +166,8 @@ class AUTO_MAA(MSFluentWindow):
self.tray.setContextMenu(self.tray_menu)
self.tray.activated.connect(self.on_tray_activated)
Task_manager.create_gui.connect(self.dispatch_center.add_board)
Task_manager.connect_gui.connect(self.dispatch_center.connect_main_board)
TaskManager.create_gui.connect(self.dispatch_center.add_board)
TaskManager.connect_gui.connect(self.dispatch_center.connect_main_board)
self.setting.ui.card_IfShowTray.checkedChanged.connect(
lambda: self.show_ui("配置托盘")
)
@@ -327,9 +327,9 @@ class AUTO_MAA(MSFluentWindow):
self.show_ui("隐藏到托盘", if_quick=True)
# 清理各功能线程
Main_timer.Timer.stop()
Main_timer.Timer.deleteLater()
Task_manager.stop_task("ALL")
MainTimer.Timer.stop()
MainTimer.Timer.deleteLater()
TaskManager.stop_task("ALL")
# 关闭数据库连接
Config.close_database()

6
app/ui/member_manager.py
View File

@@ -57,7 +57,7 @@ from datetime import datetime, timedelta
import json
import shutil
from app.core import Config, MainInfoBar, Task_manager
from app.core import Config, MainInfoBar, TaskManager
from app.services import Crypto
from .Widget import (
LineEditMessageBox,
@@ -523,7 +523,7 @@ class MaaSettingBox(QWidget):
)
)
self.card_Set.clicked.connect(
lambda: Task_manager.add_task("设置MAA_全局", self.name, None)
lambda: TaskManager.add_task("设置MAA_全局", self.name, None)
)
Layout.addWidget(self.card_Name)
@@ -749,7 +749,7 @@ class MaaSettingBox(QWidget):
):
set_book = ["routine", "annihilation"]
Task_manager.add_task(
TaskManager.add_task(
"设置MAA_用户",
self.name,
{