Merge pull request #323 from taojy123/dev

v5.2

Author: OKOtohime

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+- [] I have checked the previous issues and there's no simular problems. 我已查看以往的issue并且没有找到类似的问题。
+
+**Describe the bug**
+**描述bug**
+
+**To Reproduce**
+**如何复现bug**
+
+**Expected behavior**
+**期望的结果**
+
+**Screenshots _optional_**
+**截图 _可选_**
+
+**Envrionment**
+**使用环境**
+ - OS: e.g. Windows 11 24h2
+ - 系统: 如Windows 11 24h2
+ - Software Version: e.g. 5.1.1
+ - 软件版本: 如 5.1.1
+
+**Additional context**
+**附加信息**
+_Add any other context about the problem here._
+_其它与问题相关的内容。_

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+- [] I have checked the previous issues and there's no simular request. 我已查看以往的issue并且没有找到类似的请求。
+
+**Feature Request**
+**请描述你的功能需求**
+
+**Describe the solution you'd like _optional_**
+**你想到的解决方案 _可选_**
+
+**Additional context**
+**附加信息**
+_Add any other context about the problem here._
+_其它与问题相关的内容。_

Event/Event.py

@@ -1,33 +1,25 @@
-import time
 from abc import ABCMeta, abstractmethod
+from typing import Dict, Any
 
 
 class Event(metaclass=ABCMeta):
     # 传入字典进行初始化
-    def __init__(self, content):
-        self.delay = content['delay']
-        self.event_type = content['event_type']
-        self.message = content['message']
-        self.action = content['action']
-        self.addon = content.get('addon')
+    def __init__(self, content: Dict[str, Any]):
+        """Default param: delay, event_type, message, action"""
+        for key in ['delay', 'event_type', 'action_type', 'action']:
+            setattr(self, key, content[key])
 
     def __str__(self):
-        if self.addon:
-            return '[%d, %s, %s, %s, %s]' % (self.delay, self.event_type, self.message, self.action, str(self.addon))
-        return '[%d, %s, %s, %s]' % (self.delay, self.event_type, self.message, self.action)
-
-    def summarystr(self):
         if self.event_type == 'EK':
-            return 'key {0} {1} after {2}ms'.format(self.action[1], self.message[4:], self.delay)
+            return 'key {0} {1} after {2}ms'.format(self.action[1], self.action_type[4:], self.delay)
+        elif self.event_type == 'EM':
+            return '{0} at {2} after {1}ms'.format(self.action_type, self.delay, self.action)
         else:
-            return '{0} after {1}ms'.format(self.message, self.delay)
+            return str(self.__dict__)
 
     # 延时
-    def sleep(self, thd=None):
-        if thd:
-            thd.sleep(self.delay)
-        else:
-            time.sleep(self.delay / 1000.0)
+    def sleep(self, thd):
+        thd.sleep(self.delay)
 
     @abstractmethod
     def execute(self, thd=None):

Event/UniversalEvents.py

@@ -45,39 +45,39 @@ def execute(self, thd=None):
                     y = int(y * SH)
                 pyautogui.moveTo(x, y)
 
-            if self.message == 'mouse left down':
+            if self.action_type == 'mouse left down':
                 pyautogui.mouseDown(button='left')
-            elif self.message == 'mouse left up':
+            elif self.action_type == 'mouse left up':
                 pyautogui.mouseUp(button='left')
-            elif self.message == 'mouse right down':
+            elif self.action_type == 'mouse right down':
                 pyautogui.mouseDown(button='right')
-            elif self.message == 'mouse right up':
+            elif self.action_type == 'mouse right up':
                 pyautogui.mouseUp(button='right')
-            elif self.message == 'mouse middle down':
+            elif self.action_type == 'mouse middle down':
                 pyautogui.mouseDown(button='middle')
-            elif self.message == 'mouse middle up':
+            elif self.action_type == 'mouse middle up':
                 pyautogui.mouseUp(button='middle')
-            elif self.message == 'mouse wheel up':
+            elif self.action_type == 'mouse wheel up':
                 pyautogui.scroll(1)
-            elif self.message == 'mouse wheel down':
+            elif self.action_type == 'mouse wheel down':
                 pyautogui.scroll(-1)
-            elif self.message == 'mouse move':
+            elif self.action_type == 'mouse move':
                 pass
             else:
-                logger.warning('Unknown mouse event:%s' % self.message)
+                logger.warning('Unknown mouse event:%s' % self.action_type)
 
         elif self.event_type == 'EK':
             key_code, key_name, extended = self.action
 
