Update main.py

main.py

@@ -75,8 +75,7 @@ app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
 class DownloadRequest(BaseModel):
     url: str
     chapter_name: Optional[str] = None
-    merge_images: Optional[bool] = False
-    target_width: Optional[int] = 800
+    merge_images: Optional[bool] = True  # New option to merge images
 
 class DownloadResponse(BaseModel):
     download_id: str
@@ -137,77 +136,95 @@ async def download_image(session, image_url, filepath, referer_url):
         logger.error(f"Error downloading {image_url}: {str(e)}")
         return False
 
-async def merge_images(image_dir, output_path, target_width=800):
-    """Merge semua gambar menjadi satu gambar panjang"""
-    try:
-        logger.info(f"🖼️ Starting image merge with target width: {target_width}px")
-        
-        # Get all image files sorted by name
-        image_files = []
-        for file in sorted(os.listdir(image_dir)):
-            if file.lower().endswith(('.png', '.jpg', '.jpeg', '.webp')):
-                image_files.append(os.path.join(image_dir, file))
-        
-        if not image_files:
-            logger.error("No image files found for merging")
-            return False
-        
-        logger.info(f"Found {len(image_files)} images to merge")
-        
-        # Load all images and calculate total height
-        images = []
-        total_height = 0
-        
-        for img_path in image_files:
-            try:
-                img = Image.open(img_path)
-                # Convert to RGB if necessary
-                if img.mode in ('RGBA', 'LA', 'P'):
-                    img = img.convert('RGB')
+async def merge_images_vertically(image_paths, output_dir, max_height=8000):
+    """
+    Menggabungkan gambar secara vertikal dengan batasan tinggi maksimal.
+    Jika tinggi gabungan melebihi max_height, akan dibuat file terpisah.
+    """
+    if not image_paths:
+        return []
+    
+    merged_files = []
+    current_images = []
+    current_height = 0
+    file_index = 0
+    
+    for image_path in image_paths:
+        try:
+            with Image.open(image_path) as img:
+                img_width, img_height = img.size
                 
-                # Resize to target width while maintaining aspect ratio
-                original_width, original_height = img.size
-                if original_width != target_width:
-                    new_height = int(original_height * target_width / original_width)
-                    img = img.resize((target_width, new_height), Image.Resampling.LANCZOS)
+                # Jika menambahkan gambar ini akan melebihi max_height, save current batch
+                if current_height + img_height > max_height and current_images:
+                    # Save current batch
+                    output_path = output_dir / f"{str(file_index).zfill(3)}.jpg"
+                    await save_merged_image(current_images, output_path)
+                    merged_files.append(output_path)
+                    
+                    # Reset untuk batch baru
+                    current_images = []
+                    current_height = 0
+                    file_index += 1
                 
-                images.append(img)
-                total_height += img.height
-                logger.info(f"Processed image: {os.path.basename(img_path)} - Size: {img.size}")
+                # Tambahkan gambar ke batch current
+                current_images.append(image_path)
+                current_height += img_height
                 
-            except Exception as e:
-                logger.error(f"Error processing image {img_path}: {e}")
-                continue
-        
-        if not images:
-            logger.error("No valid images to merge")
-            return False
-        
-        logger.info(f"Creating merged image: {target_width}x{total_height}px")
-        
-        # Create the merged image
-        merged_image = Image.new('RGB', (target_width, total_height), color='white')
-        
-        # Paste images vertically
-        current_y = 0
-        for i, img in enumerate(images):
-            merged_image.paste(img, (0, current_y))
-            current_y += img.height
-            logger.info(f"Pasted image {i+1}/{len(images)} at position y={current_y-img.height}")
-        
-        # Save the merged image
-        merged_image.save(output_path, 'JPEG', quality=95, optimize=True)
-        logger.info(f"✅ Merged image saved: {output_path}")
-        
-        # Clean up
-        for img in images:
-            img.close()
-        
-        return True
-        
-    except Exception as e:
-        logger.error(f"Error merging images: {e}")
-        return False
+                logger.info(f"Added image {image_path.name} (height: {img_height}) to batch {file_index}")
+                
+        except Exception as e:
+            logger.error(f"Error processing image {image_path}: {e}")
+            continue
+    
+    # Save batch terakhir jika ada
+    if current_images:
+        output_path = output_dir / f"{str(file_index).zfill(3)}.jpg"
+        await save_merged_image(current_images, output_path)
+        merged_files.append(output_path)
+    
+    logger.info(f"Created {len(merged_files)} merged image files")
+    return merged_files
+
+async def save_merged_image(image_paths, output_path):
+    """Save multiple images as one merged vertical image"""
+    if not image_paths:
+        return
+    
+    images = []
+    total_width = 0
+    total_height = 0
+    
+    # Load all images and calculate dimensions
+    for image_path in image_paths:
+        try:
+            img = Image.open(image_path)
+            images.append(img)
+            total_width = max(total_width, img.width)
+            total_height += img.height
+        except Exception as e:
+            logger.error(f"Error loading image {image_path}: {e}")
+            continue
+    
+    if not images:
+        return
+    
+    # Create new image with combined height
+    merged_image = Image.new('RGB', (total_width, total_height), (255, 255, 255))
+    
+    # Paste images vertically
+    y_offset = 0
+    for img in images:
+        # Center horizontally if image is narrower than total_width
+        x_offset = (total_width - img.width) // 2
+        merged_image.paste(img, (x_offset, y_offset))
+        y_offset += img.height
+        img.close()  # Close to free memory
+    
+    # Save merged image
+    merged_image.save(output_path, 'JPEG', quality=95, optimize=True)
+    merged_image.close()
+    
+    logger.info(f"Saved merged image: {output_path} ({total_width}x{total_height})")
 
 async def create_zip_archive(source_dir, zip_path):
     """Create zip archive from directory"""
