Optimize code

优化子进程相关的代码：重命名部分类与函数、重构部分__main__中的功能至具体模块中、修复部分缺失的父子控件关系；

Author: muziing

src/py2exe_gui/Core/packaging.py

@@ -3,7 +3,7 @@
 from PySide6 import QtCore
 from PySide6.QtCore import QObject
 
-from .subprocess_tool import QSubProcessTool
+from .subprocess_tool import SubProcessTool
 
 
 class Packaging(QObject):
@@ -23,9 +23,9 @@ def __init__(self, parent: Optional[QObject] = None):
         ]
         self.args_dict: dict = dict.fromkeys(pyinstaller_args, "")
         self._args: List[str] = []
-        self.subprocess: QSubProcessTool = QSubProcessTool()
+        self._subprocess: SubProcessTool = SubProcessTool(self)
 
-    def get_pyinstaller_args(self, arg: tuple[str, str]) -> None:
+    def set_pyinstaller_args(self, arg: tuple[str, str]) -> None:
         """
         解析传递来的PyInstaller运行参数，并添加至命令参数字典 \n
         :param arg: 运行参数
@@ -34,9 +34,9 @@ def get_pyinstaller_args(self, arg: tuple[str, str]) -> None:
         arg_key, arg_value = arg
         if arg_key in self.args_dict.keys():
             self.args_dict[arg_key] = arg_value
-        self.set_pyinstaller_args()
+        self._add_pyinstaller_args()
 
-    def set_pyinstaller_args(self) -> None:
+    def _add_pyinstaller_args(self) -> None:
         """
         将命令参数字典中的参数按顺序添加到命令参数列表中 \n
         :return: None
@@ -67,5 +67,27 @@ def run_packaging_process(self) -> None:
         :return: None
         """
 
-        # self.subprocess.output.connect(lambda val: print(val))  # 测试用
-        self.subprocess.start_process("pyinstaller", self._args)
+        # self._subprocess.output.connect(lambda val: print(val))  # 测试用
+        self._subprocess.start_process("pyinstaller", self._args)
+
+    def abort_process(self) -> int:
+        """
+        紧急终止打包进程 \n
+        :return: 子进程返回值
+        """
+
+        if self._subprocess.process:
+            result = 0
+
+            def handel(output: tuple):
+                """处理子进程的输出，获取进程结束的返回值"""
+                nonlocal result
+                if output[0] == 1:
+                    result = int(output[1])
+
+            self._subprocess.output.connect(handel)
+            self._subprocess.process.terminate()
+            self._subprocess.process.waitForFinished(10000)
+            return result
+        else:
+            return 0

src/py2exe_gui/Core/subprocess_tool.py

@@ -4,10 +4,10 @@
 from PySide6 import QtCore
 
 
-class QSubProcessTool(QtCore.QObject):
+class SubProcessTool(QtCore.QObject):
     """辅助使用QProcess创建并管理子进程的工具类"""
 
-    # 自定义信号，参数为 (output_type: QSubProcessTool.output_type, output_text: str)
+    # 自定义信号，参数为 tuple[output_type: SubProcessTool.output_type, output_text: str]
     output = QtCore.Signal(tuple)
 
     # output_types
@@ -17,7 +17,7 @@ class QSubProcessTool(QtCore.QObject):
     STDERR = 3
 
     def __init__(self, parent: Optional[QtCore.QObject] = None) -> None:
-        super(QSubProcessTool, self).__init__(parent)
+        super(SubProcessTool, self).__init__(parent)
         self.process: Optional[QtCore.QProcess] = None
 
     def start_process(self, program: str, arguments: Sequence[str]) -> None:
@@ -46,13 +46,15 @@ def _process_started(self) -> None:
         """
         pass
 
-    def _process_finished(self) -> None:
+    def _process_finished(
+        self, exit_code: int, exit_status: QtCore.QProcess.ExitStatus
+    ) -> None:
         """
         处理子进程的槽 \n
         :return: None
         """
 
-        self.output.emit((self.FINISHED, "Subprocess finished."))
+        self.output.emit((self.FINISHED, str(exit_code)))
         self.process = None
 
     def _handle_stdout(self) -> None:

src/py2exe_gui/__main__.py

@@ -13,25 +13,26 @@ class MainApp(MainWindow):
     def __init__(self, *args, **kwargs) -> None:
         super(MainApp, self).__init__(*args, **kwargs)
 
-        self.packager = Packaging()
+        self.packager = Packaging(self)
 
         self.packager.args_settled.connect(
             lambda val: self.center_widget.pyinstaller_args_browser.enrich_args_text(
                 val
             )
         )
 
-        self.center_widget.option_selected.connect(self.packager.get_pyinstaller_args)
+        self.center_widget.option_selected.connect(self.packager.set_pyinstaller_args)
 
-        self.subprocess_dlg = SubProcessDlg()
+        self.subprocess_dlg = SubProcessDlg(self)
 
         def run_packaging():
             self.packager.run_packaging_process()
             self.subprocess_dlg.show()
 
         self.center_widget.run_packaging_btn.clicked.connect(run_packaging)
 
-        self.packager.subprocess.output.connect(self.subprocess_dlg.handle_output)
+        # TODO 在 Packaging 类中增加处理输出的方法，将所有 output 信号连接至该方法处理
+        self.packager._subprocess.output.connect(self.subprocess_dlg.handle_output)
 
         self.status_bar.showMessage("就绪")
 
@@ -40,9 +41,7 @@ def closeEvent(self, event):
         重写关闭事件，进行收尾清理 \n
         """
 
-        if self.packager.subprocess.process:
-            self.packager.subprocess.process.terminate()  # 终止尚未结束的子进程
-            self.packager.subprocess.process.waitForFinished()
+        self.packager.abort_process()
         super(MainApp, self).closeEvent(event)