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-09-16 21:04:36 +08:00
parent 6c52d5a2f0
commit 1585ab564d
3 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/core/task_manager.py
View File

@@ -76,7 +76,6 @@ class _TaskManager:
if task_id in self.task_dict or ( if task_id in self.task_dict or (
actual_id is not None and actual_id in self.task_dict actual_id is not None and actual_id in self.task_dict
): ):
raise RuntimeError(f"任务 {task_id} 已在运行") raise RuntimeError(f"任务 {task_id} 已在运行")
logger.info(f"创建任务: {task_id}, 模式: {mode}") logger.info(f"创建任务: {task_id}, 模式: {mode}")

16
app/task/MAA.py
View File

@@ -862,15 +862,10 @@ class MaaManager:
# 创建MAA任务 # 创建MAA任务
logger.info(f"启动MAA进程: {self.maa_exe_path}") logger.info(f"启动MAA进程: {self.maa_exe_path}")
await self.maa_process_manager.open_process(self.maa_exe_path, [], 0) await self.maa_process_manager.open_process(self.maa_exe_path, [], 0)
# 记录当前时间
self.log_start_time = datetime.now()
# 监测MAA运行状态 # 等待用户完成配置
self.log_check_mode = "设置脚本"
await self.maa_log_monitor.start(self.maa_log_path, self.log_start_time)
self.wait_event.clear() self.wait_event.clear()
await self.wait_event.wait() await self.wait_event.wait()
await self.maa_log_monitor.stop()
async def result_record(self): async def result_record(self):
"""记录用户结果信息""" """记录用户结果信息"""
@@ -1297,15 +1292,6 @@ class MaaManager:
else: else:
self.maa_result = "Wait" self.maa_result = "Wait"
elif self.mode == "设置脚本":
if (
"MaaAssistantArknights GUI exited" in log
or not await self.maa_process_manager.is_running()
):
self.maa_result = "Success!"
else:
self.maa_result = "Wait"
logger.debug(f"MAA 日志分析结果: {self.maa_result}") logger.debug(f"MAA 日志分析结果: {self.maa_result}")
if self.maa_result != "Wait": if self.maa_result != "Wait":

14
app/task/general.py
View File

@@ -529,16 +529,10 @@ class GeneralManager:
60 if self.script_config.get("Script", "IfTrackProcess") else 0 60 if self.script_config.get("Script", "IfTrackProcess") else 0
), ),
) )
# 记录当前时间
self.log_start_time = datetime.now()
# 监测MAA运行状态 # 等待用户完成配置
await self.general_log_monitor.start(
self.script_log_path, self.log_start_time
)
self.wait_event.clear() self.wait_event.clear()
await self.wait_event.wait() await self.wait_event.wait()
await self.general_log_monitor.stop()
async def result_record(self) -> None: async def result_record(self) -> None:
"""记录用户结果信息""" """记录用户结果信息"""
@@ -821,12 +815,6 @@ class GeneralManager:
else: else:
self.general_result = "Success!" self.general_result = "Success!"
elif self.mode == "设置通用脚本":
if await self.general_process_manager.is_running():
self.general_result = "Wait"
else:
self.general_result = "Success!"
logger.info(f"通用脚本日志分析结果: {self.general_result}") logger.info(f"通用脚本日志分析结果: {self.general_result}")
if self.general_result != "Wait": if self.general_result != "Wait":