Refactor

Author: JE-Chen

.idea/workspace.xml

@@ -2,10 +2,7 @@
 
 from je_auto_control import start_autocontrol_socket_server
 
-try:
-    server = start_autocontrol_socket_server()
-    while not server.close_flag:
-        pass
-    sys.exit(0)
-except Exception as error:
-    print(repr(error))
+server = start_autocontrol_socket_server()
+while True:
+    if server.close_flag:
+        sys.exit(0)

autocontrol_driver/generate_autocontrol_driver.py

@@ -104,8 +104,6 @@
 # import screen
 from je_auto_control.wrapper.auto_control_screen import screen_size
 from je_auto_control.wrapper.auto_control_screen import screenshot
-# GUI
-from je_auto_control.gui.main_window import start_autocontrol_gui
 __all__ = [
     "click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
     "mouse_scroll", "set_mouse_position", "special_mouse_keys_table",
@@ -121,5 +119,4 @@
     "generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
     "generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
     "callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
-    "start_autocontrol_gui"
 ]

je_auto_control/__init__.py

@@ -128,12 +128,12 @@ def callback_function(
             **kwargs
     ) -> Any:
         """
-        :param trigger_function_name: what function we want to trigger only accept function in event_dict
-        :param callback_function: what function we want to callback
-        :param callback_function_param: callback function's param only accept dict 
-        :param callback_param_method: what type param will use on callback function only accept kwargs and args
-        :param kwargs: trigger_function's param
-        :return: trigger_function_name return value
+        :param trigger_function_name: what function we want to trigger only accept function in event_dict.
+        :param callback_function: what function we want to callback.
+        :param callback_function_param: callback function's param only accept dict.
+        :param callback_param_method: what type param will use on callback function only accept kwargs and args.
+        :param kwargs: trigger_function's param.
+        :return: trigger_function_name return value.
         """
         try:
             if trigger_function_name not in self.event_dict.keys():

je_auto_control/utils/callback/callback_function_executor.py

