Update app.py

app.py

@@ -36,24 +36,22 @@ async def run_subprocess(cmd, use_fdkaac=False):
 
 async def convert_video_task(input_path, downscale, faster, use_mp3, audio_only, custom_bitrate, video_bitrate, progress):
     if use_mp3:
-        progress.update(1, desc="Converting audio to MP3...")
         output_audio = os.path.join(CONVERTED_FOLDER, f"{uuid.uuid4()}.mp3")
+        await progress(0.1, desc="Converting audio to MP3...")
         ffmpeg_audio_cmd = [
             'ffmpeg', '-y', '-i', input_path, '-vn',
             '-c:a', 'libmp3lame', '-b:a', '8k', '-ar', '24000', '-ac', '1',
             output_audio
         ]
         if audio_only:
-            # Audio-only MP3
             await run_subprocess(ffmpeg_audio_cmd)
             return output_audio, None
         else:
-            # Video+MP3, no splitting; encode video with MP3 audio embedded
             output_video = os.path.join(CONVERTED_FOLDER, f"{uuid.uuid4()}.mp4")
+            await progress(0.3, desc="Making the video quality lower...")
             ffmpeg_video_cmd = [
                 'ffmpeg', '-y', '-hwaccel', accel, '-i', input_path
             ]
-
             if custom_bitrate:
                 ffmpeg_video_cmd += ['-b:v', f"{int(video_bitrate)}k"]
             else:
