Refactor the flow of packaging_task signals

完善`packaging_task`信号流的重构；
其他代码优化；

Author: muziing

src/py2exe_gui/Core/packaging_task.py

@@ -13,7 +13,8 @@ class PackagingTask(QtCore.QObject):
 
     # 自定义信号
     option_set = QtCore.Signal(tuple)  # 用户输入选项通过了验证，已设置为打包选项
-    option_error = QtCore.Signal()  # 用户输入选项有误，需要进一步处理
+    option_error = QtCore.Signal(str)  # 用户输入选项有误，需要进一步处理
+    ready_to_pack = QtCore.Signal(bool)  # 是否已经可以运行该打包任务
 
     def __init__(self, parent: Optional[QtCore.QObject] = None) -> None:
         """
@@ -24,8 +25,9 @@ def __init__(self, parent: Optional[QtCore.QObject] = None) -> None:
 
         self.script_path: Optional[Path] = None
         self.icon_path: Optional[Path] = None
+        self.out_name: Optional[str] = None
 
-    def handle_option(self, option: tuple):
+    def handle_option(self, option: tuple[str, str]):
         """
         处理用户在界面选择的打包选项 \n
         :param option: 选项
@@ -35,14 +37,22 @@ def handle_option(self, option: tuple):
 
         # 进行有效性验证，有效则保存并发射option_set信号，无效则发射option_error信号
         if arg_key == "script_path":
-            self.option_set.emit(option)
+            script_path = Path(arg_value)
+            if FilePathValidator.validate_script(script_path):
+                self.out_name = script_path.stem  # 输出名默认与脚本名相同
+                self.ready_to_pack.emit(True)
+                self.option_set.emit(option)
+            else:
+                self.ready_to_pack.emit(False)
+                self.option_error.emit("script_path")
         elif arg_key == "icon_path":
             self.option_set.emit(option)
         elif arg_key == "FD":
             self.option_set.emit(option)
         elif arg_key == "console":
             self.option_set.emit(option)
         elif arg_key == "out_name":
+            self.out_name = arg_value
             self.option_set.emit(option)
 
     def write_to_file(self):

…py2exe_gui/Core/interpreter_validator.py src/py2exe_gui/Core/validators.pysrc/py2exe_gui/Core/interpreter_validator.py renamed to src/py2exe_gui/Core/validators.py src/py2exe_gui/Core/interpreter_validator.py renamed to src/py2exe_gui/Core/validators.py

@@ -4,6 +4,26 @@
 from typing import Union
 
 
+class FilePathValidator:
+    """
+    根据给定的路径验证文件的有效性
+    """
+
+    @classmethod
+    def validate_script(cls, script_path: Union[str, Path]) -> bool:
+        """
+        验证脚本路径是否有效 \n
+        :param script_path: 脚本路径
+        """
+
+        path = Path(script_path)
+        # TODO 完善验证方法
+        if path.exists() and path.is_file():
+            return True
+        else:
+            return False
+
+
 class InterpreterValidator:
     """
     验证给定的可执行文件是否为有效的Python解释器，并获取该解释器相关信息

src/py2exe_gui/Widgets/center_widget.py

@@ -98,8 +98,7 @@ def setup_ui(self) -> None:
         self.pyinstaller_args_browser.setMaximumHeight(80)
 
         self.run_packaging_btn.setText("打包！")
-        # TODO 完成输入检查前、子进程运行时打包按钮设置为不可用
-        # self.run_packaging_btn.setEnabled(False)
+        self.run_packaging_btn.setEnabled(False)
 
     def _connect_slots(self) -> None:
         """
@@ -114,7 +113,6 @@ def script_file_selected(file_path: str) -> None:
             """
 
             # TODO 验证有效性、将脚本名作为默认app名
-            # 将字符串类型的文件路径转成pathlib型的？
             self.script_path_le.setText(file_path)
             self.parent().statusBar().showMessage(f"打开脚本路径：{file_path}")
             self.option_selected.emit(("script_path", file_path))
@@ -209,3 +207,31 @@ def _set_layout(self) -> None:
         main_layout.addWidget(self.pyinstaller_args_browser)
         main_layout.addWidget(self.run_packaging_btn)
         self.setLayout(main_layout)
+
+    @QtCore.Slot(tuple)
+    def handle_option_set(self, option: tuple[str, str]) -> None:
+        """
+        处理option_set信号的槽 \n
+        :param option: 选项键值对
+        """
+
+        pass
+
+    @QtCore.Slot(str)
+    def handle_option_error(self, option: str) -> None:
+        """
+        处理option_error信号的槽 \n
+        :param option: 选项
+        """
+
+        # 清空重置该项的输入控件，等待用户重新输入
+        pass
+
+    @QtCore.Slot(bool)
+    def handle_ready_to_pack(self, ready: bool) -> None:
+        """
+        处理ready_to_pack信号的槽 \n
+        :param ready: 是否可以进行打包
+        """
+
+        self.run_packaging_btn.setEnabled(ready)

src/py2exe_gui/__main__.py

@@ -17,28 +17,41 @@ class MainApp(MainWindow):
     def __init__(self, *args, **kwargs) -> None:
         super(MainApp, self).__init__(*args, **kwargs)
 
-        self.packager = Packaging(self)
         self.packaging_task = PackagingTask(self)
+        self.packager = Packaging(self)
+        self.subprocess_dlg = SubProcessDlg(self)
+
+        self._connect_signals()
+
+        self.status_bar.showMessage("就绪")
+
+    def _connect_signals(self) -> None:
+        """
+        连接各种信号与槽 \n
+        """
+
         self.center_widget.option_selected.connect(self.packaging_task.handle_option)
         self.packaging_task.option_set.connect(self.packager.set_pyinstaller_args)
+        self.packaging_task.option_set.connect(self.center_widget.handle_option_set)
+        self.packaging_task.option_error.connect(self.center_widget.handle_option_error)
+        self.packaging_task.ready_to_pack.connect(
+            self.center_widget.handle_ready_to_pack
+        )
 
+        # TODO 优化pyinstaller_args_browser的接口
         self.packager.args_settled.connect(
             lambda val: self.center_widget.pyinstaller_args_browser.enrich_args_text(
                 val
             )
         )
 
-        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)
 
-        self.status_bar.showMessage("就绪")
-
     def closeEvent(self, event: QtGui.QCloseEvent) -> None:
         """
         重写关闭事件，进行收尾清理 \n
@@ -49,7 +62,8 @@ def closeEvent(self, event: QtGui.QCloseEvent) -> None:
         super(MainApp, self).closeEvent(event)
 
 
-app = QApplication(sys.argv)
-window = MainApp()
-window.show()
-sys.exit(app.exec())
+if __name__ == "__main__":
+    app = QApplication(sys.argv)
+    window = MainApp()
+    window.show()
+    sys.exit(app.exec())