fix: no vars on run_command (part)

Author: OptiJava

hooks/__init__.py

@@ -20,21 +20,18 @@
 def trigger_hooks(hook: mount.Hooks, server: PluginServerInterface, objects_dict: Dict[str, Any] = None):
     if not cfg.config.automatically:
         return
-    
+
     try:
         if len(cfg.temp_config.hooks.get(hook.value)) != 0:
             _trigger_hooks(hook, server, objects_dict)
     except Exception as e:
         server.logger.exception(f'Unexpected exception when triggering hook {hook.value}', e)
 
 
-@new_thread('hooks - trigger')
-def _trigger_hooks(hook: mount.Hooks, server: PluginServerInterface, objects_dict: Dict[str, Any] = None):
-    logger.debug(f'Triggering hooks {hook.value}', server)
-    
+def process_objects(objects_dict: Dict[str, Any] = None) -> Dict:
     # 初始化最终变量字典
     finally_var_dict = dict()
-    
+
     if (objects_dict is not None) and (len(objects_dict.keys()) != 0):
         # 遍历所有已知对象
         for an_object_key in objects_dict.keys():
@@ -46,14 +43,22 @@ def _trigger_hooks(hook: mount.Hooks, server: PluginServerInterface, objects_dic
             if (not hasattr(var_inner_attr_dict, 'keys')) or (var_inner_attr_dict is None):
                 finally_var_dict[an_object_key] = an_object_value
                 continue
-            
+
             # 正在遍历的对象的属性字典中的正在遍历的key
             for var_inner_attr_key in var_inner_attr_dict.keys():
                 # 正在遍历的对象的属性字典中的正在遍历的key的value
                 var_inner_attr_value: Any = var_inner_attr_dict.get(var_inner_attr_key)
                 # 整合进入finally_var_dict
                 finally_var_dict[an_object_key + '_' + var_inner_attr_key] = var_inner_attr_value
-    
+    return finally_var_dict
+
+
+@new_thread('hooks - trigger')
+def _trigger_hooks(hook: mount.Hooks, server: PluginServerInterface, objects_dict: Dict[str, Any] = None):
+    logger.debug(f'Triggering hooks {hook.value}', server)
+
+    finally_var_dict = process_objects(objects_dict)
+
     # 遍历被挂载到此hook的task的key
     for task in cfg.temp_config.hooks.get(hook.value):
         if cfg.temp_config.task.get(task) is None:
@@ -74,12 +79,12 @@ def _trigger_hooks(hook: mount.Hooks, server: PluginServerInterface, objects_dic
 @new_thread('hooks - list')
 def list_task(src: CommandSource):
     rtext_list = RTextList()
-    
+
     if len(cfg.temp_config.task.values()) == 0:
         rtext_list.append(RText('Nothing', color=RColor.dark_gray, styles=RStyle.italic))
         src.reply(RTextMCDRTranslation('hooks.list.task', rtext_list))
         return
-    
+
     for t in cfg.temp_config.task.values():
         rtext_list.append(RTextList(
             RText('\n  '),
@@ -92,32 +97,32 @@ def list_task(src: CommandSource):
 @new_thread('hooks - list')
 def list_mount(src: CommandSource):
     list_hooks: list = list()
-    
+
     for hk in dict(mount.Hooks.__members__).keys():
         list_hooks.append(str(cfg.temp_config.hooks.get(str(hk))))
-    
+
     src.reply(RTextMCDRTranslation('hooks.list.mount', *list_hooks))
 
 
 @new_thread('hooks - list')
 def list_scripts(src: CommandSource):
     rtext_list = RTextList()
-    
+
     for scr in cfg.temp_config.scripts_list.keys():
         rtext_list.append(RText(scr + '  ', color=RColor.red).h(cfg.temp_config.scripts_list.get(scr)))
-    
+
     if rtext_list.is_empty():
         rtext_list.append(RText('Nothing', color=RColor.dark_gray, styles=RStyle.italic))
-    
+
     src.reply(RTextMCDRTranslation('hooks.list.script', rtext_list))
 
 
 def reload_config(src: CommandSource, server: PluginServerInterface):
     schedule_tasks.stop_all_schedule_daemon_threads(server)
-    
+
     cfg.temp_config = cfg.TempConfig()
     cfg.config = server.load_config_simple(target_class=cfg.Configuration)
-    
+
     load_scripts(server)
     server.logger.info('Config reloaded.')
     src.reply(RTextMCDRTranslation('hooks.reload.success'))
@@ -127,13 +132,13 @@ def man_run_task(task: str, env_str: str, src: CommandSource, server: PluginServ
     if task not in cfg.temp_config.task.keys():
         src.reply(RTextMCDRTranslation('hooks.man_run.task_not_exist'))
         return
-    
+
     try:
         env_dict: Dict[str, str] = dict(json.loads(env_str))
     except Exception as e:
         src.reply(RTextMCDRTranslation('hooks.man_run.illegal_env_json', e))
         return
-    
+
     try:
         cfg.temp_config.task.get(task).execute_task(server, mount.Hooks.undefined.value, var_dict=env_dict,
                                                     obj_dict=env_dict)
@@ -148,7 +153,7 @@ def man_run_task(task: str, env_str: str, src: CommandSource, server: PluginServ
 def clear_tasks(server: PluginServerInterface, src: CommandSource):
     for tsk in cfg.temp_config.task.copy().keys():
         tasks.delete_task(tsk, src, server)
-        
+
 
 @new_thread('hooks - run_command')
 def run_command(command: str, task_type: str, server: PluginServerInterface, src: CommandSource):
@@ -157,7 +162,9 @@ def run_command(command: str, task_type: str, server: PluginServerInterface, src
     except ValueError:
         src.reply(RTextMCDRTranslation('hooks.create.task_type_wrong', task_type))
         return
-    
+
+    ## TODO
+
     if task_type_var1 == tasks.TaskType.shell_command:
         os.system(command)
     elif task_type_var1 == tasks.TaskType.server_command:
@@ -170,30 +177,30 @@ def run_command(command: str, task_type: str, server: PluginServerInterface, src
 
 def _parse_and_apply_scripts(script: str, server: PluginServerInterface):
     logger.debug(f'Prepare for apply script: {script}', server)
-    
+
     try:
         # 读取
         _yml = yaml.YAML()
         with open(cfg.temp_config.scripts_list.get(script), 'r') as f:
             content: Dict[str, Union[str, Union[list, dict]]] = _yml.load(f)  # yaml.load(f.read(), Loader=yaml.Loader)
-        
+
         if content is not None:
             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 use_cmd_file:
                         # 读取
                         with open(cmd_file_path, 'r') as command_file:
@@ -207,33 +214,33 @@ def _parse_and_apply_scripts(script: str, server: PluginServerInterface):
                         tasks.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.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()
@@ -248,7 +255,7 @@ def _parse_and_apply_scripts(script: str, server: PluginServerInterface):
                                           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'):
@@ -262,19 +269,19 @@ def _parse_and_apply_scripts(script: str, server: PluginServerInterface):
 
 def load_scripts(server: PluginServerInterface):
     logger.debug('Loading scripts...', server)
-    
+
     if not os.path.isdir(scripts_folder):
         # 创建脚本目录
         os.makedirs(scripts_folder)
         return
-    
+
     def list_all_files(root_dir) -> List[str]:
         # 显示一个文件夹及子文件夹中的所有yaml文件
         _files_in_a_folder: List[str] = []
-        
+
         for file in os.listdir(root_dir):
             file_path = os.path.join(root_dir, file)
-            
+
             if os.path.isdir(file_path):
                 if file_path.endswith('_'):
                     logger.debug('Ignored folder ' + str(file_path), server)
@@ -284,33 +291,33 @@ def list_all_files(root_dir) -> List[str]:
             if os.path.isfile(file_path) and (file_path.endswith('.yaml') or file_path.endswith('.yml')):
                 # 添加文件路径
                 _files_in_a_folder.append(file_path)
-        
+
         return _files_in_a_folder
-    
+
     # 遍历所有yaml文件
     for script_path in list_all_files(scripts_folder):
         # key：文件名    value：文件路径
         cfg.temp_config.scripts_list[os.path.basename(script_path)] = script_path
-    
+
     # 遍历所有已成功注册的脚本
     for script in cfg.temp_config.scripts_list.keys():
         _parse_and_apply_scripts(script, server)
 
 
 def on_load(server: PluginServerInterface, old_module):
     global scripts_folder
-    
+
     cfg.temp_config = cfg.TempConfig()
     cfg.config = server.load_config_simple(target_class=cfg.Configuration)
-    
+
     scripts_folder = os.path.join(server.get_data_folder(), 'scripts')
     load_scripts(server)
-    
+
     if utils.is_windows():
         server.logger.warning('!###################################################################################!')
         server.logger.warning('Some features of hooks plugin cannot be run on Windows, you have already been warned.')
         server.logger.warning('!###################################################################################!')
-    
+
     server.register_command(
         Literal('!!hooks')
         .then(
@@ -437,16 +444,16 @@ def on_load(server: PluginServerInterface, old_module):
             )
         )
     )
-    
+
     trigger_hooks(mount.Hooks.on_plugin_loaded, server,
                   {'server': process_arg_server(server), 'old_module': old_module})
 
 
 def on_unload(server: PluginServerInterface):
     schedule_tasks.stop_all_schedule_daemon_threads(server)
-    
+
     trigger_hooks(mount.Hooks.on_plugin_unloaded, server, {'server': process_arg_server(server)})
-    
+
     server.save_config_simple(cfg.config)