Optimize PLATFORM class with enum

将 `PLATFORM` 改为枚举值类；
优化 type hint；

Author: muziing

src/py2exe_gui/Constants/platform_constants.py

@@ -2,9 +2,11 @@
 # For details: https://github.com/muziing/Py2exe-GUI/blob/main/README.md#license
 
 import sys
+from enum import Enum, unique
 
 
-class PLATFORM:
+@unique
+class PLATFORM(Enum):
     """
     运行平台相关的常量 \n
     """
@@ -15,7 +17,7 @@ class PLATFORM:
     others = "others"
 
 
-def get_platform() -> str:
+def get_platform() -> PLATFORM:
     """
     辅助函数，用于获取当前运行的平台 \n
     :return: platform

src/py2exe_gui/Widgets/center_widget.py

@@ -39,6 +39,11 @@ def __init__(self, parent: QMainWindow) -> None:
 
         super(CenterWidget, self).__init__(parent)
 
+        self.parent_widget = parent
+
+        # 根据运行平台不同，提供的控件也有所区别
+        self.running_platform: PLATFORM = parent.running_platform  # type: ignore
+
         # 待打包的入口脚本
         self.script_path_label = QLabel()
         self.script_file_dlg = ScriptFileDlg()
@@ -56,14 +61,14 @@ def __init__(self, parent: QMainWindow) -> None:
         self.fd_group = QButtonGroup()
 
         # 应用图标（仅 Windows 与 macOS）
-        if self.parent().running_platform in (PLATFORM.windows, PLATFORM.macos):
+        if self.running_platform in (PLATFORM.windows, PLATFORM.macos):
             self.icon_path_label = QLabel()
             self.icon_file_dlg = IconFileDlg()
             self.icon_browse_btn = QPushButton()
             self.icon_path_le = QLineEdit()
 
         # 是否为stdio启用终端（仅 Windows 与 macOS）
-        if self.parent().running_platform in (PLATFORM.windows, PLATFORM.macos):
+        if self.running_platform in (PLATFORM.windows, PLATFORM.macos):
             self.console_checkbox = QCheckBox()
 
         # 预览生成的PyInstaller打包指令
@@ -96,7 +101,7 @@ def setup_ui(self) -> None:
         self.fd_group.addButton(self.one_dir_btn, 0)
         self.fd_group.addButton(self.one_file_btn, 1)
 
-        if self.parent().running_platform in (PLATFORM.windows, PLATFORM.macos):
+        if self.running_platform in (PLATFORM.windows, PLATFORM.macos):
             self.icon_path_label.setText("应用图标：")
             self.icon_path_le.setReadOnly(True)
             self.icon_path_le.setPlaceholderText("图标文件路径")
@@ -142,10 +147,10 @@ def one_fd_selected(btn_id: int) -> None:
 
             if btn_id == 0:
                 self.option_selected.emit((PyinstallerArgs.FD, "One Dir"))
-                self.parent().statusBar().showMessage("将打包至单个目录中")
+                self.parent_widget.statusBar().showMessage("将打包至单个目录中")
             elif btn_id == 1:
                 self.option_selected.emit((PyinstallerArgs.FD, "One File"))
-                self.parent().statusBar().showMessage("将打包至单个文件中")
+                self.parent_widget.statusBar().showMessage("将打包至单个文件中")
 
         @QtCore.Slot(bool)
         def console_selected(console: bool) -> None:
@@ -156,10 +161,10 @@ def console_selected(console: bool) -> None:
 
             if console:
                 self.option_selected.emit((PyinstallerArgs.console, "console"))
-                self.parent().statusBar().showMessage("将为打包程序的 stdio 启用终端")
+                self.parent_widget.statusBar().showMessage("将为打包程序的 stdio 启用终端")
             else:
                 self.option_selected.emit((PyinstallerArgs.console, "windowed"))
-                self.parent().statusBar().showMessage("不会为打包程序的 stdio 启用终端")
+                self.parent_widget.statusBar().showMessage("不会为打包程序的 stdio 启用终端")
 
         @QtCore.Slot(str)
         def icon_file_selected(file_path: str) -> None:
@@ -186,7 +191,7 @@ def run_packaging() -> None:
         self.fd_group.idClicked.connect(one_fd_selected)  # type: ignore
         self.run_packaging_btn.clicked.connect(run_packaging)  # type: ignore
 
-        if self.parent().running_platform in (PLATFORM.windows, PLATFORM.macos):
+        if self.running_platform in (PLATFORM.windows, PLATFORM.macos):
             self.icon_browse_btn.clicked.connect(self.icon_file_dlg.open)  # type: ignore
             self.icon_file_dlg.fileSelected.connect(icon_file_selected)  # type: ignore
             self.console_checkbox.toggled.connect(console_selected)  # type: ignore
@@ -203,18 +208,20 @@ def handle_option_set(self, option: tuple[str, str]) -> None:
         if option_key == PyinstallerArgs.script_path:
             script_path = Path(option_value)
             self.script_path_le.setText(script_path.name)
-            self.parent().statusBar().showMessage(
+            self.parent_widget.statusBar().showMessage(
                 f"打开脚本路径：{str(script_path.resolve())}"
             )
 
         elif option_key == PyinstallerArgs.icon_path:
             icon_path = Path(option_value)
             self.icon_path_le.setText(icon_path.name)
-            self.parent().statusBar().showMessage(f"打开图标路径：{str(icon_path.resolve())}")
+            self.parent_widget.statusBar().showMessage(
+                f"打开图标路径：{str(icon_path.resolve())}"
+            )
 
         elif option_key == PyinstallerArgs.out_name:
             self.project_name_le.setText(option_value)
-            self.parent().statusBar().showMessage(f"已将项目名设置为：{option_value}")
+            self.parent_widget.statusBar().showMessage(f"已将项目名设置为：{option_value}")
 
     @QtCore.Slot(str)
     def handle_option_error(self, option: str) -> None:
@@ -229,32 +236,32 @@ def handle_option_error(self, option: str) -> None:
 
             # 警告对话框
             result = QMessageBox.critical(
-                self.parent(),
+                self.parent_widget,
                 "错误",
                 "选择的不是有效的Python脚本文件，请重新选择！",
-                QMessageBox.Cancel,
-                QMessageBox.Ok,
+                QMessageBox.StandardButton.Cancel,
+                QMessageBox.StandardButton.Ok,
             )
-            if result == QMessageBox.Cancel:
+            if result == QMessageBox.StandardButton.Cancel:
                 self.script_path_le.clear()
                 self.project_name_le.clear()
-            elif result == QMessageBox.Ok:
+            elif result == QMessageBox.StandardButton.Ok:
                 self.script_file_dlg.exec()
 
         elif option == PyinstallerArgs.icon_path:
             self.icon_file_dlg.close()
 
             # 警告对话框
             result = QMessageBox.critical(
-                self.parent(),
+                self.parent_widget,
                 "错误",
                 "选择的不是有效的图标文件，请重新选择！",
-                QMessageBox.Cancel,
-                QMessageBox.Ok,
+                QMessageBox.StandardButton.Cancel,
+                QMessageBox.StandardButton.Ok,
             )
-            if result == QMessageBox.Cancel:
+            if result == QMessageBox.StandardButton.Cancel:
                 self.icon_path_le.clear()
-            elif result == QMessageBox.Ok:
+            elif result == QMessageBox.StandardButton.Ok:
                 self.icon_file_dlg.exec()
 
     @QtCore.Slot(bool)
@@ -293,7 +300,7 @@ def _set_layout(self) -> None:
         main_layout.addLayout(fd_layout)
         main_layout.addSpacing(10)
 
-        if self.parent().running_platform in (PLATFORM.windows, PLATFORM.macos):
+        if self.running_platform in (PLATFORM.windows, PLATFORM.macos):
             main_layout.addWidget(self.console_checkbox)
             main_layout.addSpacing(10)
 

src/py2exe_gui/Widgets/dialog_widgets.py

@@ -17,6 +17,7 @@
     QWidget,
 )
 
+from ..Constants import PLATFORM
 from ..Core.subprocess_tool import SubProcessTool
 
 
@@ -39,14 +40,14 @@ def _setup(self) -> None:
         配置脚本路径对话框 \n
         """
 
