Dev

dev_setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="je_auto_control_dev",
-    version="0.0.04",
+    version="0.0.05",
     author="JE-Chen",
     author_email="zenmailman@gmail.com",
     description="auto testing",

je_auto_control/linux_with_x11/listener/x11_linux_listener.py

@@ -23,7 +23,7 @@
 
 class KeypressHandler(Thread):
 
-    def __init__(self, default_daemon=True):
+    def __init__(self, default_daemon: bool = True):
         """
         setDaemon : default damon is true
         still listener : continue listener keycode ?

je_auto_control/utils/action_executor/action_executor.py

@@ -22,6 +22,7 @@
 from je_auto_control import write
 from je_auto_control.utils.exception.exception_tag import action_is_null_error
 from je_auto_control.utils.exception.exception_tag import cant_execute_action_error
+from je_auto_control.utils.exception.exceptions import AutoControlActionException
 
 event_dict = {
     # mouse
@@ -53,14 +54,14 @@
 }
 
 
-def execute_event(action):
+def execute_event(action: list):
     event = event_dict.get(action[0])
     if len(action) == 2:
         event(**action[1])
     elif len(action) == 1:
         event()
     else:
-        pass
+        raise AutoControlActionException(cant_execute_action_error)
 
 
 def execute_action(action_list: list):

je_auto_control/utils/critical_exit/critcal_exit.py

@@ -10,7 +10,7 @@
 
 class CriticalExit(Thread):
 
-    def __init__(self, default_daemon=True):
+    def __init__(self, default_daemon: bool = True):
         super().__init__()
         self.setDaemon(default_daemon)
         self._exit_check_key = keys_table.get("f7")

je_auto_control/windows/mouse/win32_ctype_mouse_control.py

@@ -107,20 +107,4 @@ def scroll(scroll_value: int, x: int = None, y: int = None):
     :param x scroll x
     :param y scroll y
     """
-    now_cursor_x, now_cursor_y = position()
-    width, height = size()
-    if x is None:
-        x = now_cursor_x
-    else:
-        if x < 0:
-            x = 0
-        elif x >= width:
-            x = width - 1
-    if y is None:
-        y = now_cursor_y
-    else:
-        if y < 0:
-            y = 0
-        elif y >= height:
-            y = height - 1
     mouse_event(win32_WHEEL, x, y, dwData=scroll_value)

je_auto_control/wrapper/auto_control_keyboard.py

@@ -32,8 +32,8 @@ def press_key(keycode: [int, str], is_shift: bool = False, **kwargs):
         return str(keycode)
     except AutoControlKeyboardException:
         raise AutoControlKeyboardException(keyboard_press_key)
-    except TypeError:
-        raise AutoControlKeyboardException(repr(TypeError))
+    except TypeError as error:
+        raise AutoControlKeyboardException(repr(error))
 
 
 def release_key(keycode: [int, str], is_shift: bool = False, **kwargs):
@@ -54,8 +54,8 @@ def release_key(keycode: [int, str], is_shift: bool = False, **kwargs):
         return str(keycode)
     except AutoControlKeyboardException:
         raise AutoControlKeyboardException(keyboard_release_key)
-    except TypeError:
-        raise AutoControlKeyboardException(keyboard_type_key)
+    except TypeError as error:
+        raise AutoControlKeyboardException(repr(error))
 
 
 def type_key(keycode: [int, str], is_shift: bool = False, **kwargs):
@@ -69,8 +69,8 @@ def type_key(keycode: [int, str], is_shift: bool = False, **kwargs):
         return str(keycode)
     except AutoControlKeyboardException:
         raise AutoControlKeyboardException(keyboard_type_key)
-    except TypeError:
-        raise AutoControlKeyboardException(keyboard_type_key)
+    except TypeError as error:
+        raise AutoControlKeyboardException(repr(error))
 
 
 def check_key_is_press(keycode: [int, str], **kwargs):

je_auto_control/wrapper/auto_control_mouse.py

@@ -17,6 +17,25 @@
 from je_auto_control.wrapper.platform_wrapper import special_table
 
 
+def mouse_preprocess(mouse_keycode: [int, str], x: int, y: int):
+    try:
+        if type(mouse_keycode) is str:
+            mouse_keycode = mouse_table.get(mouse_keycode)
+        else:
+            pass
+    except AutoControlCantFindKeyException:
+        raise AutoControlCantFindKeyException(table_cant_find_key)
+    try:
+        now_x, now_y = position()
+        if x is None:
+            x = now_x
+        if y is None:
+            y = now_y
+    except AutoControlMouseException:
+        raise AutoControlMouseException(mouse_get_position)
+    return mouse_keycode, x, y
+
+
 def position():
     """
     get mouse current position
@@ -47,28 +66,17 @@ def press_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwarg
     :param x event x
     :param y event y
     """
