Update app.py

app.py

@@ -358,54 +358,72 @@ def resize_and_save_worker(args):
         return None, f"{name}: {e}"
 
 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 = [], []
 
+    files, fails = [], []
+    # Download + open all images
     with ThreadPoolExecutor(max_workers=8) as ex:
         results = list(ex.map(lambda it: threaded_download_and_open(it, tmp), items))
 
+    # For each downloaded item, process its frames
     for name, imgs, err in results:
-        if stop_event.is_set():
-            print("🛑 Stopped before processing.")
-            break
-
-        if err or imgs is None:
+        if err or not imgs:
             fails.append(f"{name}: {err}")
-            continue
+            continue  # skip to next item
 
+        # imgs is a list of frames (even if just one)
         for i, img in enumerate(imgs):
             try:
-                img = img.convert('RGBA')
-                bg = Image.new('RGBA', img.size, (255, 255, 255, 255))
+                # 1) Composite RGBA over white
+                img = img.convert("RGBA")
+                bg  = Image.new("RGBA", img.size, (255,255,255,255))
                 img = Image.alpha_composite(bg, img)
 
-                if fmt.upper() == 'JPG':
-                    img = img.convert('RGB')
+                # 2) Decide 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 JPEG
+                if save_fmt == "JPEG":
+                    img = img.convert("RGB")
 
+                # 4) Resize with padding
                 img = resize_with_padding(img, w, h)
 
-                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)
+                # 5) Build filename
+                fname = (
+                    f"{name}_frame{i+1}.{ext}"
+                    if len(imgs) > 1
+                    else f"{name}.{ext}"
+                )
+                out_path = os.path.join(proc, fname)
+
+                # 6) Save & record
+                img.save(out_path, format=save_fmt, quality=90)
+                files.append(out_path)
+
             except Exception as e:
+                print(f"⚠️ Save failed for {name}: {e}")
                 fails.append(f"{name}_frame{i+1}: {e}")
 
+    # If nothing made it through, clean up & report
     if not files:
         stop_event.clear()
         shutil.rmtree(tmp)
         return None, None, "No images processed.", None
 
+    # Otherwise, zip up
     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') as zf:
         for f in files:
             zf.write(f, os.path.basename(f))
 
+    # Build status message
     msg_lines = [f"✅ Processed {len(files)} image(s)."]
     if fails:
         msg_lines.append(f"❌ Failed: {len(fails)} image(s)")