Add info label to SubProcessDlg

为子进程对话框添加信息文本；
修复直接运行`__main__.py`会导致的相对导入问题

Author: muziing

src/py2exe_gui/Core/packaging.py

@@ -23,7 +23,7 @@ def __init__(self, parent: Optional[QObject] = None):
         ]
         self.args_dict: dict = dict.fromkeys(pyinstaller_args, "")
         self._args: List[str] = []
-        self._subprocess: SubProcessTool = SubProcessTool(self, program="pyinstaller")
+        self.subprocess: SubProcessTool = SubProcessTool(self, program="pyinstaller")
 
     def set_pyinstaller_args(self, arg: tuple[str, str]) -> None:
         """
@@ -68,27 +68,5 @@ def run_packaging_process(self) -> None:
         """
 
         # self._subprocess.output.connect(lambda val: print(val))  # 测试用
-        self._subprocess.set_arguments(self._args)
-        self._subprocess.start_process()
-
-    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.abort_process()
-
-            return result
-        else:
-            return 0
+        self.subprocess.set_arguments(self._args)
+        self.subprocess.start_process()

src/py2exe_gui/Widgets/dialog_widgets.py

@@ -2,22 +2,21 @@
 from PySide6.QtWidgets import (
     QDialog,
     QFileDialog,
+    QLabel,
     QMessageBox,
     QTextBrowser,
     QVBoxLayout,
     QWidget,
 )
 
-"""
-由于各种对话框的设置代码较繁琐且独立，故单独在本模块中配置
-"""
+from py2exe_gui.Core.subprocess_tool import SubProcessTool
 
 
 class ScriptFileDlg(QFileDialog):
     """用于获取入口脚本文件的对话框"""
 
     def __init__(self, parent: QWidget = None) -> None:
-        super().__init__(parent)
+        super(ScriptFileDlg, self).__init__(parent)
         self._setup()
 
     def _setup(self) -> None:
@@ -63,7 +62,7 @@ class AboutMessage(QMessageBox):
     """用于显示关于信息的对话框"""
 
     def __init__(self, parent: QWidget = None) -> None:
-        super(AboutMessage, self).__init__(parent=parent)
+        super(AboutMessage, self).__init__(parent)
         self._about_text: str = ""
         self._setup()
 
@@ -97,30 +96,40 @@ class SubProcessDlg(QDialog):
     """用于显示子进程信息的对话框"""
 
     def __init__(self, parent: QWidget = None) -> None:
-        super(SubProcessDlg, self).__init__(parent=parent)
-        self.browser = QTextBrowser()
+        super(SubProcessDlg, self).__init__(parent)
+        self.info_label = QLabel(self)
+        self.browser = QTextBrowser(self)
         self._setup()
 
-    def _setup(self):
+    def _setup(self) -> None:
         """
         配置子进程信息对话框 \n
         """
 
+        self.setWindowTitle("PyInstaller")
+        self.setModal(True)
+
         layout = QVBoxLayout()
+        layout.addWidget(self.info_label)
         layout.addWidget(self.browser)
         self.setLayout(layout)
 
-    def handle_output(self, subprocess_output: tuple[int, str]):
+    def handle_output(self, subprocess_output: tuple[int, str]) -> None:
         """
         处理子进程的输出 \n
         :param subprocess_output: 子进程输出
         :return: None
         """
+
         output_type, output_text = subprocess_output
-        if output_type == 2:
+        if output_type == SubProcessTool.STDOUT:
             self.browser.append(output_text)
-        elif output_type == 3:
+        elif output_type == SubProcessTool.STDERR:
             self.browser.append(output_text)
+        elif output_type == SubProcessTool.FINISHED:
+            self.info_label.setText("打包完成！")
+        elif output_type == SubProcessTool.STATE:
+            self.info_label.setText(output_text)
 
 
 if __name__ == "__main__":

src/py2exe_gui/__main__.py

@@ -1,10 +1,11 @@
 import sys
 
+from PySide6 import QtGui
 from PySide6.QtWidgets import QApplication
 
-from .Core.packaging import Packaging
-from .Widgets.dialog_widgets import SubProcessDlg
-from .Widgets.main_window import MainWindow
+from py2exe_gui.Core.packaging import Packaging
+from py2exe_gui.Widgets.dialog_widgets import SubProcessDlg
+from py2exe_gui.Widgets.main_window import MainWindow
 
 
 class MainApp(MainWindow):
@@ -20,7 +21,6 @@ def __init__(self, *args, **kwargs) -> None:
                 val
             )
         )
-
         self.center_widget.option_selected.connect(self.packager.set_pyinstaller_args)
 
         self.subprocess_dlg = SubProcessDlg(self)
@@ -30,18 +30,18 @@ def run_packaging():
             self.subprocess_dlg.show()
 
         self.center_widget.run_packaging_btn.clicked.connect(run_packaging)
-
-        # TODO 在 Packaging 类中增加处理输出的方法，将所有 output 信号连接至该方法处理
-        self.packager._subprocess.output.connect(self.subprocess_dlg.handle_output)
+        self.packager.subprocess.output.connect(self.subprocess_dlg.handle_output)
 
         self.status_bar.showMessage("就绪")
 
-    def closeEvent(self, event):
+    def closeEvent(self, event: QtGui.QCloseEvent) -> None:
         """
         重写关闭事件，进行收尾清理 \n
+        :param event: 关闭事件
+        :return: None
         """
 
-        self.packager.abort_process()
+        self.packager.subprocess.abort_process()
         super(MainApp, self).closeEvent(event)