Update app.py

app.py

@@ -8,7 +8,7 @@ import gradio as gr
 accel = 'auto'
 extra = '-crf 63 -c:v libx264'  # default extra settings
 
-# For simplicity, we use fixed upload and conversion folders.
+# Fixed upload and conversion folders.
 UPLOAD_FOLDER = 'uploads'
 CONVERTED_FOLDER = 'converted'
 os.makedirs(UPLOAD_FOLDER, exist_ok=True)
@@ -33,37 +33,37 @@ def convert_video(use_youtube, youtube_url, video_file, downscale, faster, use_m
         output_filename = f"{uuid.uuid4()}.mp4"
     output_path = os.path.join(CONVERTED_FOLDER, output_filename)
     
-    files_to_delete = []  # List to keep track of temporary files.
-
+    files_to_delete = []  # For temporary file cleanup.
+    
     if use_youtube:
         if not youtube_url:
             return "Error: YouTube URL is required.", None
 
+        # Determine quality based on whether downscale is ticked.
         if downscale:
-            # Download the worst-quality version to disk.
             quality = 'worstaudio' if audio_only else 'worstvideo+worstaudio'
-            yt_uuid = str(uuid.uuid4())
-            yt_input_filename = yt_uuid + ".%(ext)s"
-            yt_input_path = os.path.join(UPLOAD_FOLDER, yt_input_filename)
-            yt_dlp_cmd = ['yt-dlp', '-o', yt_input_path, '-f', quality, youtube_url]
-            try:
-                subprocess.run(yt_dlp_cmd, check=True)
-            except subprocess.CalledProcessError as e:
-                return f"An error occurred during YouTube download: {e}", None
-
-            # Locate the downloaded file (yt-dlp replaces %(ext)s with the actual extension).
-            pattern = os.path.join(UPLOAD_FOLDER, yt_uuid + ".*")
-            downloaded_files = glob.glob(pattern)
-            if not downloaded_files:
-                return "Failed to download YouTube video.", None
-            yt_input_file = downloaded_files[0]
-            files_to_delete.append(yt_input_file)
-            ffmpeg_cmd = ['ffmpeg', '-hwaccel', accel, '-y', '-i', yt_input_file] + extra.split()
         else:
-            # Pipe best-quality output directly from yt-dlp.
-            quality = 'bestaudio' if audio_only else 'best'
-            yt_dlp_cmd = ['yt-dlp', '-o', '-', '-f', quality, youtube_url]
-            ffmpeg_cmd = ['ffmpeg', '-hwaccel', accel, '-y', '-i', '-'] + extra.split()
+            quality = 'b'  # Use "-f b" for best quality if downscale is not ticked.
+        
+        yt_uuid = str(uuid.uuid4())
+        yt_input_filename = yt_uuid + ".%(ext)s"
+        yt_input_path = os.path.join(UPLOAD_FOLDER, yt_input_filename)
+        yt_dlp_cmd = ['yt-dlp', '-o', yt_input_path, '-f', quality, youtube_url]
+        try:
+            subprocess.run(yt_dlp_cmd, check=True)
+        except subprocess.CalledProcessError as e:
+            return f"An error occurred during YouTube download: {e}", None
+
+        # Locate the downloaded file (yt-dlp replaces %(ext)s with the actual extension).
+        pattern = os.path.join(UPLOAD_FOLDER, yt_uuid + ".*")
+        downloaded_files = glob.glob(pattern)
+        if not downloaded_files:
+            return "Failed to download YouTube video.", None
+        yt_input_file = downloaded_files[0]
+        files_to_delete.append(yt_input_file)
+        
+        # Build FFmpeg command using the downloaded file.
+        ffmpeg_cmd = ['ffmpeg', '-hwaccel', accel, '-y', '-i', yt_input_file] + extra.split()
     else:
         # File upload branch.
         if not video_file:
@@ -76,43 +76,35 @@ def convert_video(use_youtube, youtube_url, video_file, downscale, faster, use_m
         os.rename(video_file, input_path)
         files_to_delete.append(input_path)
         ffmpeg_cmd = ['ffmpeg', '-hwaccel', accel, '-y', '-i', input_path] + extra.split()
-
-    # Apply downscale if requested (for file uploads and YouTube downloads alike).
+    
+    # Apply downscale if requested.
     if downscale:
         ffmpeg_cmd.extend(['-vf', 'scale=144:-2'])
     # Apply faster conversion if selected.
     if faster:
         ffmpeg_cmd.extend(['-preset', 'ultrafast'])
     
-    # Configure audio options.
+    # Configure audio encoding.
     if audio_only:
         ffmpeg_cmd.extend(['-vn'])
         configure_audio(ffmpeg_cmd, use_mp3)
     else:
         configure_audio(ffmpeg_cmd, use_mp3)
     
+    # Append output file path.
     ffmpeg_cmd.append(output_path)
     
     # Run FFmpeg.
-    if use_youtube and not downscale:
-        try:
-            yt_proc = subprocess.Popen(yt_dlp_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            subprocess.run(ffmpeg_cmd, stdin=yt_proc.stdout, check=True)
-            yt_proc.stdout.close()
-            yt_proc.wait()
-        except subprocess.CalledProcessError as e:
-            return f"An error occurred during conversion: {e}", None
-    else:
-        try:
-            subprocess.run(ffmpeg_cmd, check=True)
-        except subprocess.CalledProcessError as e:
-            return f"An error occurred during conversion: {e}", None
+    try:
+        subprocess.run(ffmpeg_cmd, check=True)
+    except subprocess.CalledProcessError as e:
+        return f"An error occurred during conversion: {e}", None
 
-    # (Optional cleanup could be done here for files in files_to_delete.)
-    # Return the output file path for both video preview and file download.
+    # (Optional: cleanup temporary files here if desired.)
+    # Return output file path for preview and download.
     return output_path, output_path
 
-# Create the Gradio interface using Blocks.
+# Create the Gradio interface.
 with gr.Blocks() as demo:
     gr.Markdown("## Low Quality Video Inator")
     gr.Markdown("Upload a video or use a YouTube URL and adjust the options below.")