添加 zip.py 文件，包含压缩文件和文件夹的功能；更新 build.py，支持单文件打包选项；修改 config.yml，新增 onefile 配置

Author: God-2077

package/build.py

@@ -5,6 +5,7 @@
 import platform
 import argparse
 from pathlib import Path
+from zip import zip_files_and_folders
 
 def main():
     print("="*50)
@@ -52,6 +53,7 @@ def main():
             dist_path = base_dir / task['distpath']
             requirements = task.get('install-requirements', [])
             use_upx = task.get('upx', False)
+            onefile = task.get('onefile', 0)
             icon = task.get('icon')
             windowed = task.get('windowed', False)
             name = task.get('name')
@@ -87,8 +89,7 @@ def main():
                 '--specpath', str(base_dir / 'build'),
                 '--workpath', str(base_dir / 'build' / 'temp'),
                 '--noconfirm',
-                '--clean',
-                '--onefile'
+                '--clean'
             ]
 
             # 添加窗口模式选项
@@ -112,18 +113,49 @@ def main():
                     print(f"警告: UPX目录不存在 {upx_dir}")
             else:
                 print("不使用UPX压缩")
+            
+            # 添加单文件打包选项
+            if onefile == 0:
+                pass
+            elif onefile == 1:
+                cmd.append('--onefile')
+            elif onefile == 2:
+                cmd.append('--onefile')
+                bcmd = cmd
+
             # 添加主Python文件
             cmd.append(str(python_file))
 
             # 打印并执行命令
             print("执行命令:", ' '.join(cmd))
-            result = subprocess.run(cmd)
+            result1 = subprocess.run(cmd)
+
+            if onefile == 2:
+                cmd.append(str(python_file))
+                result2 = subprocess.run(bcmd)
 
-            if result.returncode == 0:
-                print(f"打包成功: {dist_path / output_name}")
+            if result1.returncode == 0:
+                print(f"(onefile)打包成功: {dist_path / output_name}")
                 success_count += 1
             else:
-                print(f"打包失败，退出码: {result.returncode}")
+                print(f"(onefile)打包失败，退出码: {result1.returncode}")
+                
+            if result2.returncode == 0:
+                print(f"(onedir)打包成功: {dist_path / output_name}")
+                zip_files_and_folders(None, dist_path / output_name, str(dist_path / output_name)+'.zip')
+                success_count += 1
+            else:
+                print(f"(onefdir)打包失败，退出码: {result2.returncode}")
+            
+            if onefile == 0:
+                if result1.returncode == 0:
+                    success_count += 1
+            elif onefile == 1:
+                if result2.returncode == 0:
+                    success_count += 1
+            elif onefile == 2:
+                if result2.returncode == 0 and result1.returncode == 0:
+                    success_count += 1
         except Exception as e:
             print(f"任务[{i}/{len(config)} {task['name']}]失败: {e}")
             task_error_list.append(task['name'])
@@ -135,7 +167,7 @@ def main():
     else:
         print("打包失败，没有成功打包任何任务")
         print(f"失败的任务: {', '.join(task_error_list)}")
-        sys.exit(0)
+        sys.exit(1)
 
 if __name__ == '__main__':
     main()

package/config.yml

@@ -7,6 +7,7 @@
     'ebooklib'
   ]
   upx: true
+  onefile: 2 # 0:文件夹 1:单文件 2:两者
   icon: 
   windowed: False
   distpath: 'dist'
@@ -21,6 +22,7 @@
     'pywin32'
   ]
   upx: true
+  onefile: 1
   icon: 
   windowed: False
   distpath: 'dist'
@@ -36,6 +38,7 @@
     'mutagen'
   ]
   upx: true
+  onefile: 1
   icon: 
   windowed: False
   distpath: 'dist'
@@ -48,6 +51,7 @@
     'pyftpdlib'
   ]
   upx: true
+  onefile: 1
   icon: 
   windowed: False
   distpath: 'dist'
@@ -92,6 +96,7 @@
     'pyftpdlib'
   ]
   upx: true
+  onefile: 1 # 0:文件夹 1:单文件 2:两者
   icon: 
   windowed: False
   distpath: 'dist'

package/zip.py

@@ -0,0 +1,57 @@
+import os
+import zipfile
+
+def add_to_zip(zipf, path, arcname=None):
+    """递归地将文件或文件夹添加到 ZIP 文件中"""
+    if os.path.isfile(path):
+        zipf.write(path, arcname or path)
+    elif os.path.isdir(path):
+        for root, dirs, files in os.walk(path):
+            for file in files:
+                file_path = os.path.join(root, file)
+                # 计算在 ZIP 文件中的相对路径
+                archive_path = os.path.relpath(file_path, os.path.dirname(path))
+                zipf.write(file_path, archive_path)
+
+def zip_files_and_folders(file_path, folder_path, output_zip):
+    """将文件和文件夹压缩到一个 ZIP 文件中"""
+    try:
+        with zipfile.ZipFile(output_zip, 'w', zipfile.ZIP_DEFLATED) as zipf:
+            if not file_path and not folder_path:
+                print("错误: 至少需要提供一个文件或文件夹路径")
+                os.remove(output_zip)
+                return
+            if isinstance(file_path, str):
+                file_path = [file_path]
+            if isinstance(folder_path, str):
+                folder_path = [folder_path]
+            # 添加单个文件
+            if file_path:
+                if isinstance(file_path, list):
+                    for file in file_path:
+                        if os.path.exists(file) and os.path.isfile(file):
+                            add_to_zip(zipf, file)
+                            print(f"add: {file}")
+                        else:
+                            print(f"not found file: {file}")
+
+            # 添加文件夹
+            if folder_path:
+                if isinstance(folder_path, list):
+                    for folder in folder_path:
+                        if os.path.exists(folder) and os.path.isdir(folder):
+                            add_to_zip(zipf, folder)
+                            print(f"add: {folder}")
+                        else:
+                            print(f"not found folder: {folder}")
+        print(f"压缩完成! ZIP 文件已保存为: {output_zip}")
+        return
+    except Exception as e:
+        print(f"压缩过程中发生错误: {e}")
+        return
+if __name__ == "__main__":
+    # usage
+    print('usage:')
+    print("="*42)
+    print("from zip import zip_files_and_folders")
+    print("zip_files_and_folders('file_path', 'folder_path', 'output_zip')")