Update app.py

app.py

@@ -2,9 +2,8 @@ import os, cv2, zipfile, gc, gradio as gr
 import numpy as np
 import fitz  # PyMuPDF
 from PIL import Image
-from io import BytesIO
 
-# 常數設定
+# 參數設定
 OUTPUT_DIR = "output"
 ZIP_PATH = os.path.join(OUTPUT_DIR, "results.zip")
 BG_PATH = "background.jpg"
@@ -12,28 +11,24 @@ TARGET_WIDTH, TARGET_HEIGHT = 2133, 1200
 POS1 = (1032, 0)
 POS2 = (4666, 0)
 
-# 檢查資料夾權限
+# 確保目錄可寫入
 def ensure_dir(path):
     os.makedirs(path, exist_ok=True)
     if not os.access(path, os.W_OK):
-        raise RuntimeError(f"❌ 無法寫入：{path}")
+        raise RuntimeError(f"❌ 無法寫入資料夾：{path}")
 ensure_dir(OUTPUT_DIR)
 
-# PDF 轉圖像（記憶體內處理）
-def pdf_to_images(pdf_file, start_page=None, end_page=None):
-    import numpy as np
+# PDF轉圖片
+def pdf_to_images(file):
     images = []
-    with fitz.open(pdf_file.name) as doc:
-        total_pages = len(doc)
-        start = max(0, (start_page or 1) - 1)
-        end = min(end_page or total_pages, total_pages)
-        for page_num in range(start, end):
-            pix = doc[page_num].get_pixmap(matrix=fitz.Matrix(2, 2), colorspace=fitz.csRGB)
-            img = np.frombuffer(pix.samples, dtype=np.uint8).reshape((pix.height, pix.width, 3))
-            images.append(img)
+    doc = fitz.open(file.name)
+    for page in doc:
+        pix = page.get_pixmap(matrix=fitz.Matrix(2, 2), colorspace=fitz.csRGB)
+        img = np.frombuffer(pix.samples, dtype=np.uint8).reshape(pix.height, pix.width, 3)
+        images.append(img)
     return images
 
-# 圖像合成功能
+# 合成
 def overlay_image(bg, fg_img, x, y):
     fg = cv2.resize(np.array(fg_img), (TARGET_WIDTH, TARGET_HEIGHT), interpolation=cv2.INTER_AREA)
     if fg.shape[2] == 4:
@@ -46,12 +41,12 @@ def overlay_image(bg, fg_img, x, y):
         bg[y:y+TARGET_HEIGHT, x:x+TARGET_WIDTH] = fg
     return bg
 
-# 合成 + 輸出 ZIP
+# 合成與輸出
 def process_and_combine(images, prefix):
     bg = cv2.imread(BG_PATH)
     if bg is None:
-        raise gr.Error("❌ 無法讀取 background.jpg")
-    
+        raise gr.Error("❌ 找不到 background.jpg")
+
     for f in os.listdir(OUTPUT_DIR):
         if f.endswith(".jpg"):
             os.remove(os.path.join(OUTPUT_DIR, f))
@@ -63,48 +58,51 @@ def process_and_combine(images, prefix):
         output_path = os.path.join(OUTPUT_DIR, f"{prefix}{i:03d}.jpg")
         cv2.imwrite(output_path, combined)
         results.append((output_path, f"{prefix}{i:03d}"))
+
         if i % 10 == 0:
             gc.collect()
 
     if not results:
-        raise gr.Error("⚠️ 沒有產生圖片")
+        raise gr.Error("⚠️ 沒有生成圖片")
 
     with zipfile.ZipFile(ZIP_PATH, "w", zipfile.ZIP_DEFLATED) as zipf:
         for f in sorted(os.listdir(OUTPUT_DIR)):
             if f.endswith(".jpg"):
                 zipf.write(os.path.join(OUTPUT_DIR, f), arcname=f)
-    return results, ZIP_PATH, f"✅ 共合成 {len(results)} 張圖，已打包 ZIP"
 
-# 主流程
+    return results, ZIP_PATH, f"✅ 合成完成，共 {len(results)} 張圖片"
+
+# 主函數
 def process_inputs(files, prefix):
     prefix = prefix.strip() or "result_"
     images = []
+
     for file in files:
         name = file.name.lower()
         if name.endswith(".pdf"):
             images.extend(pdf_to_images(file))
-        elif name.endswith((".png", ".jpg", ".jpeg")):
+        elif name.endswith((".jpg", ".jpeg", ".png")):
             img = Image.open(file).convert("RGBA")
             images.append(img)
         else:
             raise gr.Error(f"不支援的檔案格式：{name}")
     return process_and_combine(images, prefix)
 
-# Gradio UI
-with gr.Blocks(title="PDF合成工具") as demo:
-    gr.Markdown("### 📄🖼️ PDF / 圖片雙輸入合成工具（背景固定為 7872x1200）")
-
-    with gr.Row():
-        files = gr.Files(label="📎 上傳 PDF 或圖片", file_types=[".pdf", ".png", ".jpg", ".jpeg"])
-        prefix = gr.Textbox(label="檔名前綴（可選）", placeholder="例如：poster_")
-        run_btn = gr.Button("🚀 開始合成", variant="primary")
-
-    with gr.Row():
-        gallery = gr.Gallery(label="🖼️ 預覽", columns=3, height="auto")
-        zip_file = gr.File(label="⬇️ 下載 ZIP")
-        log = gr.Textbox(label="📄 日誌", interactive=False)
-
-    run_btn.click(fn=process_inputs, inputs=[files, prefix], outputs=[gallery, zip_file, log])
+# Gradio 舊版介面
+iface = gr.Interface(
+    fn=process_inputs,
+    inputs=[
+        gr.inputs.File(label="📎 上傳 PDF 或圖片", type="file", multiple=True),
+        gr.inputs.Textbox(label="檔名前綴（可選）", default="result_"),
+    ],
+    outputs=[
+        gr.outputs.Gallery(label="🖼️ 合成結果"),
+        gr.outputs.File(label="⬇️ 下載 ZIP"),
+        gr.outputs.Textbox(label="📄 處理日誌")
+    ],
+    title="PDF 圖像合成工具",
+    description="📄🖼️ 支援上傳 PDF 或圖像，合成到固定背景圖中"
+)
 
 if __name__ == "__main__":
-    demo.launch()
+    iface.launch()