Upload app.py

app.py

@@ -11,30 +11,22 @@ def resize_images_to_match(images, resize_mode="height"):
     if not images or len(images) == 0:
         return []
     
-    # 過濾掉None值
     valid_images = [img for img in images if img is not None]
     if not valid_images:
         return []
     
     if resize_mode == "height":
-        # 找到最小高度，保持寬高比調整
         target_height = min(img.size[1] for img in valid_images)
         resized_images = []
-        
         for img in valid_images:
-            # 計算新寬度以保持寬高比
             aspect_ratio = img.size[0] / img.size[1]
             new_width = int(target_height * aspect_ratio)
             resized_img = img.resize((new_width, target_height), Image.Resampling.LANCZOS)
             resized_images.append(resized_img)
-            
     else:  # width mode
-        # 找到最小寬度，保持寬高比調整
         target_width = min(img.size[0] for img in valid_images)
         resized_images = []
-        
         for img in valid_images:
-            # 計算新高度以保持寬高比
             aspect_ratio = img.size[1] / img.size[0]
             new_height = int(target_width * aspect_ratio)
             resized_img = img.resize((target_width, new_height), Image.Resampling.LANCZOS)
@@ -52,16 +44,13 @@ def concatenate_images(images, direction="horizontal", spacing=0, background_col
     if not images or len(images) == 0:
         return None
     
-    # 過濾掉None值
     valid_images = [img for img in images if img is not None]
     if not valid_images:
         return None
     
-    # 確保所有圖片都轉換為RGB模式（去除透明通道）
     rgb_images = []
     for img in valid_images:
         if img.mode != 'RGB':
-            # 如果有透明通道，先貼到白色背景上
             if img.mode in ('RGBA', 'LA'):
                 background = Image.new('RGB', img.size, 'white')
                 background.paste(img, mask=img.split()[-1] if img.mode == 'RGBA' else None)
@@ -75,31 +64,20 @@ def concatenate_images(images, direction="horizontal", spacing=0, background_col
         return rgb_images[0]
     
     if direction == "horizontal":
-        # 水平拼接
         total_width = sum(img.size[0] for img in rgb_images) + spacing * (len(rgb_images) - 1)
         max_height = max(img.size[1] for img in rgb_images)
-        
-        # 創建新圖片 - 確保為RGB模式
         result = Image.new('RGB', (total_width, max_height), background_color)
-        
         x_offset = 0
         for img in rgb_images:
-            # 垂直居中放置
             y_offset = (max_height - img.size[1]) // 2
             result.paste(img, (x_offset, y_offset))
             x_offset += img.size[0] + spacing
-            
-    else:  # vertical
-        # 垂直拼接
+    else:
         max_width = max(img.size[0] for img in rgb_images)
         total_height = sum(img.size[1] for img in rgb_images) + spacing * (len(rgb_images) - 1)
-        
-        # 創建新圖片 - 確保為RGB模式
         result = Image.new('RGB', (max_width, total_height), background_color)
-        
         y_offset = 0
         for img in rgb_images:
-            # 水平居中放置
             x_offset = (max_width - img.size[0]) // 2
             result.paste(img, (x_offset, y_offset))
             y_offset += img.size[1] + spacing
@@ -113,33 +91,27 @@ def save_as_jpg(image, quality=95):
     if image is None:
         return None
     
-    # 確保圖片為RGB模式
     if image.mode != 'RGB':
         if image.mode in ('RGBA', 'LA'):
-            # 有透明通道的圖片，貼到白色背景上
             background = Image.new('RGB', image.size, 'white')
-            if image.mode == 'RGBA':
-                background.paste(image, mask=image.split()[-1])
-            else:
-                background.paste(image, mask=image.split()[-1])
+            background.paste(image, mask=image.split()[-1])
             image = background
         else:
             image = image.convert('RGB')
     
-    # 保存到bytes buffer
     buffer = io.BytesIO()
     image.save(buffer, format='JPEG', quality=quality, optimize=True)
     buffer.seek(0)
-    
-    # 重新加載為PIL圖片
     return Image.open(buffer)
+
+def process_images(
+    image1, image2, image3, image4, image5, image6,
+    resize_mode, concat_direction, spacing, bg_color, jpg_quality
+):
     """
     處理圖片拼接的主函數
     """
-    # 收集所有上傳的圖片
     uploaded_images = [image1, image2, image3, image4, image5, image6]
-    
-    # 過濾掉None值
     valid_images = [img for img in uploaded_images if img is not None]
     
     if len(valid_images) == 0:
@@ -149,37 +121,34 @@ def save_as_jpg(image, quality=95):
         return valid_images[0], f"✅ 只有一張圖片，無需拼接"
     
     try:
-        # 調整圖片尺寸
         if resize_mode == "等高度 (水平拼接)":
             resized_images = resize_images_to_match(valid_images, "height")
             direction = "horizontal"
-        else:  # 等寬度 (垂直拼��)
+        else:
             resized_images = resize_images_to_match(valid_images, "width")
             direction = "vertical"
         
-        # 如果用戶選擇了不同的拼接方向，使用用戶選擇
         if concat_direction != "自動 (根據調整模式)":
             direction = "horizontal" if concat_direction == "水平拼接" else "vertical"
         
-        # 拼接圖片
         result = concatenate_images(resized_images, direction, spacing, bg_color)
-        
         if result is None:
-            return None, "❌ 拼接失败"
+            return None, "❌ 拼接失敗"
+        
+        result = save_as_jpg(result, quality=jpg_quality)
         
-        # 返回結果和統計信息
         info = f"✅ 成功拼接 {len(valid_images)} 張圖片\n"
         info += f"📐 最終尺寸: {result.size[0]} x {result.size[1]} 像素\n"
         info += f"🔄 調整模式: {resize_mode}\n"
         info += f"➡️ 拼接方向: {'水平' if direction == 'horizontal' else '垂直'}\n"
-        info += f"📏 間距: {spacing} 像素"
+        info += f"📏 間距: {spacing} 像素\n"
+        info += f"💾 輸出品質: {jpg_quality}%"
         
         return result, info
         
     except Exception as e:
         return None, f"❌ 處理過程中出現錯誤: {str(e)}"
 
-# 創建Gradio界面
 def create_interface():
     with gr.Blocks(title="圖片拼接比較工具", theme=gr.themes.Soft()) as iface:
         gr.Markdown("""
@@ -197,71 +166,45 @@ def create_interface():
         with gr.Row():
             with gr.Column(scale=2):
                 gr.Markdown("### 📁 上傳圖片")
-                
-                # 圖片上傳組件
                 with gr.Row():
                     image1 = gr.Image(type="pil", label="圖片 1")
                     image2 = gr.Image(type="pil", label="圖片 2")
                     image3 = gr.Image(type="pil", label="圖片 3")
-                
                 with gr.Row():
                     image4 = gr.Image(type="pil", label="圖片 4")
                     image5 = gr.Image(type="pil", label="圖片 5")
                     image6 = gr.Image(type="pil", label="圖片 6")
                 
                 gr.Markdown("### ⚙️ 處理設定")
-                
                 with gr.Row():
                     resize_mode = gr.Dropdown(
                         choices=["等高度 (水平拼接)", "等寬度 (垂直拼接)"],
                         value="等高度 (水平拼接)",
                         label="尺寸調整模式"
                     )
-                    
                     concat_direction = gr.Dropdown(
                         choices=["自動 (根據調整模式)", "水平拼接", "垂直拼接"],
                         value="自動 (根據調整模式)",
                         label="拼接方向"
                     )
-                
                 with gr.Row():
-                    spacing = gr.Slider(
-                        minimum=0, 
-                        maximum=50, 
-                        value=2, 
-                        step=1,
-                        label="圖片間距 (像素)"
-                    )
-                    
+                    spacing = gr.Slider(0, 50, value=2, step=1, label="圖片間距 (像素)")
                     bg_color = gr.Dropdown(
                         choices=["white", "black", "gray"],
                         value="white",
                         label="背景顏色"
                     )
-                
-                # JPG品質設定
-                jpg_quality = gr.Slider(
-                    minimum=60,
-                    maximum=100,
-                    value=95,
-                    step=5,
-                    label="JPG 輸出品質 (%)"
-                )
-                
+                jpg_quality = gr.Slider(60, 100, value=95, step=5, label="JPG 輸出品質 (%)")
                 process_btn = gr.Button("🚀 開始處理", variant="primary", size="lg")
-                
             with gr.Column(scale=2):
                 gr.Markdown("### 🎯 處理結果")
                 result_image = gr.Image(type="pil", label="拼接結果")
                 result_info = gr.Textbox(label="處理信息", lines=6, max_lines=10)
         
-        # 綁定處理函數
         process_btn.click(
             fn=process_images,
-            inputs=[
-                image1, image2, image3, image4, image5, image6,
-                resize_mode, concat_direction, spacing, bg_color, jpg_quality
-            ],
+            inputs=[image1, image2, image3, image4, image5, image6,
+                    resize_mode, concat_direction, spacing, bg_color, jpg_quality],
             outputs=[result_image, result_info]
         )
         
@@ -271,18 +214,12 @@ def create_interface():
         - **等寬度模式**：所有圖片調整為相同寬度，適合垂直對比  
         - 支持常見圖片格式：PNG, JPG, JPEG, WEBP
         - 處理過程保持圖片原始寬高比
-        - **輸出格式：JPG** - ���美兼容 Medium 等平台
+        - **輸出格式：JPG**
         - **品質建議**：95% 提供最佳品質，85% 平衡品質與檔案大小
         - 自動處理透明背景（轉為白色背景）
         """)
-    
     return iface
 
-# 啟動應用
 if __name__ == "__main__":
     app = create_interface()
-    app.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        share=True
-    )
+    app.launch(server_name="0.0.0.0", server_port=7860, share=True)