-            if self.message == 'key down':
+            if self.action_type == 'key down':
                 pyautogui.keyDown(key_name)
-            elif self.message == 'key up':
+            elif self.action_type == 'key up':
                 pyautogui.keyUp(key_name)
             else:
-                logger.warning('Unknown keyboard event:', self.message)
+                logger.warning('Unknown keyboard event:', self.action_type)
 
         elif self.event_type == 'EX':
-            if self.message == 'input':
+            if self.action_type == 'input':
                 text = self.action
                 # pyperclip.copy(text)
 
@@ -88,5 +88,5 @@ def execute(self, thd=None):
                 # keyboardctl.release('v')
                 # keyboardctl.release('ctrl')
             else:
-                logger.warning('Unknown extra event:%s' % self.message)
+                logger.warning('Unknown extra event:%s' % self.action_type)
 

Event/WindowsEvents.py

@@ -64,26 +64,26 @@ def execute(self, thd=None):
                     ny = int(y * 65535)
                     win32api.mouse_event(win32con.MOUSEEVENTF_ABSOLUTE | win32con.MOUSEEVENTF_MOVE, nx, ny, 0, 0)
 
-            if self.message == 'mouse left down':
+            if self.action_type == 'mouse left down':
                 win32api.mouse_event(win32con.MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0)
-            elif self.message == 'mouse left up':
+            elif self.action_type == 'mouse left up':
                 win32api.mouse_event(win32con.MOUSEEVENTF_LEFTUP, 0, 0, 0, 0)
-            elif self.message == 'mouse right down':
+            elif self.action_type == 'mouse right down':
                 win32api.mouse_event(win32con.MOUSEEVENTF_RIGHTDOWN, 0, 0, 0, 0)
-            elif self.message == 'mouse right up':
+            elif self.action_type == 'mouse right up':
                 win32api.mouse_event(win32con.MOUSEEVENTF_RIGHTUP, 0, 0, 0, 0)
-            elif self.message == 'mouse middle down':
+            elif self.action_type == 'mouse middle down':
                 win32api.mouse_event(win32con.MOUSEEVENTF_MIDDLEDOWN, 0, 0, 0, 0)
-            elif self.message == 'mouse middle up':
+            elif self.action_type == 'mouse middle up':
                 win32api.mouse_event(win32con.MOUSEEVENTF_MIDDLEUP, 0, 0, 0, 0)
-            elif self.message == 'mouse wheel up':
+            elif self.action_type == 'mouse wheel up':
                 win32api.mouse_event(win32con.MOUSEEVENTF_WHEEL, 0, 0, win32con.WHEEL_DELTA, 0)
-            elif self.message == 'mouse wheel down':
+            elif self.action_type == 'mouse wheel down':
                 win32api.mouse_event(win32con.MOUSEEVENTF_WHEEL, 0, 0, -win32con.WHEEL_DELTA, 0)
-            elif self.message == 'mouse move':
+            elif self.action_type == 'mouse move':
                 pass
             else:
-                logger.warning('Unknown mouse event:%s' % self.message)
+                logger.warning('Unknown mouse event:%s' % self.action_type)
 
         elif self.event_type == 'EK':
             key_code, key_name, extended = self.action
@@ -100,16 +100,16 @@ def execute(self, thd=None):
             if extended:
                 base = win32con.KEYEVENTF_EXTENDEDKEY
 
-            if self.message == 'key down':
+            if self.action_type == 'key down':
                 win32api.keybd_event(key_code, 0, base, 0)
-            elif self.message == 'key up':
+            elif self.action_type == 'key up':
                 win32api.keybd_event(key_code, 0, base | win32con.KEYEVENTF_KEYUP, 0)
             else:
-                logger.warning('Unknown keyboard event:', self.message)
+                logger.warning('Unknown keyboard event:', self.action_type)
 
         elif self.event_type == 'EX':
 
-            if self.message == 'input':
+            if self.action_type == 'input':
                 text = self.action
                 pyperclip.copy(text)
                 # Ctrl+V
@@ -118,4 +118,4 @@ def execute(self, thd=None):
                 win32api.keybd_event(86, 0, win32con.KEYEVENTF_KEYUP, 0)
                 win32api.keybd_event(162, 0, win32con.KEYEVENTF_KEYUP, 0)
             else:
-                logger.warning('Unknown extra event:%s' % self.message)
+                logger.warning('Unknown extra event:%s' % self.action_type)

KeymouseGo.py

@@ -5,24 +5,18 @@
 from PySide6.QtCore import Qt, Slot, QRect
 
 import UIFunc
