Update app.py

app.py

@@ -6,16 +6,11 @@ import subprocess
 
 allowed_medias = [".png", ".jpg", ".jpeg", ".bmp", ".gif", ".tiff"]
 
-def generate_slideshow_with_fixed_text_and_padding(images, duration, texts=None, y_pos=0.5, fade_duration=0.7, font_size=60):
-    """
-    Slideshow:
-    - Bilder behalten ihre Proportionen, schwarze Balken falls nötig
-    - Text Overlay mit Y-Position, Fade-In/Out und fester Größe
-    """
+def generate_slideshow(images, duration, texts=None, y_pos=0.5, fade_duration=0.7, font_size=60):
     if not images:
         return None, "❌ Keine Bilder ausgewählt"
 
-    y_pos = min(max(0.0, y_pos), 0.9)  # Max 0.9 für unten
+    y_pos = min(max(0.0, y_pos), 0.9)
     temp_dir = tempfile.mkdtemp()
     clips = []
 
@@ -28,33 +23,37 @@ def generate_slideshow_with_fixed_text_and_padding(images, duration, texts=None,
 
         drawtext = ""
         if text:
+            safe_text = text.replace(":", "\\:").replace("'", "\\'")
             drawtext = (
-                f"drawtext=text='{text}':fontcolor=white:fontsize={font_size}:borderw=2:"
+                f",drawtext=text='{safe_text}':fontcolor=white:fontsize={font_size}:borderw=2:"
                 f"x=(w-text_w)/2:y=(h-text_h)*{y_pos}:"
                 f"alpha='if(lt(t,{fade_duration}), t/{fade_duration}, if(lt(t,{duration}-{fade_duration}), 1, ({duration}-t)/{fade_duration}))'"
             )
 
-        # FFmpeg scale + pad für schwarzen Rand
+        # scale + pad für schwarze Ränder, Bild bleibt proportional
+        vf = f"scale='min(1280,iw)':-2,pad=1280:720:(1280-iw)/2:(720-ih)/2:color=black,fps=25,format=yuv420p{drawtext}"
+
         cmd = [
             "ffmpeg",
             "-y",
             "-loop", "1",
             "-i", str(img_path),
             "-t", str(duration),
-            "-vf",
-            f"scale='min(1280,iw)':-2,pad=1280:720:(1280-iw)/2:(720-ih)/2:color=black,fps=25,format=yuv420p{','+drawtext if drawtext else ''}",
+            "-vf", vf,
             str(clip_path)
         ]
-        subprocess.run(cmd, check=True)
+        try:
+            subprocess.run(cmd, check=True)
+        except subprocess.CalledProcessError as e:
+            return None, f"❌ FFmpeg Fehler:\n{e.stderr}"
+
         clips.append(clip_path)
 
-    # Filelist für concat
     filelist_path = Path(temp_dir) / "filelist.txt"
     with open(filelist_path, "w") as f:
         for clip in clips:
             f.write(f"file '{clip}'\n")
 
-    # Clips zusammenfügen
     output_file = Path(temp_dir) / f"slideshow_{uuid.uuid4().hex}.mp4"
     cmd_concat = [
         "ffmpeg",
@@ -66,17 +65,19 @@ def generate_slideshow_with_fixed_text_and_padding(images, duration, texts=None,
         "-pix_fmt", "yuv420p",
         str(output_file)
     ]
-    subprocess.run(cmd_concat, check=True)
+    try:
+        subprocess.run(cmd_concat, check=True)
+    except subprocess.CalledProcessError as e:
+        return None, f"❌ FFmpeg Concat Fehler:\n{e.stderr}"
 
     if output_file.exists():
         return str(output_file), f"✅ Slideshow erstellt ({len(images)} Bilder, Text fixiert, Bildproportionen erhalten)"
     else:
         return None, "❌ Video konnte nicht erstellt werden"
 
-
 # Gradio UI
 with gr.Blocks() as demo:
-    gr.Markdown("# Slideshow mit Text-Overlay & schwarzem Rand")
+    gr.Markdown("# Slideshow mit fixiertem Text-Overlay & schwarzen Rändern")
 
     img_input = gr.Files(label="Bilder auswählen (mehrere)", file_types=allowed_medias)
     duration_input = gr.Number(value=3, label="Dauer pro Bild in Sekunden", precision=1)
@@ -89,7 +90,7 @@ with gr.Blocks() as demo:
 
     def wrapper(images, duration, fade_duration, text_str, y_pos, font_size):
         texts = [t.strip() for t in text_str.split(",")] if text_str else None
-        return generate_slideshow_with_fixed_text_and_padding(images, duration, texts, y_pos, fade_duration, font_size)
+        return generate_slideshow(images, duration, texts, y_pos, fade_duration, font_size)
 
     btn = gr.Button("Video erstellen")
     btn.click(