+    mouse_keycode, x, y = mouse_preprocess(mouse_keycode, x, y)
     try:
-        if type(mouse_keycode) is str:
-            mouse_keycode = mouse_table.get(mouse_keycode)
-        else:
-            pass
-    except AutoControlCantFindKeyException:
-        raise AutoControlCantFindKeyException(table_cant_find_key)
-    try:
-        now_x, now_y = position()
-        if x is None:
-            x = now_x
-        if y is None:
-            y = now_y
         if sys.platform in ["win32", "cygwin", "msys", "linux", "linux2"]:
             mouse.press_mouse(mouse_keycode)
         elif sys.platform in ["darwin"]:
             mouse.press_mouse(x, y, mouse_keycode)
         return mouse_keycode, x, y
     except AutoControlMouseException:
         raise AutoControlMouseException(mouse_press_mouse)
-    except TypeError:
-        raise AutoControlMouseException(mouse_release_mouse)
+    except TypeError as error:
+        raise AutoControlMouseException(repr(error))
 
 
 def release_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwargs):
@@ -77,21 +85,7 @@ def release_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwa
     :param x event x
     :param y event y
     """
-    try:
-        if type(mouse_keycode) is str:
-            mouse_keycode = mouse_table.get(mouse_keycode)
-        else:
-            pass
-    except AutoControlCantFindKeyException:
-        raise AutoControlCantFindKeyException(table_cant_find_key)
-    try:
-        now_x, now_y = position()
-        if x is None:
-            x = now_x
-        if y is None:
-            y = now_y
-    except AutoControlMouseException:
-        raise AutoControlMouseException(mouse_get_position)
+    mouse_keycode, x, y = mouse_preprocess(mouse_keycode, x, y)
     try:
         if sys.platform in ["win32", "cygwin", "msys", "linux", "linux2"]:
             mouse.release_mouse(mouse_keycode)
@@ -100,8 +94,8 @@ def release_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwa
         return mouse_keycode, x, y
     except AutoControlMouseException:
         raise AutoControlMouseException(mouse_release_mouse)
-    except TypeError:
-        raise AutoControlMouseException(mouse_release_mouse)
+    except TypeError as error:
+        raise AutoControlMouseException(repr(error))
 
 
 def click_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwargs):
@@ -110,28 +104,14 @@ def click_mouse(mouse_keycode: [int, str], x: int = None, y: int = None, **kwarg
     :param x event x
     :param y event y
     """
-    try:
-        if type(mouse_keycode) is str:
-            mouse_keycode = mouse_table.get(mouse_keycode)
-        else:
-            pass
-    except AutoControlCantFindKeyException:
-        raise AutoControlCantFindKeyException(table_cant_find_key)
-    try:
-        now_x, now_y = position()
-        if x is None:
-            x = now_x
-        if y is None:
-            y = now_y
-    except AutoControlMouseException:
-        raise AutoControlMouseException(mouse_get_position)
+    mouse_keycode, x, y = mouse_preprocess(mouse_keycode, x, y)
     try:
         mouse.click_mouse(mouse_keycode, x, y)
         return mouse_keycode, x, y
     except AutoControlMouseException:
         raise AutoControlMouseException(mouse_click_mouse)
-    except TypeError:
-        raise AutoControlMouseException(mouse_click_mouse)
+    except TypeError as error:
+        raise AutoControlMouseException(repr(error))
 
 
 def scroll(scroll_value: int, x: int = None, y: int = None, scroll_direction: str = "scroll_down", **kwargs):
@@ -175,5 +155,5 @@ def scroll(scroll_value: int, x: int = None, y: int = None, scroll_direction: st
         return scroll_value, scroll_direction
     except AutoControlMouseException:
         raise AutoControlMouseException(mouse_scroll)
-    except TypeError:
-        raise AutoControlMouseException(mouse_scroll)
+    except TypeError as error:
+        raise AutoControlMouseException(repr(error))

test/unit_test/mouse/mouse_test.py

@@ -45,3 +45,11 @@
     release_mouse(1651651915)
 except AutoControlMouseException as error:
     print(repr(error), file=sys.stderr)
+try:
+    press_mouse("mouse_left")
+except AutoControlMouseException as error:
+    print(repr(error), file=sys.stderr)
+try:
+    release_mouse("mouse_left")
+except AutoControlMouseException as error:
+    print(repr(error), file=sys.stderr)