refactor dev and stable

refactor socket server
Integration-Automation · Nov 9, 2022 · f235135 · f235135
1 parent 0568927
commit f235135
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/autocontrol_driver/generate_autocontrol_driver_win.exe b/autocontrol_driver/generate_autocontrol_driver_win.exe
diff --git a/dev_setup.py b/dev_setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="je_auto_control_dev",
-    version="0.0.42",
+    version="0.0.43",
     author="JE-Chen",
     author_email="zenmailman@gmail.com",
     description="auto testing",

diff --git a/je_auto_control/utils/socket_server/auto_control_socket_server.py b/je_auto_control/utils/socket_server/auto_control_socket_server.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
@@ -19,13 +19,9 @@ def handle(self):
         else:
             try:
                 execute_str = json.loads(command_string)
-                if execute_str is not None:
-                    for execute_function, execute_return in execute_action(execute_str).items():
-                        socket.sendto(str(execute_return).encode("utf-8"), self.client_address)
-                        socket.sendto("\n".encode("utf-8"), self.client_address)
-                    else:
-                        socket.sendto("No_Return_Data".encode("utf-8"), self.client_address)
-                        socket.sendto("\n".encode("utf-8"), self.client_address)
+                for execute_function, execute_return in execute_action(execute_str).items():
+                    socket.sendto(str(execute_return).encode("utf-8"), self.client_address)
+                    socket.sendto("\n".encode("utf-8"), self.client_address)
                 socket.sendto("Return_Data_Over_JE".encode("utf-8"), self.client_address)
                 socket.sendto("\n".encode("utf-8"), self.client_address)
             except Exception as error:

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="je_auto_control",
-    version="0.0.108",
+    version="0.0.109",
     author="JE-Chen",
     author_email="zenmailman@gmail.com",
     description="auto testing",