Update app.py

app.py

@@ -8,17 +8,21 @@ from pydub import AudioSegment
 from moviepy import VideoFileClip
 
 
+# ---------- AUDIO PROCESSING ----------
 def convert_audio(input_files, output_format, session_id, merge_files, gap_duration):
     """Converts or merges a list of audio files."""
     output_files = []
     merged_audio = AudioSegment.silent(duration=0)
 
+    os.makedirs(session_id, exist_ok=True)
+
     for input_file in tqdm(input_files, desc="Converting audio files"):
-        audio = AudioSegment.from_file(input_file.name)
-        base_name = os.path.splitext(os.path.basename(input_file.name))[0]
+        file_path = input_file if isinstance(input_file, str) else input_file.name
+        audio = AudioSegment.from_file(file_path)
+
+        base_name = os.path.splitext(os.path.basename(file_path))[0]
         output_filename = f"{base_name}.{output_format}"
         output_path = os.path.join(session_id, output_filename)
-        os.makedirs(session_id, exist_ok=True)
         audio.export(output_path, format=output_format)
 
         if merge_files:
@@ -29,10 +33,12 @@ def convert_audio(input_files, output_format, session_id, merge_files, gap_durat
     if merge_files:
         merged_output_path = os.path.join(session_id, f"merged_output.{output_format}")
         merged_audio.export(merged_output_path, format=output_format)
-        return merged_output_path
+        return [merged_output_path]
 
     return output_files
 
+
+# ---------- ZIP CREATION ----------
 def create_zip(files_to_zip, session_id):
     """Creates a ZIP archive from a list of files."""
     zip_filename = f"{session_id}.zip"
@@ -41,6 +47,8 @@ def create_zip(files_to_zip, session_id):
             zipf.write(file, os.path.basename(file))
     return zip_filename
 
+
+# ---------- AUDIO HANDLER ----------
 def process_audio_files(files, output_format, merge_files, gap_duration, progress=gr.Progress(track_tqdm=True)):
     """Main handler function for audio processing."""
     if not files:
@@ -52,16 +60,15 @@ def process_audio_files(files, output_format, merge_files, gap_duration, progres
 
     output_files = convert_audio(files, output_format, session_id, merge_files, gap_duration)
 
-    if merge_files:
-        print("Merging complete!")
-        return output_files
+    if len(output_files) > 1:
+        print("Creating ZIP archive...")
+        zip_filename = create_zip(output_files, session_id)
+        return zip_filename
 
-    print("Conversion complete! Creating ZIP archive...")
-    zip_filename = create_zip(output_files, session_id)
-    print("Zipping complete!")
-    return zip_filename
+    return output_files[0]
 
 
+# ---------- VIDEO HANDLER ----------
 def process_video(input_video, conversion_type, output_format, progress=gr.Progress(track_tqdm=True)):
     """Converts a video to another format or extracts its audio."""
     if not input_video:
@@ -69,8 +76,9 @@ def process_video(input_video, conversion_type, output_format, progress=gr.Progr
 
     session_id = datetime.now().strftime("%Y-%m-%d_%H-%M-%S") + "_" + str(uuid.uuid4())[:8]
     os.makedirs(session_id, exist_ok=True)
-    
-    base_name = os.path.splitext(os.path.basename(input_video))[0]
+
+    input_path = input_video if isinstance(input_video, str) else input_video.name
+    base_name = os.path.splitext(os.path.basename(input_path))[0]
     output_filename = f"{base_name}_converted.{output_format}"
     output_path = os.path.join(session_id, output_filename)
 
@@ -78,20 +86,20 @@ def process_video(input_video, conversion_type, output_format, progress=gr.Progr
     print(f"Conversion type: {conversion_type}, Output format: {output_format}")
 
     try:
-        clip = VideoFileClip(input_video)
+        clip = VideoFileClip(input_path)
 
         if conversion_type == "Video to Video":
             print("Converting video to video...")
-            clip.write_videofile(output_path, codec='libx264', audio_codec='aac', logger='bar')
-        
+            clip.write_videofile(output_path, codec='libx264', audio_codec='aac', logger=None)
+
         elif conversion_type == "Video to Audio":
             print("Extracting audio from video...")
             if clip.audio is None:
                 raise gr.Error("The uploaded video file does not contain an audio track.")
             audio_clip = clip.audio
-            audio_clip.write_audiofile(output_path, logger='bar')
+            audio_clip.write_audiofile(output_path, logger=None)
             audio_clip.close()
-        
+
         clip.close()
 
     except Exception as e:
@@ -101,6 +109,8 @@ def process_video(input_video, conversion_type, output_format, progress=gr.Progr
     print("Video processing complete!")
     return output_path
 
+
+# ---------- FORMAT CHOICES ----------
 def update_format_choices(conversion_type):
     """Dynamically updates the format dropdown based on the conversion type."""
     if conversion_type == "Video to Video":
@@ -113,58 +123,63 @@ audio_formats = ["mp3", "wav", "flac", "ogg", "aac", "m4a", "aiff", "wma", "opus
 video_formats = ["mp4", "webm", "mkv", "avi", "mov", "flv"]
 
 
+# ---------- UI ----------
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("# Universal Media Converter 🎧🎬")
     gr.Markdown("Use the tabs below to switch between the Audio and Video converters.")
 
     with gr.Tabs():
+        # AUDIO TAB
         with gr.TabItem("🎶 Audio Converter"):
             gr.Markdown("## Convert and Merge Audio Files")
-            gr.Markdown("Upload one or more audio files and select the output format. You can also merge all files into a single track by checking the box.")
+            gr.Markdown("Upload one or more audio files and select the output format. You can also merge all files into a single track.")
+
             with gr.Row():
                 with gr.Column(scale=2):
                     audio_file_input = gr.Files(label="Upload Audio Files", file_types=["audio"])
                 with gr.Column(scale=1):
                     audio_format_choice = gr.Dropdown(choices=audio_formats, label="Output Format", value="mp3")
                     merge_files_checkbox = gr.Checkbox(label="Merge all files into one")
-                    gap_slider = gr.Slider(minimum=0, maximum=5000, step=100, value=500, label="Gap between files (ms)", info="Only used when merging")
-            
+                    gap_slider = gr.Slider(minimum=0, maximum=5000, step=100, value=500, label="Gap between files (ms)")
+
             audio_submit_button = gr.Button("🚀 Convert", variant="primary")
             audio_output_file = gr.File(label="Download Result")
-            
+
             audio_submit_button.click(
-                fn=process_audio_files, 
-                inputs=[audio_file_input, audio_format_choice, merge_files_checkbox, gap_slider], 
+                fn=process_audio_files,
+                inputs=[audio_file_input, audio_format_choice, merge_files_checkbox, gap_slider],
                 outputs=audio_output_file
             )
 
+        # VIDEO TAB
         with gr.TabItem("🎬 Video Converter"):
             gr.Markdown("## Convert Video and Extract Audio")
             gr.Markdown("Upload a video file, then choose whether to convert it to another video format or to extract its audio track.")
+
             with gr.Row():
                 with gr.Column(scale=2):
-                    video_input = gr.Video(label="Upload Video File")
+                    video_input = gr.File(label="Upload Video File", file_types=["video"])
                 with gr.Column(scale=1):
                     conversion_type_radio = gr.Radio(
-                        choices=["Video to Video", "Video to Audio"], 
-                        label="Conversion Type", 
+                        choices=["Video to Video", "Video to Audio"],
+                        label="Conversion Type",
                         value="Video to Video"
                     )
                     video_format_dropdown = gr.Dropdown(
-                        choices=video_formats, 
-                        label="Output Video Format", 
+                        choices=video_formats,
+                        label="Output Video Format",
                         value="mp4"
                     )
-            
+
             video_submit_button = gr.Button("🚀 Convert", variant="primary")
             video_output_file = gr.File(label="Download Result")
 
             conversion_type_radio.change(
-                fn=update_format_choices, 
-                inputs=conversion_type_radio, 
+                fn=update_format_choices,
+                inputs=conversion_type_radio,
                 outputs=video_format_dropdown
             )
-            
+
             video_submit_button.click(
                 fn=process_video,
                 inputs=[video_input, conversion_type_radio, video_format_dropdown],
@@ -172,4 +187,4 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             )
 
 if __name__ == "__main__":
-    demo.launch(debug=True)
+    demo.launch(debug=True)