Merge branch 'dev'

Author: muziing

pyproject.toml

@@ -7,7 +7,8 @@ authors = ["muzing <muzi2001@foxmail.com>"]
 license = "GPL-3.0-or-later"
 readme = "README.md"
 repository = "https://github.com/muziing/Py2exe-GUI"
-include = ["docs/source/images"]
+exclude = ["src/py2exe_gui/Resources"]
+include = ["src/py2exe_gui/Resources/compiled_resources.py"]
 
 [tool.poetry.dependencies]
 python = ">=3.7,<3.11"
@@ -17,15 +18,16 @@ PySide6 = "~6.2.0"  # latest LTS version
 "Bug Tracker" = "https://github.com/muziing/Py2exe-GUI/issues"
 
 [tool.poetry.group.dev.dependencies]
-# Sphinx = "^5.2.0"
+# Sphinx = "^5.3.0"
 black = "^22.10.0"
 isort = "^5.10.0"
 mypy = "^0.991"
 pyinstaller = "^5.6"
 
 [tool.black]
 line-length = 88
-target-version = ['py310']
+target-version = ["py310"]
+extend-exclude = "compiled_resources.py"
 
 [tool.isort]
 profile = "black"

src/py2exe_gui/Constants/__init__.py

@@ -1,3 +1,4 @@
 from .app_constants import *
 from .packaging_constants import *
-# from .type_constants import *
+from .platform_constants import *
+from .type_constants import *

src/py2exe_gui/Constants/platform_constants.py

@@ -0,0 +1,28 @@
+import sys
+
+
+class PLATFORM:
+    """
+    运行平台相关的常量 \n
+    """
+
+    windows = "Windows"
+    linux = "Linux"
+    macos = "macOS"
+    others = "others"
+
+
+def get_platform() -> str:
+    """
+    辅助函数，用于获取当前运行的平台 \n
+    :return: platform
+    """
+
+    if sys.platform.startswith("win32"):
+        return PLATFORM.windows
+    elif sys.platform.startswith("linux"):
+        return PLATFORM.linux
+    elif sys.platform.startswith("darwin"):
+        return PLATFORM.macos
+    else:
+        return PLATFORM.others

src/py2exe_gui/Core/packaging.py

@@ -2,13 +2,13 @@
 
 from PySide6 import QtCore
 
-from ..Constants.packaging_constants import *
+from ..Constants.packaging_constants import PyinstallerArgs, pyinstaller_args_list
 from .subprocess_tool import SubProcessTool
 
 
 class Packaging(QtCore.QObject):
     """
-    执行打包的类
+    执行打包的类 \n
     """
 
     # 自定义信号
@@ -33,9 +33,9 @@ def set_pyinstaller_args(self, arg: tuple[str, str]) -> None:
         """
 
         arg_key, arg_value = arg
-        # if arg_key in pyinstaller_args_list:
-        self.args_dict[arg_key] = arg_value
-        self._add_pyinstaller_args()
+        if arg_key in pyinstaller_args_list:
+            self.args_dict[arg_key] = arg_value
+            self._add_pyinstaller_args()
 
     def _add_pyinstaller_args(self) -> None:
         """
@@ -66,6 +66,5 @@ def run_packaging_process(self) -> None:
         使用给定的参数启动打包子进程 \n
         """
 
-        # self.subprocess.output.connect(lambda val: print(val))  # 测试用
         self.subprocess.set_arguments(self._args)
         self.subprocess.start_process()

src/py2exe_gui/Core/packaging_task.py

@@ -8,7 +8,7 @@
 
 class PackagingTask(QtCore.QObject):
     """
-    打包任务类，存储每个打包任务的详细信息
+    打包任务类，存储每个打包任务的详细信息 \n
     """
 
     # 自定义信号
@@ -26,7 +26,8 @@ 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
-        # TODO 在实例属性中保存该次打包的所有选项详情
+        self.FD: Optional[bool] = None
+        self.console: Optional[str] = None
 
     def handle_option(self, option: tuple[str, str]):
         """
@@ -48,7 +49,6 @@ def handle_option(self, option: tuple[str, str]):
             else:
                 self.ready_to_pack.emit(False)
                 self.option_error.emit(arg_key)
-            # self.option_error.emit(arg_key)  # 测试用！
 
         elif arg_key == "icon_path":
             icon_path = Path(arg_value)
@@ -57,7 +57,6 @@ def handle_option(self, option: tuple[str, str]):
                 self.option_set.emit(option)
             else:
                 self.option_error.emit(arg_key)
-            # self.option_error.emit(arg_key)  # 测试用！
 
         elif arg_key == "out_name":
             self.out_name = arg_value
@@ -66,10 +65,9 @@ def handle_option(self, option: tuple[str, str]):
         else:
             self.option_set.emit(option)
 
-    def write_to_file(self):
+    def write_to_spec(self):
         """
-        将打包任务保存至文件
+        将打包任务保存至spec文件 \n
         """
 
-        # TODO 实现将打包任务信息保存至文件的功能
         pass