* Update dev version

* Refactor

Author: JE-Chen

pybreeze/extend/mail_thunder_extend/mail_thunder_setting.py

@@ -11,7 +11,7 @@ def send_after_test(html_report_path: str = None) -> None:
         mail_thunder_smtp: SMTPWrapper = SMTPWrapper()
         if html_report_path is None and mail_thunder_smtp.login_state is True:
             user: str = mail_thunder_smtp.user
-            with open("default_name.html", "r+") as file:
+            with open("default_name.html", "r") as file:
                 html_string: str = file.read()
             message = mail_thunder_smtp.create_message_with_attach(
                 html_string,
@@ -21,7 +21,7 @@ def send_after_test(html_report_path: str = None) -> None:
             mail_thunder_smtp.quit()
         elif mail_thunder_smtp.login_state is True:
             user: str = mail_thunder_smtp.user
-            with open(html_report_path, "r+") as file:
+            with open(html_report_path, "r") as file:
                 html_string: str = file.read()
             message: MIMEMultipart = mail_thunder_smtp.create_message_with_attach(
                 html_string,

pybreeze/extend/process_executor/api_testka/api_testka_process.py

@@ -36,7 +36,7 @@ def call_api_testka_multi_file(
         if need_to_execute_list is not None \
                 and isinstance(need_to_execute_list, list) and len(need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_api_testka(
                         main_window,
                         test_script_json.read(),
@@ -56,7 +56,7 @@ def call_api_testka_multi_file_and_send(
         if need_to_execute_list is not None \
                 and isinstance(need_to_execute_list, list) and len(need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_api_testka_with_send(
                         main_window,
                         test_script_json.read(),

pybreeze/extend/process_executor/auto_control/auto_control_process.py

@@ -35,7 +35,7 @@ def call_auto_control_multi_file(
     if need_to_execute_list is not None \
             and isinstance(need_to_execute_list, list) and len(need_to_execute_list) > 0:
         for execute_file in need_to_execute_list:
-            with open(execute_file, "r+") as test_script_json:
+            with open(execute_file, "r") as test_script_json:
                 call_auto_control(
                     main_window,
                     test_script_json.read(),
@@ -52,7 +52,7 @@ def call_auto_control_multi_file_and_send(
         if need_to_execute_list is not None \
                 and isinstance(need_to_execute_list, list) and len(need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_auto_control_with_send(
                         main_window,
                         test_script_json.read(),

pybreeze/extend/process_executor/file_automation/file_automation_process.py

@@ -36,7 +36,7 @@ def call_file_automation_test_multi_file(
         if need_to_execute_list is not None \
                 and isinstance(need_to_execute_list, list) and len(need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_file_automation_test(
                         main_window,
                         test_script_json.read(),
@@ -56,7 +56,7 @@ def call_file_automation_test_multi_file_and_send(
         if need_to_execute_list is not None \
                 and isinstance(need_to_execute_list, list) and len(need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_file_automation_test_with_send(
                         main_window,
                         test_script_json.read(),

pybreeze/extend/process_executor/load_density/load_density_process.py

@@ -36,7 +36,7 @@ def call_load_density_multi_file(
         if need_to_execute_list is not None and isinstance(need_to_execute_list, list) and len(
                 need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_load_density(
                         main_window,
                         test_script_json.read(),
@@ -56,7 +56,7 @@ def call_load_density_multi_file_and_send(
         if need_to_execute_list is not None and isinstance(need_to_execute_list, list) and len(
                 need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_load_density_with_send(
                         main_window,
                         test_script_json.read(),

pybreeze/extend/process_executor/process_executor_utils.py

@@ -56,13 +56,13 @@ def start_process(
     if send_mail:
         process = TaskProcessManager(
             main_window=code_window,
+            task_done_trigger_function=send_after_test,
             program_buffer_size=program_buffer,
             program_encoding=main_window.encoding
         )
     else:
         process = TaskProcessManager(
             code_window,
-            task_done_trigger_function=send_after_test,
             program_buffer_size=program_buffer,
             program_encoding=main_window.encoding
         )

pybreeze/extend/process_executor/python_task_process_manager.py

@@ -1,4 +1,3 @@
-import json
 import queue
 import subprocess
 import sys
@@ -57,23 +56,19 @@ def renew_path(self) -> None:
     def start_test_process(self, package: str, exec_str: str):
         self.renew_path()
         if sys.platform in ["win32", "cygwin", "msys"]:
-            exec_str = json.dumps(exec_str)
-            args = [
-                self.compiler_path,
-                "-m",
-                package,
-                "--execute_str",
-                exec_str
-            ]
-        else:
-            args = " ".join([f"{self.compiler_path}", f"-m {package}", "--execute_str", f"{exec_str}"])
-        self.process: subprocess.Popen = subprocess.Popen(
+            exec_str = __import__("json").dumps(exec_str)
+        args = [
+            str(self.compiler_path),
+            "-m",
+            package,
+            "--execute_str",
+            exec_str
+        ]
+        self.process = subprocess.Popen(
             args,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            shell=True,
-            encoding=self.program_encoding
         )
         self.still_run_program = True
         # program output message queue thread
@@ -143,7 +138,7 @@ def exit_program(self):
             self.read_program_output_from_thread = None
         if self.read_program_error_output_from_thread is not None:
             self.read_program_error_output_from_thread = None
-        self.print_and_clear_queue()
+        self.drain_and_display_queue()
         if self.process is not None:
             self.process.terminate()
             text_cursor = self.main_window.code_result.textCursor()
@@ -152,26 +147,56 @@ def exit_program(self):
             text_cursor.insertText(f"Task exit with code {self.process.returncode}", text_format)
             text_cursor.insertBlock()
             self.process = None
+        if self.task_done_trigger_function is not None:
+            try:
+                self.task_done_trigger_function()
+            except Exception as e:
+                print(repr(e), file=sys.stderr)
 
-    def print_and_clear_queue(self):
-        self.run_output_queue = queue.Queue()
-        self.run_error_queue = queue.Queue()
+    def drain_and_display_queue(self):
+        while not self.run_output_queue.empty():
+            try:
+                output_message = self.run_output_queue.get_nowait()
+                output_message = str(output_message).strip()
+                if output_message:
+                    text_cursor = self.main_window.code_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("normal_output_color"))
+                    text_cursor.insertText(output_message, text_format)
+                    text_cursor.insertBlock()
+            except queue.Empty:
+                break
+        while not self.run_error_queue.empty():
+            try:
+                error_message = self.run_error_queue.get_nowait()
+                error_message = str(error_message).strip()
+                if error_message:
+                    text_cursor = self.main_window.code_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("error_output_color"))
+                    text_cursor.insertText(error_message, text_format)
+                    text_cursor.insertBlock()
+            except queue.Empty:
+                break
 
     def read_program_output_from_process(self):
         while self.still_run_program:
-            self.process: subprocess.Popen
-            program_output_data = self.process.stdout.readline(self.program_buffer_size) \
-                .decode("utf-8", "replace")
-            if self.process:
-                self.process.stdout.flush()
-            if program_output_data.strip() != "":
+            proc = self.process
+            if proc is None:
+                break
+            program_output_data = proc.stdout.readline(self.program_buffer_size)
+            if isinstance(program_output_data, bytes):
+                program_output_data = program_output_data.decode(self.program_encoding, "replace")
+            if program_output_data.strip():
                 self.run_output_queue.put(program_output_data)
 
     def read_program_error_output_from_process(self):
         while self.still_run_program:
-            program_error_output_data = self.process.stderr.readline(self.program_buffer_size) \
-                .decode("utf-8", "replace")
-            if self.process:
-                self.process.stderr.flush()
-            if program_error_output_data.strip() != "":
+            proc = self.process
+            if proc is None:
+                break
+            program_error_output_data = proc.stderr.readline(self.program_buffer_size)
+            if isinstance(program_error_output_data, bytes):
+                program_error_output_data = program_error_output_data.decode(self.program_encoding, "replace")
+            if program_error_output_data.strip():
                 self.run_error_queue.put(program_error_output_data)

pybreeze/extend/process_executor/test_pioneer/test_pioneer_process_manager.py

@@ -37,6 +37,7 @@ def __init__(
         self._main_window.clear_code_result()
         self._still_run_program: bool = False
         self._program_buffer_size = program_buffer
+        self._program_encoding = encoding
         self._run_output_queue: Queue = Queue()
         self._run_error_queue: Queue = Queue()
         self._read_program_error_output_from_thread: Union[threading.Thread, None] = None
@@ -51,25 +52,18 @@ def __init__(
             self._compiler_path = check_and_choose_venv(venv_path)
         else:
             self._compiler_path = main_window.python_compiler
-        if sys.platform in ["win32", "cygwin", "msys"]:
-            args = [
-                self._compiler_path,
-                "-m",
-                "test_pioneer",
-                "-e",
-                executable_path
-            ]
-        else:
-            args = " ".join([
-                f"{self._compiler_path}", "-m test_pioneer", "-e", f"{executable_path}"
-            ])
-        self._process: subprocess.Popen = subprocess.Popen(
+        args = [
+            str(self._compiler_path),
+            "-m",
+            "test_pioneer",
+            "-e",
+            executable_path
+        ]
+        self._process: Union[subprocess.Popen, None] = subprocess.Popen(
             args,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            shell=True,
-            encoding=encoding
         )
 
     # Pyside UI update method
@@ -118,7 +112,7 @@ def exit_program(self):
             self._read_program_output_from_thread = None
         if self._read_program_error_output_from_thread is not None:
             self._read_program_error_output_from_thread = None
-        self.print_and_clear_queue()
+        self.drain_and_clear_queue()
         if self._process is not None:
             self._process.terminate()
             text_cursor = self._code_window.code_result.textCursor()
@@ -128,27 +122,52 @@ def exit_program(self):
             text_cursor.insertBlock()
             self._process = None
 
-    def print_and_clear_queue(self):
-        self._run_output_queue = queue.Queue()
-        self._run_error_queue = queue.Queue()
+    def drain_and_clear_queue(self):
+        while not self._run_output_queue.empty():
+            try:
+                output_message = self._run_output_queue.get_nowait()
+                output_message = str(output_message).strip()
+                if output_message:
+                    text_cursor = self._code_window.code_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("normal_output_color"))
+                    text_cursor.insertText(output_message, text_format)
+                    text_cursor.insertBlock()
+            except queue.Empty:
+                break
+        while not self._run_error_queue.empty():
+            try:
+                error_message = self._run_error_queue.get_nowait()
+                error_message = str(error_message).strip()
+                if error_message:
+                    text_cursor = self._code_window.code_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("error_output_color"))
+                    text_cursor.insertText(error_message, text_format)
+                    text_cursor.insertBlock()
+            except queue.Empty:
+                break
 
     def read_program_output_from_process(self):
         while self._still_run_program:
-            self.process: subprocess.Popen
-            program_output_data = self._process.stdout.readline(self._program_buffer_size) \
-                .decode("utf-8", "replace")
-            if self._process:
-                self._process.stdout.flush()
-            if program_output_data.strip() != "":
+            proc = self._process
+            if proc is None:
+                break
+            program_output_data = proc.stdout.readline(self._program_buffer_size)
+            if isinstance(program_output_data, bytes):
+                program_output_data = program_output_data.decode(self._program_encoding, "replace")
+            if program_output_data.strip():
                 self._run_output_queue.put(program_output_data)
 
     def read_program_error_output_from_process(self):
         while self._still_run_program:
-            program_error_output_data = self._process.stderr.readline(self._program_buffer_size) \
-                .decode("utf-8", "replace")
-            if self._process:
-                self._process.stderr.flush()
-            if program_error_output_data.strip() != "":
+            proc = self._process
+            if proc is None:
+                break
+            program_error_output_data = proc.stderr.readline(self._program_buffer_size)
+            if isinstance(program_error_output_data, bytes):
+                program_error_output_data = program_error_output_data.decode(self._program_encoding, "replace")
+            if program_error_output_data.strip():
                 self._run_error_queue.put(program_error_output_data)
 
     def start_test_pioneer_process(self):

pybreeze/extend/process_executor/web_runner/web_runner_process.py

@@ -36,7 +36,7 @@ def call_web_runner_test_multi_file(
         if need_to_execute_list is not None and isinstance(need_to_execute_list, list) and len(
                 need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_web_runner_test(
                         main_window,
                         test_script_json.read(),
@@ -56,7 +56,7 @@ def call_web_runner_test_multi_file_and_send(
         if need_to_execute_list is not None and isinstance(need_to_execute_list, list) and len(
                 need_to_execute_list) > 0:
             for execute_file in need_to_execute_list:
-                with open(execute_file, "r+") as test_script_json:
+                with open(execute_file, "r") as test_script_json:
                     call_web_runner_test_with_send(
                         main_window,
                         test_script_json.read(),

pybreeze/pybreeze_ui/connect_gui/ssh/ssh_command_widget.py

@@ -175,7 +175,7 @@ def connect_ssh(self):
             self.reader_thread.closed.connect(self._on_closed)
             self.reader_thread.start()
             self.login_widget.status_label.setText(
-                self.word_dict.get("ssh_command_widget_dialog_title_not_connected"))
+                self.word_dict.get("ssh_command_widget_log_message_connected"))
             self.append_text(f"{self.word_dict.get('ssh_command_widget_log_message_connected')}"
                              f" {host}:{port} as {user}\n")
         except Exception as e: