Update app.py

app.py

@@ -22,11 +22,11 @@ def slugify(text):
     return text.strip("_")
 
 def get_next_file(base_name):
-    """Auto-increment file names: journal_001.mp4, 002, etc."""
+    """Increment file names: journal_001.mp4, 002, etc."""
     existing = glob.glob(f"{base_name}_*.mp4")
     if not existing:
         return f"{base_name}_001.mp4"
-    nums = [int(re.search(r"_(\d+).mp4", f).group(1)) for f in existing if re.search(r"_(\d+).mp4", f)]
+    nums = [int(re.search(r'(\d+).mp4', f).group(1)) for f in existing if re.search(r'(\d+).mp4', f)]
     next_num = max(nums) + 1 if nums else 1
     return f"{base_name}_{next_num:03d}.mp4"
 
@@ -53,7 +53,7 @@ def generate_image(prompt):
 def create_video(prompt, journal_text, duration, bg_music, user_music, add_voice, owner_token):
     status = "🚀 Starting video generation..."
 
-    # -------- Access Rules ----------
+    # -------- Access Rules --------
     if owner_token != OWNER_TOKEN:
         journal_text = ""  # hide journal for public
         if duration > 10:
@@ -63,46 +63,36 @@ def create_video(prompt, journal_text, duration, bg_music, user_music, add_voice
             return None, None, "⚠️ Owner limit is 600s (10 minutes). Reduce duration."
 
     try:
-        # -------- Generate image ----------
+        # -------- Generate image --------
         status = "🖼️ Generating image..."
         image_path = generate_image(prompt)
 
-        # -------- Create video clip ----------
+        # -------- Create video clip --------
         status = "🎬 Creating video clip..."
         clip = ImageClip(image_path, duration=duration)
 
         # Force 1080p, 30fps
         clip = clip.resize(height=1080).set_fps(30)
 
-        # -------- Background music ----------
+        # -------- Background music --------
         audio_clips = []
         if user_music is not None:
             audio_clips.append(AudioFileClip(user_music))
-        elif bg_music != "none":
-            bg_path = f"music/{bg_music}.mp3"
-            if os.path.exists(bg_path):
-                audio_clips.append(AudioFileClip(bg_path).volumex(0.5))
-
-        # -------- Optional voice narration (owner only) ----------
-        if add_voice and owner_token == OWNER_TOKEN and journal_text.strip():
-            narration_path = "narration.txt"
-            with open(narration_path, "w") as f:
-                f.write(journal_text)
-            # Placeholder for TTS model (can be added later)
-            # audio_clips.append(AudioFileClip(narration_path))
-
-        # -------- Combine audio ----------
+        if bg_music != "none":
+            try:
+                audio_clips.append(AudioFileClip(f"music/{bg_music}.mp3"))
+            except:
+                pass
+
         if audio_clips:
-            final_audio = audio_clips[0]
-            for ac in audio_clips[1:]:
-                final_audio = CompositeAudioClip([final_audio, ac])
+            final_audio = CompositeAudioClip(audio_clips).set_duration(clip.duration)
             clip = clip.set_audio(final_audio)
 
-        # -------- Export video ----------
-        out_path = get_next_file("journal")
-        clip.write_videofile(out_path, codec="libx264", audio_codec="aac", fps=30)
+        # -------- Save video --------
+        out_file = get_next_file("journal")
+        clip.write_videofile(out_file, codec="libx264", audio_codec="aac")
 
-        return out_path, image_path, "✅ Video generated successfully!"
+        return out_file, image_path, "✅ Video generation complete!"
 
     except Exception as e:
         return None, None, f"❌ Error: {str(e)}"