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

feat: 通用调度适配

Browse Source
This commit is contained in:
DLmaster361
2025-08-11 22:40:42 +08:00
parent 91209ad9e2
commit 09371f0a5c
8 changed files with 1124 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/core/__init__.py
View File

@@ -24,7 +24,7 @@ __author__ = "DLmaster361 <DLmaster_361@163.com>"
__license__ = "GPL-3.0 license"
from .broadcast import Broadcast
from .config import Config, MaaConfig, GeneralConfig, MaaUserConfig
from .config import Config, MaaConfig, GeneralConfig, MaaUserConfig, GeneralUserConfig
from .timer import MainTimer
from .task_manager import TaskManager
@@ -36,4 +36,5 @@ __all__ = [
"MainTimer",
"TaskManager",
"MaaUserConfig",
"GeneralUserConfig",
]

3
app/core/config.py
View File

@@ -22,7 +22,6 @@
import re
import shutil
import asyncio
import requests
import truststore
import calendar
@@ -133,7 +132,7 @@ class TimeSet(ConfigBase):
super().__init__()
self.Info_Enabled = ConfigItem("Info", "Enabled", False, BoolValidator())
self.Info_Time = ConfigItem("Info", "Set", "00:00")
self.Info_Time = ConfigItem("Info", "Time", "00:00")
class QueueConfig(ConfigBase):

8
app/core/task_manager.py
View File

@@ -118,8 +118,8 @@ class _TaskManager:
if isinstance(Config.ScriptConfig[task_id], MaaConfig):
task_item = MaaManager(mode, task_id, actual_id, websocket)
# elif isinstance(Config.ScriptConfig[task_id], GeneralConfig):
# task_item = GeneralManager(mode, task_id, actual_id, websocket)
elif isinstance(Config.ScriptConfig[task_id], GeneralConfig):
task_item = GeneralManager(mode, task_id, actual_id, websocket)
else:
logger.error(
f"不支持的脚本类型：{Config.ScriptConfig[task_id].__class__.__name__}"
@@ -197,8 +197,8 @@ class _TaskManager:
if isinstance(Config.ScriptConfig[script_id], MaaConfig):
task_item = MaaManager(mode, script_id, None, websocket)
# elif isinstance(Config.ScriptConfig[task_id], GeneralConfig):
# task_item = GeneralManager(mode, task_id, actual_id, websocket)
elif isinstance(Config.ScriptConfig[task_id], GeneralConfig):
task_item = GeneralManager(mode, task_id, actual_id, websocket)
else:
logger.error(
f"不支持的脚本类型：{Config.ScriptConfig[script_id].__class__.__name__}"