Update app.py

app.py

@@ -6,7 +6,7 @@ import tempfile
 import shutil
 from datetime import datetime
 
-def process_archives(uploaded_files, position, options, custom_text):
+def process_archives(uploaded_files, position, options, custom_text, pack_mode):
     if not uploaded_files:
         return []
 
@@ -15,6 +15,11 @@ def process_archives(uploaded_files, position, options, custom_text):
     
     current_time_str = datetime.now().strftime("%Y%m%d_%H%M%S")
 
+    # 如果是一鍵打包，建立一個共用的資料夾來存放所有重新命名的檔案
+    if pack_mode == "一鍵打包":
+        master_renamed_dir = os.path.join(temp_dir, "master_renamed")
+        os.makedirs(master_renamed_dir, exist_ok=True)
+
     for file_path in uploaded_files:
         filename = os.path.basename(file_path)
         ext = os.path.splitext(filename)[1].lower()
@@ -24,7 +29,7 @@ def process_archives(uploaded_files, position, options, custom_text):
             continue
 
         archive_basename = os.path.splitext(filename)[0]
-        extract_dir = os.path.join(temp_dir, archive_basename)
+        extract_dir = os.path.join(temp_dir, f"extracted_{archive_basename}")
         os.makedirs(extract_dir, exist_ok=True)
 
         # 根據副檔名選擇解壓縮方式
@@ -39,8 +44,12 @@ def process_archives(uploaded_files, position, options, custom_text):
             print(f"無法讀取壓縮檔 {filename}: {e}")
             continue
 
-        renamed_dir = os.path.join(temp_dir, f"{archive_basename}_renamed")
-        os.makedirs(renamed_dir, exist_ok=True)
+        # 決定重新命名後的檔案要放哪裡
+        if pack_mode == "個別打包":
+            renamed_dir = os.path.join(temp_dir, f"{archive_basename}_renamed")
+            os.makedirs(renamed_dir, exist_ok=True)
+        else:
+            renamed_dir = master_renamed_dir
 
         # 組合要增加的文字
         components = []
@@ -66,27 +75,47 @@ def process_archives(uploaded_files, position, options, custom_text):
                     else: 
                         name, file_ext = os.path.splitext(f)
                         new_filename = f"{name}_{add_str}{file_ext}"
-                        
+                
+                # 防呆機制：避免同名檔案覆蓋 (特別是在一鍵打包時)
                 new_path = os.path.join(renamed_dir, new_filename)
+                if os.path.exists(new_path):
+                    name, file_ext = os.path.splitext(new_filename)
+                    counter = 1
+                    while os.path.exists(os.path.join(renamed_dir, f"{name}_{counter}{file_ext}")):
+                        counter += 1
+                    new_filename = f"{name}_{counter}{file_ext}"
+                    new_path = os.path.join(renamed_dir, new_filename)
+
                 shutil.copy2(old_path, new_path)
 
-        # 將重新命名後的檔案打包成原本的格式
-        output_archive_name = f"processed_{filename}"
-        output_archive_path = os.path.join(temp_dir, output_archive_name)
-        
-        if ext == '.zip':
-            with zipfile.ZipFile(output_archive_path, 'w', zipfile.ZIP_DEFLATED) as out_zip:
-                for root, dirs, files in os.walk(renamed_dir):
-                    for f in files:
-                        file_to_zip = os.path.join(root, f)
-                        out_zip.write(file_to_zip, arcname=f)
-        elif ext == '.7z':
-            with py7zr.SevenZipFile(output_archive_path, 'w') as out_7z:
-                for root, dirs, files in os.walk(renamed_dir):
-                    for f in files:
-                        file_to_7z = os.path.join(root, f)
-                        out_7z.write(file_to_7z, arcname=f)
+        # 如果是個別打包，處理完一個壓縮檔就立刻打包
+        if pack_mode == "個別打包":
+            output_archive_name = f"processed_{filename}"
+            output_archive_path = os.path.join(temp_dir, output_archive_name)
+            
+            if ext == '.zip':
+                with zipfile.ZipFile(output_archive_path, 'w', zipfile.ZIP_DEFLATED) as out_zip:
+                    for root, dirs, files in os.walk(renamed_dir):
+                        for f in files:
+                            file_to_zip = os.path.join(root, f)
+                            out_zip.write(file_to_zip, arcname=f)
+            elif ext == '.7z':
+                with py7zr.SevenZipFile(output_archive_path, 'w') as out_7z:
+                    for root, dirs, files in os.walk(renamed_dir):
+                        for f in files:
+                            file_to_7z = os.path.join(root, f)
+                            out_7z.write(file_to_7z, arcname=f)
+
+            processed_files.append(output_archive_path)
 
+    # 如果是一鍵打包，等全部檔案處理完後，統一打包成一個 ZIP
+    if pack_mode == "一鍵打包":
+        output_archive_path = os.path.join(temp_dir, "all_processed_files.zip")
+        with zipfile.ZipFile(output_archive_path, 'w', zipfile.ZIP_DEFLATED) as out_zip:
+            for root, dirs, files in os.walk(master_renamed_dir):
+                for f in files:
+                    file_to_zip = os.path.join(root, f)
+                    out_zip.write(file_to_zip, arcname=f)
         processed_files.append(output_archive_path)
 
     return processed_files
@@ -94,7 +123,7 @@ def process_archives(uploaded_files, position, options, custom_text):
 # 建立 Gradio 網頁介面
 with gr.Blocks(title="壓縮檔內容批次重新命名工具", theme=gr.themes.Soft()) as demo:
     gr.Markdown("## 📦 壓縮檔內容批次重新命名工具 (支援 ZIP 與 7Z)")
-    gr.Markdown("上傳 `.zip` 或 `.7z` 檔案後，自訂你想增加的文字與位置。系統處理完畢後會提供相同格式的新壓縮檔下載。")
+    gr.Markdown("上傳 `.zip` 或 `.7z` 檔案後，自訂你想增加的文字與位置，並選擇個別下載或是一鍵打包下載。")
     
     with gr.Row():
         with gr.Column(scale=1):
@@ -119,16 +148,23 @@ with gr.Blocks(title="壓縮檔內容批次重新命名工具", theme=gr.themes.
                 info="需在上方勾選「自訂文字」才會生效"
             )
 
+            pack_mode_radio = gr.Radio(
+                choices=["個別打包", "一鍵打包"], 
+                value="個別打包", 
+                label="4. 打包方式", 
+                info="個別打包：維持原本的壓縮檔數量 / 一鍵打包：將所有檔案統合成一個 ZIP 檔"
+            )
+
         with gr.Column(scale=1):
             gr.Markdown("### 📂 檔案上傳與下載")
-            # 更新 file_types，讓介面允許選擇 .7z 檔案
             file_input = gr.File(label="上傳壓縮檔 (可多選 ZIP 或 7Z)", file_count="multiple", type="filepath", file_types=[".zip", ".7z"])
             submit_btn = gr.Button("🚀 開始處理", variant="primary")
             file_output = gr.File(label="下載處理後的新壓縮檔")
 
+    # 綁定按鈕點擊事件，傳入所有設定值
     submit_btn.click(
         fn=process_archives, 
-        inputs=[file_input, position_radio, options_checkbox, custom_text_input], 
+        inputs=[file_input, position_radio, options_checkbox, custom_text_input, pack_mode_radio], 
         outputs=file_output
     )