Эх сурвалжийг харах

Merge pull request #1141 from BluettDream/dev_feat_next_run

dev_feat_next_run
huangrunheng 1 жил өмнө
parent
commit
01ec661e5b

+ 7 - 0
module/config/config.py

@@ -199,6 +199,13 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         if pending_task:
         if pending_task:
             pending_task = TaskScheduler.schedule(rule=self.model.script.optimization.schedule_rule,
             pending_task = TaskScheduler.schedule(rule=self.model.script.optimization.schedule_rule,
                                                   pending=pending_task)
                                                   pending=pending_task)
+            # 防止正在运行的任务被新上来的pending队列中的任务给顶替掉
+            if self.model.running_task and pending_task:
+                for i, obj in enumerate(pending_task):
+                    if obj.command == self.model.running_task:
+                        pending_task.insert(0, pending_task.pop(i))
+                        logger.info(f'{self.model.running_task} is running')
+                        break
         if waiting_task:
         if waiting_task:
             # waiting_task = f.apply(waiting_task)
             # waiting_task = f.apply(waiting_task)
             waiting_task = sorted(waiting_task, key=operator.attrgetter("next_run"))
             waiting_task = sorted(waiting_task, key=operator.attrgetter("next_run"))

+ 1 - 0
module/config/config_model.py

@@ -80,6 +80,7 @@ from tasks.Duel.config import Duel
 
 
 class ConfigModel(ConfigBase):
 class ConfigModel(ConfigBase):
     config_name: str = "oas"
     config_name: str = "oas"
+    running_task: str = ''
     script: Script = Field(default_factory=Script)
     script: Script = Field(default_factory=Script)
     restart: Restart = Field(default_factory=Restart)
     restart: Restart = Field(default_factory=Restart)
     global_game: GlobalGame = Field(default_factory=GlobalGame)
     global_game: GlobalGame = Field(default_factory=GlobalGame)

+ 15 - 8
module/server/script_router.py

@@ -134,6 +134,20 @@ async def script_task(script_name: str, task: str, group: str, argument: str, ty
         raise HTTPException(status_code=400, detail=f'Argument type error: {e}')
         raise HTTPException(status_code=400, detail=f'Argument type error: {e}')
     return mm.config_cache(script_name).model.script_set_arg(task, group, argument, value)
     return mm.config_cache(script_name).model.script_set_arg(task, group, argument, value)
 
 
+
+@script_app.put('/{script_name}/{task}/sync_next_run')
+async def sync_next_run(script_name: str, task: str, target_dt: str):
+    if script_name not in mm.script_process:
+        return False
+    config = mm.config_cache(script_name)
+    target = datetime.strptime(target_dt, '%Y-%m-%d %H:%M:%S') if target_dt else None
+    config.task_delay(task=task, success=True, target=target)
+    script_process = mm.script_process[script_name]
+    config.get_next()
+    await script_process.broadcast_state({"schedule": config.get_schedule_data()})
+    return True
+
+
 # --------------------------------------  SSE  --------------------------------------
 # --------------------------------------  SSE  --------------------------------------
 @script_app.get('/{script_name}/state')
 @script_app.get('/{script_name}/state')
 async def script_task_state(script_name: str):
 async def script_task_state(script_name: str):
@@ -195,11 +209,4 @@ async def websocket_endpoint(websocket: WebSocket, script_name: str):
 
 
     except WebSocketDisconnect:
     except WebSocketDisconnect:
         logger.warning(f'[{script_name}] websocket disconnect')
         logger.warning(f'[{script_name}] websocket disconnect')
-        script_process.disconnect(websocket)
-
-
-
-
-
-
-
+        await script_process.disconnect(websocket)

+ 6 - 1
module/server/script_websocket.py

@@ -13,9 +13,14 @@ class ScriptWSManager:
         await ws.accept()
         await ws.accept()
         self.active_connections.append(ws)
         self.active_connections.append(ws)
 
 
-    def disconnect(self, ws: WebSocket):
+    async def disconnect(self, ws: WebSocket):
         # 关闭时 移除ws对象
         # 关闭时 移除ws对象
         self.active_connections.remove(ws)
         self.active_connections.remove(ws)
+        try:
+            # 给前端发送最后一次关闭信号
+            await ws.close()
+        except RuntimeError:
+            pass
 
 
     async def broadcast(self, message: str):
     async def broadcast(self, message: str):
         # 广播消息
         # 广播消息

+ 3 - 0
script.py

@@ -424,6 +424,7 @@ class Script:
             logger.set_file_logger(self.config_name, do_cleanup=True)
             logger.set_file_logger(self.config_name, do_cleanup=True)
         start_day = date.today()
         start_day = date.today()
         logger.info(f'Start scheduler loop: {self.config_name}')
         logger.info(f'Start scheduler loop: {self.config_name}')
+        self.config.model.running_task = ''
 
 
         # Update GUI 防呆, 读取设置并立刻显示后台模拟器到前台
         # Update GUI 防呆, 读取设置并立刻显示后台模拟器到前台
         if not self.config.script.device.run_background_only:
         if not self.config.script.device.run_background_only:
@@ -474,7 +475,9 @@ class Script:
             self.device.stuck_record_clear()
             self.device.stuck_record_clear()
             self.device.click_record_clear()
             self.device.click_record_clear()
             logger.hr(task, level=0)
             logger.hr(task, level=0)
+            self.config.model.running_task = task
             success = self.run(inflection.camelize(task))
             success = self.run(inflection.camelize(task))
+            self.config.model.running_task = ''
             logger.info(f'Scheduler: End task `{task}`')
             logger.info(f'Scheduler: End task `{task}`')
             self.is_first_task = False
             self.is_first_task = False