-        self.setAcceptMode(QFileDialog.AcceptOpen)
-        self.setViewMode(QFileDialog.Detail)
+        self.setAcceptMode(QFileDialog.AcceptMode.AcceptOpen)
+        self.setViewMode(QFileDialog.ViewMode.Detail)
         self.setNameFilters(("Python脚本文件 (*.py *.pyw)", "所有文件 (*)"))
-        self.setFileMode(QFileDialog.ExistingFiles)
-        self.setLabelText(QFileDialog.FileName, "Python入口文件")
-        self.setLabelText(QFileDialog.FileType, "Python文件")
-        self.setLabelText(QFileDialog.Accept, "打开")
-        self.setLabelText(QFileDialog.Reject, "取消")
+        self.setFileMode(QFileDialog.FileMode.ExistingFiles)
+        self.setLabelText(QFileDialog.DialogLabel.FileName, "Python入口文件")
+        self.setLabelText(QFileDialog.DialogLabel.FileType, "Python文件")
+        self.setLabelText(QFileDialog.DialogLabel.Accept, "打开")
+        self.setLabelText(QFileDialog.DialogLabel.Reject, "取消")
 
 
 class IconFileDlg(QFileDialog):
@@ -68,14 +69,14 @@ def _setup(self) -> None:
         配置应用图标对话框 \n
         """
 
-        self.setAcceptMode(QFileDialog.AcceptOpen)
-        self.setViewMode(QFileDialog.Detail)
+        self.setAcceptMode(QFileDialog.AcceptMode.AcceptOpen)
+        self.setViewMode(QFileDialog.ViewMode.Detail)
         self.setNameFilters(("图标文件 (*.ico *.icns)", "所有文件 (*)"))
-        self.setFileMode(QFileDialog.ExistingFile)
-        self.setLabelText(QFileDialog.FileName, "图标")
-        self.setLabelText(QFileDialog.FileType, "图标文件")
-        self.setLabelText(QFileDialog.Accept, "打开")
-        self.setLabelText(QFileDialog.Reject, "取消")
+        self.setFileMode(QFileDialog.FileMode.ExistingFile)
+        self.setLabelText(QFileDialog.DialogLabel.FileName, "图标")
+        self.setLabelText(QFileDialog.DialogLabel.FileType, "图标文件")
+        self.setLabelText(QFileDialog.DialogLabel.Accept, "打开")
+        self.setLabelText(QFileDialog.DialogLabel.Reject, "取消")
 
 
 class AddDataDlg(QFileDialog):
@@ -121,8 +122,8 @@ def _setup(self) -> None:
         """
 
         self.setWindowTitle("关于")
