parse schedule_tasks in script & fix bugs

Author: OptiJava

hooks/__init__.py

@@ -428,43 +428,88 @@ def man_run_task(task: str, env_str: str, src: CommandSource, server: PluginServ
             e)
 
 
-def parse_and_apply_scripts(script: str, server: PluginServerInterface):
+def _parse_and_apply_scripts(script: str, server: PluginServerInterface):
     try:
         # 读取
         with open(temp_config.scripts_list.get(script), 'r') as f:
             content: dict[str, Union[str, Union[list, dict]]] = yaml.load(f.read(), Loader=yaml.Loader)
 
-        for task in content.get('tasks'):
-            use_cmd_file: bool = False
-            cmd_file_path: str = ''
-            
-            if task.get('command_file') is not None:
-                tmp_var1 = str(task.get('command_file')).replace('{hooks_config_path}', server.get_data_folder())
+        if content.get('tasks') is not None:
+            for task in content.get('tasks'):
+                use_cmd_file: bool = False
+                cmd_file_path: str = ''
+                
+                if task.get('command_file') is not None:
+                    var1 = str(task.get('command_file')).replace('{hooks_config_path}', server.get_data_folder())
+                    
+                    if os.path.isfile(var1):
+                        cmd_file_path = var1
+                        use_cmd_file = True
+                    else:
+                        server.logger.warning(
+                            f'Script path for task {task.get("name")} is invalid, use command instead! '
+                            f'{task.get("command_file")}')
 
-                if os.path.isfile(tmp_var1):
-                    cmd_file_path = tmp_var1
-                    use_cmd_file = True
+                if use_cmd_file:
+                    with open(cmd_file_path, 'r') as command_file:
+                        command_file_content = command_file.read()
+                    # 创建task
+                    create_task(task.get('task_type'), command_file_content, task.get('name'),
+                                server.get_plugin_command_source(),
+                                server, created_by=script)
                 else:
-                    server.logger.warning(
-                        f'Script path for task {task.get("name")} is invalid, use command instead! '
-                        f'{task.get("command_file")}')
-            
-            if use_cmd_file:
-                with open(cmd_file_path, 'r') as command_file:
-                    command_file_content = command_file.read()
-                # 创建task
-                create_task(task.get('task_type'), command_file_content, task.get('name'),
-                            server.get_plugin_command_source(),
-                            server, created_by=script)
-            else:
-                # 创建task
-                create_task(task.get('task_type'), task.get('command'), task.get('name'),
-                            server.get_plugin_command_source(),
-                            server, created_by=script)
-            
-            for hook in task.get('hooks'):
-                # 挂载
-                mount_task(hook, task.get('name'), server.get_plugin_command_source(), server)
+                    # 创建task
+                    create_task(task.get('task_type'), task.get('command'), task.get('name'),
+                                server.get_plugin_command_source(),
+                                server, created_by=script)
+                
+                if task.get('hooks') is None:
+                    continue
+                for hook in task.get('hooks'):
+                    # 挂载
+                    mount_task(hook, task.get('name'), server.get_plugin_command_source(), server)
+                
+                
+        if content.get('schedule_tasks') is not None:
+            for schedule in content.get('schedule_tasks'):
+                use_cmd_file: bool = False
+                cmd_file_path: str = ''
+                
+                if int(schedule.get('exec_interval')) <= 0:
+                    server.logger.warning(f'Invalid exec_interval in schedule task {schedule.get("name")}!')
+                
+                if schedule.get('command_file') is not None:
+                    var1 = str(schedule.get('command_file')).replace('{hooks_config_path}', server.get_data_folder())
+                    
+                    if os.path.isfile(var1):
+                        cmd_file_path = var1
+                        use_cmd_file = True
+                    else:
+                        server.logger.warning(
+                            f'Script path for task {schedule.get("name")} is invalid, use command instead! '
+                            f'{schedule.get("command_file")}')
+                
+                if use_cmd_file:
+                    with open(cmd_file_path, 'r') as command_file:
+                        command_file_content = command_file.read()
+                    # 创建task
+                    create_task(schedule.get('task_type'), command_file_content, schedule.get('name'),
+                                server.get_plugin_command_source(),
+                                server, created_by=script, is_schedule=True,
+                                exec_interval=schedule.get('exec_interval'))
+                else:
+                    # 创建task
+                    create_task(schedule.get('task_type'), schedule.get('command'), schedule.get('name'),
+                                server.get_plugin_command_source(),
+                                server, created_by=script, is_schedule=True,
+                                exec_interval=schedule.get('exec_interval'))
+                
+                if schedule.get('hooks') is None:
+                    continue
+                for hook in schedule.get('hooks'):
+                    # 挂载
+                    mount_task(hook, schedule.get('name'), server.get_plugin_command_source(), server)
+    
     except Exception as e:
         server.logger.exception(f'Unexpected exception when parse or apply scripts {os.path.basename(script)}! Please '
                                 f'check your scripts.', e)
@@ -498,7 +543,7 @@ def list_all_files(root_dir) -> list[str]:
 
     # 遍历所有已成功注册的脚本
     for script in temp_config.scripts_list.keys():
-        parse_and_apply_scripts(script, server)
+        _parse_and_apply_scripts(script, server)
 
 
 def on_load(server: PluginServerInterface, old_module):