@@ -218,7 +235,7 @@ async def create_zip_archive(source_dir, zip_path):
                 arcname = os.path.relpath(file_path, source_dir)
                 zipf.write(file_path, arcname)
 
-async def download_webtoon(url: str, download_id: str, chapter_name: str = None, merge_images_flag: bool = False, target_width: int = 800):
+async def download_webtoon(url: str, download_id: str, chapter_name: str = None, merge_images: bool = True):
     """Main function to download webtoon"""
     try:
         download_status[download_id] = {"status": "starting", "progress": 0, "message": "Initializing..."}
@@ -291,7 +308,12 @@ async def download_webtoon(url: str, download_id: str, chapter_name: str = None,
             
             download_status[download_id] = {"status": "running", "progress": 50, "message": f"Downloading {len(image_urls)} images..."}
             
+            # Create temp directory for individual images
+            temp_images_dir = save_dir / "temp_images"
+            temp_images_dir.mkdir(exist_ok=True)
+            
             # Download images
+            downloaded_images = []
             async with aiohttp.ClientSession() as session:
                 for i, image_url in enumerate(image_urls):
                     try:
@@ -300,12 +322,14 @@ async def download_webtoon(url: str, download_id: str, chapter_name: str = None,
                         ext = ext.split("?")[0]  # Remove query parameters
                         
                         filename = f"{str(i).zfill(3)}{ext}"
-                        filepath = save_dir / filename
+                        filepath = temp_images_dir / filename
                         
                         logger.info(f"⬇️ Downloading image {filename}...")
                         success = await download_image(session, image_url, filepath, referer)
                         
-                        if not success:
+                        if success:
+                            downloaded_images.append(filepath)
+                        else:
                             logger.error(f"❌ Failed to download image {filename}")
                         
                         # Update progress
@@ -319,21 +343,37 @@ async def download_webtoon(url: str, download_id: str, chapter_name: str = None,
                     except Exception as e:
                         logger.error(f"❌ Error downloading image {i}: {str(e)}")
             
-            # Merge images if requested
-            if merge_images_flag:
-                download_status[download_id] = {"status": "running", "progress": 85, "message": "Merging images..."}
+            if merge_images and downloaded_images:
+                download_status[download_id] = {"status": "running", "progress": 80, "message": "Merging images..."}
+                logger.info("🔗 Merging images...")
                 
-                merged_filename = f"{chapter_name}_merged.jpg"
-                merged_path = save_dir / merged_filename
+                # Sort images by filename to ensure correct order
+                downloaded_images.sort()
                 
-                success = await merge_images(str(save_dir), str(merged_path), target_width)
+                # Merge images with max height of 8000px
+                merged_files = await merge_images_vertically(downloaded_images, save_dir, max_height=8000)
                 
-                if success:
-                    logger.info("✅ Images merged successfully!")
-                    download_status[download_id] = {"status": "running", "progress": 88, "message": "Images merged successfully!"}
-                else:
-                    logger.error("❌ Failed to merge images")
-                    download_status[download_id] = {"status": "running", "progress": 88, "message": "Warning: Failed to merge images, continuing with individual files..."}
+                # Clean up temp individual images
+                try:
+                    shutil.rmtree(temp_images_dir)
+                except Exception as e:
+                    logger.warning(f"Failed to cleanup temp images: {e}")
+                
+                logger.info(f"✅ Created {len(merged_files)} merged image files")
+            else:
+                # If not merging, move individual images to save_dir
+                for img_path in downloaded_images:
+                    try:
+                        new_path = save_dir / img_path.name
+                        shutil.move(str(img_path), str(new_path))
+                    except Exception as e:
+                        logger.error(f"Error moving image {img_path}: {e}")
+                
+                # Clean up temp directory
+                try:
+                    shutil.rmtree(temp_images_dir)
+                except Exception as e:
+                    logger.warning(f"Failed to cleanup temp directory: {e}")
             
             download_status[download_id] = {"status": "running", "progress": 90, "message": "Creating zip archive..."}
             
@@ -426,7 +466,7 @@ async def index():
                 font-weight: 600;
             }
             
-            input[type="text"], input[type="number"] {
+            input[type="text"] {
                 width: 100%;
                 padding: 15px;
                 border: 2px solid #e1e5e9;
@@ -435,7 +475,7 @@ async def index():
                 transition: border-color 0.3s ease;
             }
             
-            input[type="text"]:focus, input[type="number"]:focus {
+            input[type="text"]:focus {
                 outline: none;
                 border-color: #667eea;
             }
@@ -444,24 +484,18 @@ async def index():
                 display: flex;
                 align-items: center;
                 gap: 10px;
-                margin-bottom: 10px;
+                margin-top: 10px;
             }
             
             .checkbox-group input[type="checkbox"] {
                 width: 20px;
                 height: 20px;
-                accent-color: #667eea;
             }
             
             .checkbox-group label {
-                margin-bottom: 0;
-                font-weight: 500;
-                cursor: pointer;
-            }
-            
-            .width-input {
-                margin-top: 10px;
-                display: none;
+                margin: 0;
+                font-weight: normal;
+                color: #666;
             }
             
             .btn {
@@ -546,13 +580,14 @@ async def index():
                 display: none;
             }
             
-            .info {
-                background: #d1ecf1;
-                color: #0c5460;
-                padding: 10px;
-                border-radius: 5px;
+            .info-box {
+                background: #e7f3ff;
+                border: 1px solid #b3d9ff;
+                border-radius: 8px;
+                padding: 15px;
+                margin-bottom: 20px;
                 font-size: 14px;
-                margin-top: 10px;
+                color: #0066cc;
             }
         </style>
     </head>
@@ -563,6 +598,10 @@ async def index():
                 <p>Download webtoon images as ZIP archive - Free Only Chapter</p>
             </div>
             
+            <div class="info-box">
+                <strong>New Feature:</strong> Images will be merged vertically with max height of 8000px per file. Large chapters will be split into multiple files (000.jpg, 001.jpg, etc.)
+            </div>
+            
             <form id="downloadForm">
                 <div class="form-group">
                     <label for="url">Webtoon URL:</label>
@@ -576,17 +615,8 @@ async def index():
                 
                 <div class="form-group">
                     <div class="checkbox-group">
-                        <input type="checkbox" id="merge_images" name="merge_images">
-                        <label for="merge_images">Merge all images into one long image</label>
-                    </div>
-                    
-                    <div class="width-input" id="widthInput">
-                        <label for="target_width">Target Width (pixels):</label>
-                        <input type="number" id="target_width" name="target_width" value="800" min="300" max="2000" step="50">
-                    </div>
-                    
-                    <div class="info">
-                        <strong>Merge Option:</strong> When enabled, all images will be combined into one long vertical image with the specified width. Individual images will still be included in the ZIP file.
+                        <input type="checkbox" id="merge_images" name="merge_images" checked>
+                        <label for="merge_images">Merge images vertically (recommended)</label>
                     </div>
                 </div>
                 
@@ -616,13 +646,6 @@ async def index():
             const downloadUrl = document.getElementById('downloadUrl');
             const errorMessage = document.getElementById('errorMessage');
             const downloadBtn = document.getElementById('downloadBtn');
-            const mergeCheckbox = document.getElementById('merge_images');
-            const widthInput = document.getElementById('widthInput');
-            
-            // Show/hide width input based on merge checkbox
-            mergeCheckbox.addEventListener('change', function() {
-                widthInput.style.display = this.checked ? 'block' : 'none';
-            });
             
             form.addEventListener('submit', async (e) => {
                 e.preventDefault();
@@ -630,8 +653,7 @@ async def index():
                 const formData = new FormData(form);
                 const url = formData.get('url');
                 const chapterName = formData.get('chapter_name');
-                const mergeImages = formData.get('merge_images') === 'on';
-                const targetWidth = parseInt(formData.get('target_width')) || 800;
+                const mergeImages = document.getElementById('merge_images').checked;
                 
                 if (!url) {
                     showError('Please enter a valid URL');
@@ -655,8 +677,7 @@ async def index():
                         body: JSON.stringify({
                             url: url,
                             chapter_name: chapterName || null,
-                            merge_images: mergeImages,
-                            target_width: targetWidth
+                            merge_images: mergeImages
                         })
                     });
                     
@@ -735,8 +756,7 @@ async def start_download(request: DownloadRequest, background_tasks: BackgroundT
         request.url, 
         download_id, 
         request.chapter_name,
-        request.merge_images,
-        request.target_width
+        request.merge_images
     )
     
     return DownloadResponse(