+import Recorder
 import argparse
 from Event import ScriptEvent
 from loguru import logger
 
-from assets.plugins.ProcessException import *  # noqa: F403
-
-
-def add_lib_path(libpaths):
-    for libpath in libpaths:
-        if os.path.exists(libpath) and (libpath not in sys.path):
-            sys.path.append(libpath)
+from Plugin.Manager import PluginManager
+from Util.RunScriptClass import RunScriptCMDClass, StopFlag
 
 
 def to_abs_path(*args):
-    return os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), *args)
-
-
-add_lib_path([os.path.join(to_abs_path('plugins'))])
+    return os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])),
+                        *args)
 
 
 def resize_layout(ui, ratio_w, ratio_h):
@@ -51,52 +45,31 @@ def main():
 
 
 @logger.catch
-def single_run(script_path, run_times=1, speed=100, module_name='Extension'):
+def single_run(script_path, run_times):
+    flag = StopFlag(False)
+    thread = RunScriptCMDClass(script_path, run_times, flag)
+
+    stop_name = 'f9'
+
     @Slot(ScriptEvent)
     def on_keyboard_event(event):
         key_name = event.action[1].lower()
-        stop_name = 'f9'
         if key_name == stop_name:
             logger.debug('break exit!')
-            os._exit(0)
+            flag.value = True
+            thread.resume()
         return True
 
-    UIFunc.Recorder.setuphook(commandline=True)
-    UIFunc.Recorder.set_callback(on_keyboard_event)
-
-    try:
-        for path in script_path:
-            logger.info('Script path:%s' % path)
-            events, smodule_name, labeldict = UIFunc.RunScriptClass.parsescript(path, 
-                                                                     speed=speed)
-            extension = UIFunc.RunScriptClass.getextension(
-                smodule_name if smodule_name is not None else module_name,
-                runtimes=run_times,
-                speed=speed)
-            j = 0
-            extension.onbeginp()
-            while j < extension.runtimes or extension.runtimes == 0:
-                logger.info('=========== %d ===========' % j)
-                try:
-                    if extension.onbeforeeachloop(j):
-                        UIFunc.RunScriptClass.run_script_once(events, extension, labeldict=labeldict)
-                    extension.onaftereachloop(j)
-                    j += 1
-                except BreakProcess:
-                    logger.debug('Break')
-                    j += 1
-                    continue
-                except EndProcess:
-                    logger.debug('End')
-                    break
-            extension.onendp()
-            logger.info('%s run finish' % path)
-        logger.info('Scripts run finish!')
-    except Exception as e:
-        logger.error(e)
-        raise e
-    finally:
-        os._exit(0)
+    Recorder.setuphook(commandline=True)
+    Recorder.set_callback(on_keyboard_event)
+
+    PluginManager.reload()
+    eventloop = QApplication()
+
+    thread.finished.connect(eventloop.exit)
+    thread.start()
+
+    sys.exit(eventloop.exec_())
 
 
 if __name__ == '__main__':
@@ -113,25 +86,10 @@ def on_keyboard_event(event):
                             type=int,
                             default=1
                             )
-        parser.add_argument('-sp', '--speed',
-                            help='Run speed for the script, input in percentage form',
-                            type=int,
-                            default=100
-                            )
-        parser.add_argument('-m', '--module',
-                            help='Extension for the program',
-                            type=str,
-                            default='Extension'
-                            )
         args = vars(parser.parse_args())
         logger.debug(args)
-        if args['speed'] <= 0:
-            logger.warning('Unsupported speed')
-        else:
-            single_run(args['scripts'],
-                       run_times=args['runtimes'],
-                       speed=args['speed'],
-                       module_name=args['module']
-                       )
+        single_run(args['scripts'],
+                   run_times=args['runtimes']
+                   )
     else:
         main()

Plugin/Interface.py

@@ -0,0 +1,27 @@
+from abc import abstractmethod
+from typing import Dict, List, Callable
+
+
+class PluginMeta:
+    def __init__(self, manifest: Dict):
+        for key, value in manifest.items():
+            setattr(self, key, value)
+
+    def __str__(self) -> str:
+        return f'{self.name}:{self.version}'
+
+
+class PluginInterface:
+    functions: List[Callable] = []
+
+    def __init__(self, manifest: Dict):
+        self.meta = PluginMeta(manifest)
+
+    @abstractmethod
+    def register_functions(self) -> Dict[str, Callable]:
+        pass
+
+    @abstractmethod
+    def register_record_functions(self) -> List[Callable]:
+        pass
+