Update app.py

app.py

@@ -1,6 +1,7 @@
 import gradio as gr
 import tempfile
 import os
+import re
 from moviepy.editor import VideoFileClip, concatenate_videoclips, AudioFileClip, CompositeAudioClip, concatenate_audioclips
 import numpy as np
 import logging
@@ -26,6 +27,46 @@ def check_port(port):
         except socket.error:
             return False
 
+def sort_files_by_index(file_list, prefix_pattern):
+    """
+    Sort files based on their numerical index in the filename.
+    Args:
+        file_list: List of file paths (e.g., ['file2.mp4', 'file1.mp4', 'file3.mp4'])
+        prefix_pattern: Regex pattern to match the prefix and number (e.g., r'file(\d+)\.mp4')
+    Returns:
+        Sorted list of file paths
+    """
+    if not file_list:
+        return []
+    
+    def extract_index(filename):
+        match = re.match(prefix_pattern, os.path.basename(filename))
+        if match:
+            return int(match.group(1))
+        return float('inf')  # Invalid filenames go to the end
+    
+    sorted_files = sorted(file_list, key=extract_index)
+    logger.info(f"Sorted files: {sorted_files}")
+    return sorted_files
+
+def get_indices_string(file_list, prefix_pattern):
+    """
+    Extract the numerical indices from filenames and return as a string.
+    Args:
+        file_list: List of file paths
+        prefix_pattern: Regex pattern to match the prefix and number
+    Returns:
+        String of indices (e.g., '123' for ['file1.mp4', 'file2.mp4', 'file3.mp4'])
+    """
+    if not file_list:
+        return ""
+    indices = []
+    for filename in file_list:
+        match = re.match(prefix_pattern, os.path.basename(filename))
+        if match:
+            indices.append(match.group(1))
+    return "".join(indices)
+
 def trim_silence(audio_clip, threshold=0.005):
     """
     Trim silence from the start and end of an audio clip.
@@ -77,6 +118,7 @@ def merge_videos_and_audios(video_files=None, audio_files=None, orig_vol=1.0, mu
     - If only video_files: Merge videos, retaining their original audio.
     - If only audio_files: Merge audio files into a single audio file.
     - If both: Merge videos and overlay the concatenated audio.
+    Files are sorted by numerical index in their filenames (e.g., file1.mp4, file2.mp4).
     Args:
         video_files: List of video file paths (optional)
         audio_files: List of audio file paths (optional)
@@ -86,6 +128,14 @@ def merge_videos_and_audios(video_files=None, audio_files=None, orig_vol=1.0, mu
         Path to the merged file (video or audio) or error message.
     """
     try:
+        # Sort files by numerical index
+        video_files = sort_files_by_index(video_files, r'file(\d+)\.mp4')
+        audio_files = sort_files_by_index(audio_files, r'audio(\d+)\.mp4')
+        
+        # Get indices for output naming
+        video_indices = get_indices_string(video_files, r'file(\d+)\.mp4')
+        audio_indices = get_indices_string(audio_files, r'audio(\d+)\.mp4')
+
         # Ensure at least two files are provided (videos, audios, or combination)
         video_count = len(video_files) if video_files else 0
         audio_count = len(audio_files) if audio_files else 0
@@ -103,7 +153,8 @@ def merge_videos_and_audios(video_files=None, audio_files=None, orig_vol=1.0, mu
 
         # Case 1: Audio only
         if audio_count >= 2 and video_count == 0:
-            output_path = os.path.join(temp_dir, "merged_output.mp3")
+            output_filename = f"combined_audio_{audio_indices}.mp3"
+            output_path = os.path.join(temp_dir, output_filename)
             logger.info("Merging audio files only")
             
             # Load, normalize, and trim audio clips
@@ -153,7 +204,11 @@ def merge_videos_and_audios(video_files=None, audio_files=None, orig_vol=1.0, mu
             return output_path
 
         # Case 2: Video only or Video with Audio
-        output_path = os.path.join(temp_dir, "merged_output.mp4")
+        if audio_indices:
+            output_filename = f"combined_video_{video_indices}_with_audio_{audio_indices}.mp4"
+        else:
+            output_filename = f"combined_video_{video_indices}.mp4"
+        output_path = os.path.join(temp_dir, output_filename)
         
         # Load and concatenate video clips
         video_clips = [VideoFileClip(video) for video in video_files]
@@ -304,6 +359,7 @@ if __name__ == "__main__":
     with gr.Blocks(title="Video and Audio Merger API") as app:
         gr.Markdown("## Video and Audio Merger API")
         gr.Markdown("Upload at least 2 files total (videos, audios, or a combination) to merge them. Videos and audios are optional.")
+        gr.Markdown("For API usage, name videos as file1.mp4, file2.mp4, etc., and audios as audio1.mp4, audio2.mp4, etc.")
         
         with gr.Row():
             video_input = gr.File(label="Video Files (Optional, at least 2 if no audio)", type="filepath", file_count="multiple")