Update run.py

run.py

@@ -2,54 +2,43 @@ import gradio as gr
 import yt_dlp
 import os
 
-def download_youtube(url, file_format):
-    ydl_opts = {}
-    try:
-        if file_format == "audio":
-            ydl_opts = {
-                'format': 'bestaudio/best',
-                'postprocessors': [{
-                    'key': 'FFmpegExtractAudio',
-                    'preferredcodec': 'mp3',
-                    'preferredquality': '192',
-                }],
-                'outtmpl': 'downloads/%(title)s.%(ext)s',
-            }
-        else:
-            ydl_opts = {
-                'format': 'bestvideo+bestaudio/best',
-                'outtmpl': 'downloads/%(title)s.%(ext)s',
-            }
+def download_media(url, media_type):
+    ydl_opts = {
+        'format': 'bestaudio/best' if media_type == 'audio' else 'bestvideo+bestaudio',
+        'outtmpl': 'downloads/%(title)s.%(ext)s',
+        'postprocessors': [{
+            'key': 'FFmpegExtractAudio',
+            'preferredcodec': 'mp3',
+            'preferredquality': '192',
+        }] if media_type == 'audio' else []
+    }
+    
+    with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+        info = ydl.extract_info(url, download=True)
+        file_path = ydl.prepare_filename(info)
+        
+        if media_type == 'audio':
+            file_path = file_path.rsplit('.', 1)[0] + '.mp3'
+    
+    return file_path
 
-        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-            info_dict = ydl.extract_info(url, download=True)
-            file_path = ydl.prepare_filename(info_dict)
-            if file_format == "audio":
-                file_path = os.path.splitext(file_path)[0] + ".mp3"
-
-        return file_path, None
-    except Exception as e:
-        return None, str(e)
-
-def show_output(file_path, error):
-    if error:
-        return error, gr.Audio.update(visible=False), gr.Video.update(visible=False)
-    if file_path.endswith(".mp3"):
-        return None, gr.Audio.update(value=file_path, visible=True), gr.Video.update(visible=False)
+def show_media(url, media_type):
+    file_path = download_media(url, media_type)
+    if media_type == 'audio':
+        return None, file_path
     else:
-        return None, gr.Audio.update(visible=False), gr.Video.update(value=file_path, visible=True)
+        return file_path, None
 
 with gr.Blocks() as demo:
-    with gr.Row():
-        with gr.Column():
-            url_input = gr.Textbox(label="YouTube URL")
-            format_input = gr.Dropdown(choices=["audio", "video"], label="Format")
-            download_button = gr.Button("Download")
-        with gr.Column():
-            error_output = gr.Textbox(label="Error Output", visible=True)
-            audio_output = gr.Audio(label="Audio Output", visible=False)
-            video_output = gr.Video(label="Video Output", visible=False)
-
-    download_button.click(download_youtube, inputs=[url_input, format_input], outputs=[error_output, audio_output, video_output])
+    gr.Markdown("# YouTube Downloader")
+    
+    url = gr.Textbox(label="YouTube URL")
+    media_type = gr.Radio(label="Media Type", choices=["audio", "video"])
+    download_button = gr.Button("Download")
+    
+    video_output = gr.Video()
+    audio_output = gr.Audio()
+    
+    download_button.click(show_media, inputs=[url, media_type], outputs=[video_output, audio_output])
 
 demo.launch()