Optimize PyinstallerArgs class with enum

使用枚举类型存储打包选项；

Author: muziing

src/py2exe_gui/Constants/packaging_constants.py

@@ -5,20 +5,13 @@
 打包相关的常量
 """
 
-# TODO 优化打包选项列表的数据结构
+import enum
 
-pyinstaller_args_list: list = [
-    "script_path",
-    "icon_path",
-    "FD",
-    "console",
-    "out_name",
-]
 
-
-class PyinstallerArgs:
-    script_path = "script_path"
-    icon_path = "icon_path"
-    FD = "FD"
-    console = "console"
-    out_name = "out_name"
+@enum.unique
+class PyinstallerArgs(enum.IntFlag):
+    script_path = enum.auto()
+    icon_path = enum.auto()
+    FD = enum.auto()
+    console = enum.auto()
+    out_name = enum.auto()

src/py2exe_gui/Core/packaging.py

@@ -6,7 +6,7 @@
 
 from PySide6 import QtCore
 
-from ..Constants.packaging_constants import PyinstallerArgs, pyinstaller_args_list
+from ..Constants.packaging_constants import PyinstallerArgs
 from .subprocess_tool import SubProcessTool
 
 
@@ -26,20 +26,20 @@ def __init__(self, parent: Optional[QtCore.QObject] = None) -> None:
 
         super(Packaging, self).__init__(parent)
 
-        self.args_dict: dict = dict.fromkeys(pyinstaller_args_list, "")
+        self.args_dict: dict = dict.fromkeys(PyinstallerArgs, "")
         self._args: List[str] = []
         self._subprocess_working_dir: str = ""
         self.subprocess: SubProcessTool = SubProcessTool(self, program="pyinstaller")
 
     @QtCore.Slot(tuple)
-    def set_pyinstaller_args(self, arg: tuple[str, str]) -> None:
+    def set_pyinstaller_args(self, arg: tuple[PyinstallerArgs, str]) -> None:
         """
         解析传递来的PyInstaller运行参数，并添加至命令参数字典 \n
         :param arg: 运行参数
         """
 
         arg_key, arg_value = arg
-        if arg_key in pyinstaller_args_list:
+        if type(arg_key) == PyinstallerArgs:
             self.args_dict[arg_key] = arg_value
             self._add_pyinstaller_args()
             self._set_subprocess_working_dir()

src/py2exe_gui/Core/packaging_task.py

@@ -6,6 +6,7 @@
 
 from PySide6 import QtCore
 
+from ..Constants import PyinstallerArgs
 from .validators import FilePathValidator
 
 
@@ -32,7 +33,7 @@ def __init__(self, parent: Optional[QtCore.QObject] = None) -> None:
         self.FD: Optional[bool] = None
         self.console: Optional[str] = None
 
-    def handle_option(self, option: tuple[str, str]):
+    def handle_option(self, option: tuple[PyinstallerArgs, str]):
         """
         处理用户在界面选择的打包选项，进行有效性验证并保存 \n
         :param option: 选项
@@ -41,27 +42,27 @@ def handle_option(self, option: tuple[str, str]):
         arg_key, arg_value = option
 
         # 进行有效性验证，有效则保存并发射option_set信号，无效则发射option_error信号
-        if arg_key == "script_path":
+        if arg_key == PyinstallerArgs.script_path:
             script_path = Path(arg_value)
             if FilePathValidator.validate_script(script_path):
                 self.script_path = script_path
                 self.ready_to_pack.emit(True)
                 self.option_set.emit(option)
                 self.out_name = script_path.stem  # 输出名默认与脚本名相同
-                self.option_set.emit(("out_name", self.out_name))
+                self.option_set.emit((PyinstallerArgs.out_name, self.out_name))
             else:
                 self.ready_to_pack.emit(False)
                 self.option_error.emit(arg_key)
 
-        elif arg_key == "icon_path":
+        elif arg_key == PyinstallerArgs.icon_path:
             icon_path = Path(arg_value)
             if FilePathValidator.validate_icon(icon_path):
                 self.icon_path = icon_path
                 self.option_set.emit(option)
             else:
                 self.option_error.emit(arg_key)
 
-        elif arg_key == "out_name":
+        elif arg_key == PyinstallerArgs.out_name:
             self.out_name = arg_value
             self.option_set.emit(option)