Merge pull request #54 from JE-Chen/dev

Dev

Author: JE-Chen

.idea/workspace.xml

@@ -1,6 +1,8 @@
 from je_auto_control import start_autocontrol_socket_server
 
-if "__main__" == __name__:
+try:
     server = start_autocontrol_socket_server()
     while not server.close_flag:
         pass
+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.36",
+    version="0.0.38",
     author="JE-Chen",
     author_email="[email protected]",
     description="auto testing",

autocontrol_driver/generate_autocontrol_driver_win64.exe

@@ -75,4 +75,4 @@
 from je_auto_control.utils.file_process.get_dir_file_list import get_dir_files_as_list
 from je_auto_control.utils.file_process.create_project_structure import create_template_dir
 # socket server
-from je_auto_control.utils.socket_server.AutoControlSocketServer import start_autocontrol_socket_server
+from je_auto_control.utils.socket_server.auto_control_socket_server import start_autocontrol_socket_server

dev_setup.py

@@ -56,9 +56,9 @@ def __init__(self):
     def _execute_event(self, action: list):
         event = self.event_dict.get(action[0])
         if len(action) == 2:
-            event(**action[1])
+            return event(**action[1])
         elif len(action) == 1:
-            event()
+            return event()
         else:
             raise AutoControlActionException(cant_execute_action_error + " " + str(action))
 
@@ -80,19 +80,19 @@ def execute_action(self, action_list: [list, dict]) -> dict:
                 raise AutoControlActionNullException(action_is_null_error)
         except Exception as error:
             record_action_to_list("execute_action", action_list, repr(error))
-            print(repr(error), file=sys.stderr)
+            print(repr(error), file=sys.stderr, flush=True)
         for action in action_list:
             try:
                 event_response = self._execute_event(action)
                 execute_record = "execute: " + str(action)
                 execute_record_dict.update({execute_record: event_response})
             except Exception as error:
-                print(repr(error), file=sys.stderr)
-                print(action, file=sys.stderr)
+                print(repr(error), file=sys.stderr, flush=True)
+                print(action, file=sys.stderr, flush=True)
                 record_action_to_list("execute_action", None, repr(error))
         for key, value in execute_record_dict.items():
-            print(key)
-            print(value)
+            print(key, flush=True)
+            print(value, flush=True)
         return execute_record_dict
 
     def execute_files(self, execute_files_list: list) -> list:

je_auto_control/__init__.py

@@ -9,11 +9,11 @@ class TCPServerHandler(socketserver.BaseRequestHandler):
 
     def handle(self):
         command_string = str(self.request.recv(8192).strip(), encoding="utf-8")
-        print("command is: " + command_string)
+        print("command is: " + command_string, flush=True)
         if command_string == "quit_server":
             self.server.shutdown()
             self.server.close_flag = True
-            print("Now quit server")
+            print("Now quit server", flush=True)
         else:
             try:
                 execute_str = json.loads(command_string)

je_auto_control/utils/executor/action_executor.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="je_auto_control",
-    version="0.0.103",
+    version="0.0.104",
     author="JE-Chen",
     author_email="[email protected]",
     description="auto testing",

je_auto_control/utils/socket_server/AutoControlSocketServer.py renamed to je_auto_control/utils/socket_server/auto_control_socket_server.py

@@ -1,4 +1,4 @@
-from je_auto_control.utils.socket_server.AutoControlSocketServer import start_autocontrol_socket_server
+from je_auto_control.utils.socket_server.auto_control_socket_server import start_autocontrol_socket_server
 
 server = start_autocontrol_socket_server()
 server.server_close()