diff --git a/src/py2exe_gui/Core/packaging.py b/src/py2exe_gui/Core/packaging.py index 7ddf5ae..fe4973b 100644 --- a/src/py2exe_gui/Core/packaging.py +++ b/src/py2exe_gui/Core/packaging.py @@ -2,13 +2,13 @@ from typing import List, Optional 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 @@ class Packaging(QtCore.QObject): """ 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 @@ class Packaging(QtCore.QObject): 使用给定的参数启动打包子进程 \n """ - # self.subprocess.output.connect(lambda val: print(val)) # 测试用 self.subprocess.set_arguments(self._args) self.subprocess.start_process() diff --git a/src/py2exe_gui/Core/packaging_task.py b/src/py2exe_gui/Core/packaging_task.py index 34cf6d3..470d276 100644 --- a/src/py2exe_gui/Core/packaging_task.py +++ b/src/py2exe_gui/Core/packaging_task.py @@ -8,7 +8,7 @@ from .validators import FilePathValidator class PackagingTask(QtCore.QObject): """ - 打包任务类,存储每个打包任务的详细信息 + 打包任务类,存储每个打包任务的详细信息 \n """ # 自定义信号 @@ -26,7 +26,8 @@ class PackagingTask(QtCore.QObject): 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 @@ class PackagingTask(QtCore.QObject): 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 @@ class PackagingTask(QtCore.QObject): 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 @@ class PackagingTask(QtCore.QObject): else: self.option_set.emit(option) - def write_to_file(self): + def write_to_spec(self): """ - 将打包任务保存至文件 + 将打包任务保存至spec文件 \n """ - # TODO 实现将打包任务信息保存至文件的功能 pass