Merge pull request #57 from JE-Chen/dev

Dev

Author: JE-Chen

.idea/workspace.xml

@@ -1,8 +1,12 @@
+import sys
+
 from je_auto_control import start_autocontrol_socket_server
 
 try:
     server = start_autocontrol_socket_server()
     while not server.close_flag:
         pass
+    else:
+        sys.exit(0)
 except Exception as error:
     print(repr(error))

autocontrol_driver/generate_autocontrol_driver.py

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

…l_driver/generate_autocontrol_driver.exe …iver/generate_autocontrol_driver_win.exeautocontrol_driver/generate_autocontrol_driver.exe renamed to autocontrol_driver/generate_autocontrol_driver_win.exe autocontrol_driver/generate_autocontrol_driver.exe renamed to autocontrol_driver/generate_autocontrol_driver_win.exe

@@ -1,11 +1,11 @@
 import sys
 import types
 
-from je_auto_control import keys_table, press_key, release_key, hotkey, type_key, write
+from je_auto_control import press_key, release_key, hotkey, type_key, write, record, stop_record
 from je_auto_control import locate_all_image, locate_and_click, locate_image_center
-from je_auto_control import mouse_table, check_key_is_press, position, press_mouse, release_mouse, click_mouse, scroll
+from je_auto_control import check_key_is_press, position, press_mouse, release_mouse, click_mouse, scroll
 from je_auto_control import set_position
-from je_auto_control import screenshot, size, special_table
+from je_auto_control import screenshot, size
 from je_auto_control.utils.exception.exception_tag import action_is_null_error, add_command_exception_tag, \
     executor_list_error
 from je_auto_control.utils.exception.exception_tag import cant_execute_action_error
@@ -14,6 +14,8 @@
 from je_auto_control.utils.html_report.html_report_generate import generate_html
 from je_auto_control.utils.json.json_file import read_action_json
 from je_auto_control.utils.test_record.record_test_class import record_action_to_list, test_record_instance
+from je_auto_control.wrapper.auto_control_keyboard import get_special_table, get_keys_table
+from je_auto_control.wrapper.auto_control_mouse import get_mouse_table
 
 
 class Executor(object):
@@ -25,15 +27,15 @@ def __init__(self):
             "mouse_right": click_mouse,
             "mouse_middle": click_mouse,
             "click_mouse": click_mouse,
-            "mouse_table": mouse_table,
+            "mouse_table": get_mouse_table,
             "position": position,
             "press_mouse": press_mouse,
             "release_mouse": release_mouse,
             "scroll": scroll,
             "set_position": set_position,
-            "special_table": special_table,
+            "special_table": get_special_table,
             # keyboard
-            "keys_table": keys_table,
+            "keys_table": get_keys_table,
             "type_key": type_key,
             "press_key": press_key,
             "release_key": release_key,
@@ -51,6 +53,9 @@ def __init__(self):
             "set_record_enable": test_record_instance.set_record_enable,
             # generate html
             "generate_html": generate_html,
+            # record
+            "record": record,
+            "stop_record": stop_record,
         }
 
     def _execute_event(self, action: list):

dev_setup.py

@@ -1,6 +1,6 @@
-import sys
 import json
 import socketserver
+import sys
 import threading
 
 from je_auto_control.utils.executor.action_executor import execute_action

je_auto_control/utils/executor/action_executor.py

@@ -10,12 +10,20 @@
 from je_auto_control.utils.exception.exception_tag import table_cant_find_key
 from je_auto_control.utils.exception.exceptions import AutoControlCantFindKeyException
 from je_auto_control.utils.exception.exceptions import AutoControlKeyboardException
-from je_auto_control.wrapper.platform_wrapper import keyboard
+from je_auto_control.wrapper.platform_wrapper import keyboard, special_table
 from je_auto_control.wrapper.platform_wrapper import keyboard_check
 from je_auto_control.wrapper.platform_wrapper import keys_table
 from je_auto_control.utils.test_record.record_test_class import record_action_to_list
 
 
+def get_special_table():
+    return special_table
+
+
+def get_keys_table():
+    return keys_table
+
+
 def press_key(keycode: [int, str], is_shift: bool = False, skip_record: bool = False) -> str:
     """
     use to press a key still press to use release key

je_auto_control/utils/socket_server/auto_control_socket_server.py

@@ -19,6 +19,10 @@
 from je_auto_control.utils.test_record.record_test_class import record_action_to_list
 
 
+def get_mouse_table():
+    return mouse_table
+
+
 def mouse_preprocess(mouse_keycode: [int, str], x: int, y: int) -> Tuple[Union[int, str], int, int]:
     """
     check mouse keycode is verified or not

je_auto_control/wrapper/auto_control_keyboard.py

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