fix: failed to parse event type 'custom'

Author: Monomux

Plugin/Manager.py

@@ -17,7 +17,7 @@ class PluginManager:
     functions: Dict[str, Callable] = {}
     # record_functions: List[Callable] = []
     plugins: List[PluginInterface] = []
-    resources_paths: List[str] = []
+    # resources_paths: List[str] = []
 
 
     @staticmethod
@@ -40,17 +40,17 @@ def discover_plugin():
                 entry: os.DirEntry
                 if entry.is_dir():
                     manifest = PluginManager.load_manifest(entry.path)
-                    if manifest and manifest['enabled']:
+                    if manifest:
                         if entry.path not in sys.path:
                             sys.path.append(entry.path)
                         if manifest.get('entry', None) is not None and manifest.get('plugin_class', None) is not None:
                             loader = SourceFileLoader(manifest['plugin_class'], os.path.join(entry.path, manifest["entry"]))
                             plugin_module = loader.load_module()
                             plugin_class = getattr(plugin_module, manifest['plugin_class'])
                             PluginManager.plugins.append(plugin_class(manifest))
-                        if manifest.get('resources_path') is not None:
-                            for path in manifest['resources_path']['theme']:
-                                PluginManager.resources_paths.append(os.path.join(entry.path, path))
+                        # if manifest.get('resources_path') is not None:
+                        #     for path in manifest['resources_path']['theme']:
+                        #         PluginManager.resources_paths.append(os.path.join(entry.path, path))
 
         logger.info(f'Discovered Plugin {[plugin_ins.meta.name for plugin_ins in PluginManager.plugins]}')
 
@@ -67,7 +67,7 @@ def register_plugin():
             #     PluginManager.record_functions.extend(funcs_rec)
         logger.info(f'Registered functions: {PluginManager.functions.keys()}')
         # logger.info(f'Registered record functions: {PluginManager.record_functions}')
-        logger.info(f'Additional Resources: {PluginManager.resources_paths}')
+        # logger.info(f'Additional Resources: {PluginManager.resources_paths}')
 
     @staticmethod
     @logger.catch
@@ -76,7 +76,7 @@ def call(function_name: str, json_object: JsonObject):
         if func:
             return func(json_object)
         else:
-            logger.warning(f'Cannot find function {function_name} in registered plugins')
+            logger.error(f'Cannot find function {function_name} in registered plugins')
             return None
 
     @staticmethod
@@ -95,6 +95,6 @@ def reload():
         PluginManager.functions = {}
         PluginManager.record_functions = []
         PluginManager.plugins = []
-        PluginManager.resources_paths = []
+        # PluginManager.resources_paths = []
         PluginManager.discover_plugin()
         PluginManager.register_plugin()

UIFunc.py

@@ -112,7 +112,7 @@ def __init__(self, app):
         # Config
         self.choice_theme.addItems(['Default'])
         self.choice_theme.addItems(list_themes())
-        self.choice_theme.addItems(PluginManager.resources_paths)
+        # self.choice_theme.addItems(PluginManager.resources_paths)
         self.stimes.setValue(int(self.config.value("Config/LoopTimes")))
         self.mouse_move_interval_ms.setValue(int(self.config.value("Config/Precision")))
         self.choice_theme.setCurrentText(self.config.value("Config/Theme"))

Util/Parser.py

@@ -44,15 +44,20 @@ def parse(script_path: str, *args) -> JsonObject:
         label_maps: Dict[str, JsonObject] = {}
         pending_dict: Dict[JsonObject, str] = {}  # 如果对象要跳转到未收入的label，则暂存该对象等待遍历完成后(labelmaps完全更新)再添加内容
 
-        head_object = ScriptParser.link_objects(objects, None, label_maps, pending_dict)
-        if len(pending_dict) > 0:
-            for json_object, target_label in pending_dict.items():
-                target_object = label_maps.get(target_label, None)
-                if target_object:
-                    json_object.next_object = target_object
-                else:
-                    logger.error(f'Could not find label {target_label}')
-        return head_object
+        try:
+            head_object = ScriptParser.link_objects(objects, None, label_maps, pending_dict)
+            if len(pending_dict) > 0:
+                for json_object, target_label in pending_dict.items():
+                    target_object = label_maps.get(target_label, None)
+                    if target_object:
+                        json_object.next_object = target_object
+                    else:
+                        logger.error(f'Could not find label {target_label}')
+            return head_object
+        except Exception as e:
+            logger.error(e)
+            logger.error('无法解析脚本，请检查是否存在语法问题')
+            return None
 
     @staticmethod
     @logger.catch
@@ -111,6 +116,8 @@ def parse(script_path: str, *args) -> JsonObject:
                     content = json5.load(f)
             except Exception as e:
                 logger.error(e)
+                logger.error('无法解析脚本，请检查是否存在语法问题')
+                return None
 
         logger.debug('Script content')
         logger.debug(content)

Util/RunScriptClass.py

@@ -77,9 +77,8 @@ def wait_if_pause(self):
         else:
             self.resume()
 
-    @logger.catch
     def run(self):
-        logger.debug('Run script at thread' + str(threading.current_thread()))
+        logger.debug('Run script at thread' + str(QThread.currentThread()))
 
         if not self.script_path:
             self.tnumrdSignal.emit('script not found, please record first!')
@@ -88,7 +87,11 @@ def run(self):
 
         self.btnSignal.emit(False)
         self.playtuneSignal.emit('start.wav')
-        self.run_script_from_path(self.script_path)
+        try:
+            self.run_script_from_path(self.script_path)
+        except Exception as e:
+            logger.error(e)
+            self.logSignal.emit('An error occurred during execution! Please check logs!')
         self.statusSignal.emit(True)
         self.playtuneSignal.emit('end.wav')
 
@@ -136,7 +139,7 @@ def run_script_from_path(self, script_path: str):
             self.logSignal.emit('==============\nAn error occurred during runtime')
             self.logSignal.emit(str(e))
             self.logSignal.emit('==============')
-            self.logSignal.emit('failed')
+            self.logSignal.emit('script run failed, please check your log file')
         finally:
             self.btnSignal.emit(True)
 
@@ -173,10 +176,11 @@ def run_object(self, json_object: JsonObject):
                 return json_object.next_object
             else:
                 return json_object.next_object_if_false
-        elif object_type == 'goto':
+        elif object_type == 'goto' or object_type == 'custom':
             pass
         elif object_type == 'subroutine':
-            self.run_script_from_path(json_object.content['path'])
+            for path in json_object.content['path']:
+                self.run_script_from_path(path)
         else:
             # Not supposed to happen
             logger.error(f'Unexpected event type when running {json_object.content}')