@@ -6,9 +6,10 @@
 
 def find_image(image, detect_threshold: float = 1, draw_image: bool = False) -> List[int]:
     """
-    :param image which cv2_utils we want to find on screen
-    :param detect_threshold detect precision 0.0 ~ 1.0; 1 is absolute equal
-    :param draw_image draw detect tag on return cv2_utils
+    Find image with detect threshold on screen.
+    :param image: which cv2_utils we want to find on screen
+    :param detect_threshold: detect precision 0.0 ~ 1.0; 1 is absolute equal
+    :param draw_image: draw detect tag on return cv2_utils
     """
     grab_image = ImageGrab.grab()
     return template_detection.find_object(image=grab_image, template=image,
@@ -17,9 +18,10 @@ def find_image(image, detect_threshold: float = 1, draw_image: bool = False) ->
 
 def find_image_multi(image, detect_threshold: float = 1, draw_image: bool = False) -> List[List[int]]:
     """
-    :param image which cv2_utils we want to find on screen
-    :param detect_threshold detect precision 0.0 ~ 1.0; 1 is absolute equal
-    :param draw_image draw detect tag on return cv2_utils
+    Find multi image with detect threshold on screen.
+    :param image: which cv2_utils we want to find on screen
+    :param detect_threshold: detect precision 0.0 ~ 1.0; 1 is absolute equal
+    :param draw_image: draw detect tag on return cv2_utils
     """
     grab_image = ImageGrab.grab()
     return template_detection.find_multi_object(image=grab_image, template=image,

je_auto_control/utils/cv2_utils/template_detection.py

@@ -4,101 +4,97 @@ class AutoControlException(Exception):
 
 
 # Keyboard
-
-
-class AutoControlKeyboardException(AutoControlException):
+class AutoControlKeyboardException(Exception):
     pass
 
 
-class AutoControlCantFindKeyException(AutoControlKeyboardException):
+class AutoControlCantFindKeyException(Exception):
     pass
 
 
 # Mouse
-
-
-class AutoControlMouseException(AutoControlException):
+class AutoControlMouseException(Exception):
     pass
 
 
 # Screen
 
 
-class AutoControlScreenException(AutoControlException):
+class AutoControlScreenException(Exception):
     pass
 
 
 # Image detect
 
 
-class ImageNotFoundException(AutoControlException):
+class ImageNotFoundException(Exception):
     pass
 
 
 # Record
 
 
-class AutoControlRecordException(AutoControlException):
+class AutoControlRecordException(Exception):
     pass
 
 
 # Execute action
 
-class AutoControlExecuteActionException(AutoControlException):
+class AutoControlExecuteActionException(Exception):
     pass
 
 
-class AutoControlJsonActionException(AutoControlExecuteActionException):
+class AutoControlJsonActionException(Exception):
     pass
 
 
-class AutoControlActionNullException(AutoControlExecuteActionException):
+class AutoControlActionNullException(Exception):
     pass
 
 
-class AutoControlActionException(AutoControlExecuteActionException):
+class AutoControlActionException(Exception):
     pass
 
 
-class AutoControlAddCommandException(AutoControlExecuteActionException):
+class AutoControlAddCommandException(Exception):
     pass
 
 
-class AutoControlArgparseException(AutoControlExecuteActionException):
+class AutoControlArgparseException(Exception):
     pass
 
 
 # timeout
-class AutoControlTimeoutException(AutoControlException):
+class AutoControlTimeoutException(Exception):
     pass
 
 
 # html exception
 
-class AutoControlHTMLException(AutoControlException):
+class AutoControlHTMLException(Exception):
     pass
 
 
 # Json Exception
 
-class AutoControlJsonException(AutoControlException):
+class AutoControlJsonException(Exception):
     pass
 
 
-class AutoControlGenerateJsonReportException(AutoControlJsonException):
+class AutoControlGenerateJsonReportException(Exception):
     pass
 
 
 # XML
 
-class XMLException(AutoControlException):
+class XMLException(Exception):
     pass
 
 
-class XMLTypeException(XMLException):
+class XMLTypeException(Exception):
     pass
 
 
 # Execute callback
-class CallbackExecutorException(AutoControlException):
+class CallbackExecutorException(Exception):
     pass

je_auto_control/utils/exception/exceptions.py

@@ -124,14 +124,12 @@ def execute_action(self, action_list: [list, dict]) -> Dict[str, str]:
         """
         auto_control_logger.info(f"execute_action, action_list: {action_list}")
         if isinstance(action_list, dict):
-            action_list: list = action_list.get("auto_control", None)
+            action_list: list = action_list.get("auto_control")
             if action_list is None:
                 raise AutoControlActionNullException(executor_list_error)
         execute_record_dict = dict()
         try:
-            if len(action_list) > 0 or isinstance(action_list, list):
-                pass
-            else:
+            if len(action_list) < 0 or isinstance(action_list, list) is False:
                 raise AutoControlActionNullException(action_is_null_error)
         except Exception as error:
             record_action_to_list("AC_execute_action", action_list, repr(error))
@@ -167,14 +165,14 @@ def execute_files(self, execute_files_list: list) -> List[Dict[str, str]]:
         return execute_detail_list
 
     def scheduler_event_trigger(
-            self, function: str, id: str = None, args: Union[list, tuple] = None,
+            self, function: str, scheduler_id: str = None, args: Union[list, tuple] = None,
             kwargs: dict = None, scheduler_type: str = "nonblocking", wait_type: str = "secondly",
             wait_value: int = 1, **trigger_args: Any) -> None:
         if scheduler_type == "nonblocking":
             scheduler_event = scheduler_manager.nonblocking_scheduler_event_dict.get(wait_type)
         else:
             scheduler_event = scheduler_manager.blocking_scheduler_event_dict.get(wait_type)
-        scheduler_event(self.event_dict.get(function), id, args, kwargs, wait_value, **trigger_args)
+        scheduler_event(self.event_dict.get(function), scheduler_id, args, kwargs, wait_value, **trigger_args)
 
 
 executor = Executor()

je_auto_control/utils/executor/action_executor.py

@@ -58,7 +58,7 @@ def add_blocking_job(
         """
         params = locals()
         params.pop("self")
-        trigger_args = params.pop("trigger_args")
+        params.pop("trigger_args")
         return self._blocking_schedulers.add_job(**params, **trigger_args)
 
     def add_nonblocking_job(
@@ -92,7 +92,7 @@ def add_nonblocking_job(
         """
         params = locals()
         params.pop("self")
-        trigger_args = params.pop("trigger_args")
+        params.pop("trigger_args")
         return self._background_schedulers.add_job(**params, **trigger_args)
 
     def get_blocking_scheduler(self) -> BlockingScheduler:

je_auto_control/utils/scheduler/extend_apscheduler.py

@@ -35,9 +35,7 @@ def dict_to_elements_tree(json_dict: dict):
     """
 
     def _to_elements_tree(json_dict: dict, root):
-        if not json_dict:
-            pass
-        elif isinstance(json_dict, str):
+        if isinstance(json_dict, str):
             root.text = json_dict
         elif isinstance(json_dict, dict):
             for key, value in json_dict.items():

je_auto_control/utils/xml/change_xml_structure/change_xml_structure.py

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_auto_control_dev"
-version = "0.0.99"
+version = "0.0.100"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]
@@ -20,8 +20,6 @@ dependencies = [
     "pyobjc-core;platform_system=='Darwin'",
     "pyobjc;platform_system=='Darwin'",
     "python-Xlib;platform_system=='Linux'",
-    "Pyside6",
-    "qt-material"
 ]
 classifiers = [
     "Programming Language :: Python :: 3.9",