@@ -68,120 +66,97 @@ async def convert_video_task(input_path, downscale, faster, use_mp3, audio_only,
             await run_subprocess(ffmpeg_video_cmd)
             return None, output_video
 
-    # fdkaac path: Split, compress audio, merge
+    # AAC (fdkaac) path
+    await progress(0.1, desc="Splitting Audio and Video...")
     audio_wav = os.path.join(CONVERTED_FOLDER, f"{uuid.uuid4()}.wav")
     audio_output = os.path.join(CONVERTED_FOLDER, f"{uuid.uuid4()}.m4a")
     video_output = os.path.join(CONVERTED_FOLDER, f"{uuid.uuid4()}.mp4")
 
-    # Extract mono WAV audio
-    progress.update(1, desc="Splitting Audio and Video...")
     await run_subprocess([
         'ffmpeg', '-y', '-i', input_path, '-ac', '1', '-ar', '8000', audio_wav
     ])
 
-    # Compress WAV with fdkaac
-    progress.update(1, desc="Converting audio to AAC which is lower quality...")
+    await progress(0.3, desc="Converting audio to AAC which is lower quality...")
     await run_subprocess([
         './fdkaac', '-b', '1k', '-C', '-f', '2', '-G', '1', '-w', '8000',
         '-o', audio_output, audio_wav
     ], use_fdkaac=True)
 
-    # Compress video without audio
-    progress.update(1, desc="Making the video quality lower...")
+    await progress(0.6, desc="Making the video quality lower...")
     video_cmd = [
         'ffmpeg', '-y', '-hwaccel', accel, '-i', input_path
     ]
-
     if downscale:
         video_cmd += ['-vf', 'scale=-2:144']
-    
     if custom_bitrate:
         video_cmd += ['-b:v', f"{int(video_bitrate)}k"]
     else:
         video_cmd += video_base_opts
         if faster:
             video_cmd.extend(['-preset', 'ultrafast'])
-
     video_cmd += ['-an', video_output]
     await run_subprocess(video_cmd)
 
     if audio_only:
         return audio_output, None
 
-    # Merging video + audio
-    progress.update(1, desc="Mixing audio and video together...")
+    await progress(0.9, desc="Mixing audio and video together...")
     merged_output = os.path.join(CONVERTED_FOLDER, f"{uuid.uuid4()}.mp4")
     await run_subprocess([
         'ffmpeg', '-y', '-i', video_output, '-i', audio_output, '-c', 'copy', merged_output
     ])
 
-    # Cleanup intermediates
     for f in [audio_wav, audio_output, video_output]:
         try:
             os.remove(f)
         except FileNotFoundError:
             pass
 
+    await progress(1.0)
     return None, merged_output
 
 async def process_conversion(use_youtube, youtube_url, video_file, downscale, faster, use_mp3, audio_only, custom_bitrate, video_bitrate, progress=gr.Progress()):
     try:
-        with progress.tqdm(total=5, desc="Starting...") as pbar:
-            if use_youtube:
-                pbar.update(1, desc="Downloading video...")
-                if not youtube_url:
-                    return "Error: YouTube URL required.", None
-                yt_uuid = str(uuid.uuid4())
-                yt_out = os.path.join(UPLOAD_FOLDER, yt_uuid + ".%(ext)s")
-                yt_cmd = ['yt-dlp', '-o', yt_out, '-f', 'b', youtube_url]
-                await run_subprocess(yt_cmd)
-                pattern = os.path.join(UPLOAD_FOLDER, yt_uuid + ".*")
-                files = glob.glob(pattern)
-                if not files:
-                    return "Download failed.", None
-                input_path = files[0]
-            else:
-                pbar.update(1, desc="Preparing input video...")
-                if not video_file:
-                    return "No video provided.", None
-                ext = os.path.splitext(video_file.name)[1]
-                input_path = os.path.join(UPLOAD_FOLDER, f"{uuid.uuid4()}{ext}")
-                shutil.copy2(video_file.name, input_path)
-
-            if use_mp3:
-                pbar.update(1, desc="Converting audio to MP3...")
-            else:
-                pbar.update(1, desc="Converting audio to AAC which is lower quality...")
-
-            audio_out, video_out = await convert_video_task(
-                input_path, downscale, faster, use_mp3, audio_only, custom_bitrate, video_bitrate, progress=pbar
-            )
-
-            if not use_mp3:
-                pbar.update(1, desc="Making the video quality lower...")
-
-            pbar.update(1, desc="Finishing up...")
+        if use_youtube:
+            if not youtube_url:
+                return "Error: YouTube URL required.", None
+            yt_uuid = str(uuid.uuid4())
+            yt_out = os.path.join(UPLOAD_FOLDER, yt_uuid + ".%(ext)s")
+            await progress(0, desc="Downloading from YouTube...")
+            yt_cmd = ['yt-dlp', '-o', yt_out, '-f', 'b', youtube_url]
+            await run_subprocess(yt_cmd)
+            pattern = os.path.join(UPLOAD_FOLDER, yt_uuid + ".*")
+            files = glob.glob(pattern)
+            if not files:
+                return "Download failed.", None
+            input_path = files[0]
+        else:
+            if not video_file:
+                return "No video provided.", None
+            ext = os.path.splitext(video_file.name)[1]
+            input_path = os.path.join(UPLOAD_FOLDER, f"{uuid.uuid4()}{ext}")
+            shutil.copy2(video_file.name, input_path)
+
+        audio_out, video_out = await convert_video_task(
+            input_path, downscale, faster, use_mp3, audio_only, custom_bitrate, video_bitrate, progress
+        )
 
-            if audio_only:
-                return audio_out, audio_out
-            return video_out, video_out
+        if audio_only:
+            return audio_out, audio_out
+        return video_out, video_out
     except Exception as e:
         return f"Error: {str(e)}", None
 
-def convert_video(*args):
-    return asyncio.run(process_conversion(*args))
-
-# Gradio Interface (Now With Custom Bitrate)
+# Gradio Interface
 with gr.Blocks(theme=gr.themes.Default(primary_hue="rose")) as demo:
     gr.Markdown("""
     # **Low Quality Video Inator**
-    
     Upload a video or paste a YouTube URL below, then tweak the settings to your liking.
     """)
 
     with gr.Group():
         with gr.Row():
-            use_youtube = gr.Checkbox(label="🔗 Use YouTube URL (Useless on Huggingface, works when ran locally probably.)", value=False)
+            use_youtube = gr.Checkbox(label="🔗 Use YouTube URL (experimental)", value=False)
             youtube_url = gr.Textbox(label="YouTube URL", placeholder="Paste YouTube URL here")
         video_file = gr.File(label="📁 Upload Video File")
 
@@ -197,7 +172,6 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="rose")) as demo:
             custom_bitrate = gr.Checkbox(label="Custom Video Bitrate", value=False)
             video_bitrate = gr.Number(label="Bitrate (kbps)", visible=False)
 
-        # Show/hide bitrate field
         custom_bitrate.change(
             lambda checked: gr.update(visible=checked),
             inputs=[custom_bitrate],
@@ -213,7 +187,7 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="rose")) as demo:
     file_download = gr.File(label="Download Result")
 
     convert_button.click(
-        convert_video,
+        process_conversion,
         inputs=[
             use_youtube, youtube_url, video_file,
             downscale, faster, use_mp3, audio_only,