Update app.py

app.py

@@ -179,7 +179,6 @@ def download_image(url, save_path):
     # Fail
     log_failure(url, "All methods failed")
     return None
-
 lamp_html = """
 <style>
   * {
@@ -345,103 +344,68 @@ def threaded_download_and_open(item, temp_dir):
 def resize_and_save_worker(args):
     name, img, fmt, w, h, out_dir = args
     try:
-        # 1) Composite RGBA over white
         img = img.convert('RGBA')
-        bg  = Image.new('RGBA', img.size, (255,255,255,255))
+        bg = Image.new('RGBA', img.size, (255,255,255,255))
         img = Image.alpha_composite(bg, img)
-
-        # 2) Determine save format & extension
-        fmt_upper = fmt.upper()
-        save_fmt  = "JPEG" if fmt_upper in ("JPEG", "JPG") else fmt_upper
-        ext       = "jpg"  if fmt_upper in ("JPEG", "JPG") else fmt.lower()
-
-        # 3) Convert to RGB if needed
-        if save_fmt == "JPEG":
-            img = img.convert("RGB")
-
-        # 4) Resize with padding
+        if fmt.upper() == 'JPEG':
+            img = img.convert('RGB')
         img = resize_with_padding(img, w, h)
-
-        # 5) Build filename & save
-        out_name = f"{name}.{ext}"
+        out_name = f"{name}.{fmt.lower()}"
         out_path = os.path.join(out_dir, out_name)
-        img.save(out_path, format=save_fmt, quality=90)
-
+        img.save(out_path, format=fmt.upper(), quality=90)
         return out_path, None
-
     except Exception as e:
         return None, f"{name}: {e}"
 
-from multiprocessing import cpu_count
-import zipfile
-
 def process_and_zip(items, fmt, w, h):
-    tmp  = tempfile.mkdtemp()
+    tmp = tempfile.mkdtemp()
     proc = os.path.join(tmp, 'out')
     os.makedirs(proc, exist_ok=True)
-
     files, fails = [], []
-    # 1) Download & open in parallel
-    workers = cpu_count() * 2
-    with ThreadPoolExecutor(max_workers=workers) as ex:
+
+    with ThreadPoolExecutor(max_workers=8) as ex:
         results = list(ex.map(lambda it: threaded_download_and_open(it, tmp), items))
 
-    # 2) Process each downloaded image/list of frames
     for name, imgs, err in results:
-        if err or not imgs:
+        if stop_event.is_set():
+            print("🛑 Stopped before processing.")
+            break
+
+        if err or imgs is None:
             fails.append(f"{name}: {err}")
             continue
 
         for i, img in enumerate(imgs):
             try:
-                # Composite RGBA over white
-                img = img.convert("RGBA")
-                bg  = Image.new("RGBA", img.size, (255,255,255,255))
+                img = img.convert('RGBA')
+                bg = Image.new('RGBA', img.size, (255, 255, 255, 255))
                 img = Image.alpha_composite(bg, img)
 
-                # Determine save format & extension
-                fmt_upper = fmt.upper()
-                save_fmt  = "JPEG" if fmt_upper in ("JPEG","JPG") else fmt_upper
-                ext       = "jpg"  if fmt_upper in ("JPEG","JPG") else fmt.lower()
+                if fmt.upper() == 'JPG':
+                    img = img.convert('RGB')
 
-                # Convert to RGB if JPEG
-                if save_fmt == "JPEG":
-                    img = img.convert("RGB")
-
-                # Resize with padding
                 img = resize_with_padding(img, w, h)
 
-                # Build filename
-                fname = (
-                    f"{name}_frame{i+1}.{ext}"
-                    if len(imgs) > 1
-                    else f"{name}.{ext}"
-                )
-                out_path = os.path.join(proc, fname)
-
-                # Save & record
-                img.save(out_path, format=save_fmt, quality=90)
-                files.append(out_path)
-
+                fname = f"{name}_frame{i+1}.{fmt.lower()}" if len(imgs) > 1 else f"{name}.{fmt.lower()}"
+                path = os.path.join(proc, fname)
+                img.save(path, format=fmt.upper(), quality=90)
+                files.append(path)
             except Exception as e:
-                print(f"⚠️ Save failed for {name}: {e}")
                 fails.append(f"{name}_frame{i+1}: {e}")
 
-    # 3) If nothing succeeded, clean up and report
     if not files:
         stop_event.clear()
         shutil.rmtree(tmp)
         return None, None, "No images processed.", None
 
-    # 4) Create ZIP in “store” mode (no compression)
     date_str = datetime.now().strftime("%Y-%m-%d")
     zip_name = f"{date_str}.zip"
     zip_path = os.path.join(tmp, zip_name)
-    with zipfile.ZipFile(zip_path, 'w', compression=zipfile.ZIP_STORED) as zf:
+
+    with zipfile.ZipFile(zip_path, 'w') as zf:
         for f in files:
             zf.write(f, os.path.basename(f))
 
-    # 5) Build status message
     msg_lines = [f"✅ Processed {len(files)} image(s)."]
     if fails:
         msg_lines.append(f"❌ Failed: {len(fails)} image(s)")
@@ -774,6 +738,4 @@ with gr.Blocks(css=css) as demo:
     )
 
 if __name__ == "__main__":
-    demo.queue().launch(debug=True)
-
-
+    demo.queue().launch(debug=True)