-        self.setStandardButtons(QMessageBox.Ok)
-        self.setTextFormat(Qt.MarkdownText)
+        self.setStandardButtons(QMessageBox.StandardButton.Ok)
+        self.setTextFormat(Qt.TextFormat.MarkdownText)
         self.setText(self.about_text)
         self.setIconPixmap(QPixmap(":/Icons/Py2exe-GUI_icon_72px"))
 
@@ -133,10 +134,10 @@ def about_text(self) -> str:
         :return: 关于信息
         """
 
-        # 因使用qrc系统，所以使用Qt风格读取文本文件
+        # 因使用qrc/rcc系统，所以使用Qt风格读取文本文件
         about_file = QFile(":/Texts/About_Text")
         about_file.open(QIODevice.ReadOnly | QIODevice.Text)  # type: ignore
-        about_text = bytes(about_file.readAll()).decode("utf-8")
+        about_text = str(about_file.readAll(), encoding="utf-8")  # type: ignore
         about_file.close()
 
         if about_text:
@@ -217,10 +218,10 @@ def handle_multifunction(self) -> None:
             self.close()
         elif btn_text == "打开输出位置":
             dist_path = self.parent().packaging_task.script_path.parent / "dist"
-            if self.parent().running_platform == "Windows":
+            if self.parent().running_platform == PLATFORM.windows:
                 import os  # fmt: skip
                 os.startfile(dist_path)  # type: ignore
-            elif self.parent().running_platform == "Linux":
+            elif self.parent().running_platform == PLATFORM.linux:
                 subprocess.call(["xdg-open", dist_path])
-            elif self.parent().running_platform == "macOS":
+            elif self.parent().running_platform == PLATFORM.macos:
                 subprocess.call(["open", dist_path])