Update app.py

app.py

@@ -6,18 +6,7 @@ import glob
 import shutil
 import gradio as gr
 
-os.system("chmod +x ./fdkaac")
-# Set executable fdkaac path
-fdkaac_path = os.path.abspath("./fdkaac")
-ffmpeg_path = shutil.which("ffmpeg")
-yt_dlp_path = shutil.which("yt-dlp")
-
-if not os.path.isfile(fdkaac_path):
-    raise FileNotFoundError("fdkaac binary not found in current directory.")
-if not ffmpeg_path:
-    raise FileNotFoundError("FFmpeg not found in PATH.")
-if not yt_dlp_path:
-    raise FileNotFoundError("yt-dlp not found in PATH.")
+os.system("chmod +x ./fdkaac")  # Ensure fdkaac is executable
 
 accel = 'auto'
 video_base_opts = ['-crf', '63', '-c:v', 'libx264', '-tune', 'zerolatency']
@@ -30,7 +19,8 @@ os.makedirs(CONVERTED_FOLDER, exist_ok=True)
 async def run_subprocess(cmd, use_fdkaac=False):
     env = os.environ.copy()
     if use_fdkaac:
-        env["LD_LIBRARY_PATH"] = env.get("LD_LIBRARY_PATH", "") + ":/usr/local/lib"
+        # Add your fdkaac lib path here if needed:
+        env["LD_LIBRARY_PATH"] = os.path.abspath("./") + ":" + env.get("LD_LIBRARY_PATH", "")
     print(f"[DEBUG] Running command:\n{' '.join(cmd)}\n")
     process = await asyncio.create_subprocess_exec(
         *cmd,
@@ -47,43 +37,63 @@ async def run_subprocess(cmd, use_fdkaac=False):
 
 async def convert_video_task(input_path, downscale, faster, use_mp3):
     if use_mp3:
+        # MP3 audio only, no splitting
         output_path = os.path.join(CONVERTED_FOLDER, f"{uuid.uuid4()}.mp3")
         ffmpeg_cmd = [
-            ffmpeg_path, '-y', '-i', input_path, '-vn',
+            'ffmpeg', '-y', '-i', input_path, '-vn',
             '-c:a', 'libmp3lame', '-b:a', '8k', '-ar', '24000', '-ac', '1', output_path
         ]
         await run_subprocess(ffmpeg_cmd)
         return output_path, None
 
+    # Paths for 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 8kHz WAV audio
     await run_subprocess([
-        ffmpeg_path, '-y', '-i', input_path, '-ac', '1', '-ar', '8000', audio_wav
+        'ffmpeg', '-y', '-i', input_path, '-ac', '1', '-ar', '8000', audio_wav
     ])
 
+    # Compress WAV to AAC with fdkaac
     await run_subprocess([
-        fdkaac_path, '-b', '1k', '-C', '-f', '2', '-G', '1', '-w', '8000',
+        './fdkaac', '-b', '1k', '-C', '-f', '2', '-G', '1', '-w', '8000',
         '-o', audio_output, audio_wav
     ], use_fdkaac=True)
 
+    # Compress video with extreme low quality, no audio
     video_cmd = [
-        ffmpeg_path, '-y', '-hwaccel', accel, '-i', input_path,
+        'ffmpeg', '-y', '-hwaccel', accel, '-i', input_path,
         *video_base_opts, '-an', video_output
     ]
     if faster:
         video_cmd.extend(['-preset', 'ultrafast'])
     await run_subprocess(video_cmd)
 
-    return audio_output, video_output
+    # Merge video + audio into final mp4 container
+    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 intermediate files
+    for f in [audio_wav, audio_output, video_output]:
+        try:
+            os.remove(f)
+        except FileNotFoundError:
+            pass
+
+    return audio_output, merged_output
 
 async def process_conversion(use_youtube, youtube_url, video_file, downscale, faster, use_mp3, audio_only):
     try:
         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")
-            yt_cmd = [yt_dlp_path, '-o', yt_out, '-f', 'b', youtube_url]
+            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)
@@ -93,22 +103,22 @@ async def process_conversion(use_youtube, youtube_url, video_file, downscale, fa
         else:
             if not video_file:
                 return "No video provided.", None
-            ext = os.path.splitext(video_file)[1]
+            ext = os.path.splitext(video_file.name)[1]
             input_path = os.path.join(UPLOAD_FOLDER, f"{uuid.uuid4()}{ext}")
-            shutil.copy2(video_file, input_path)
+            shutil.copy2(video_file.name, input_path)
 
         audio_out, video_out = await convert_video_task(input_path, downscale, faster, use_mp3)
 
         if audio_only:
             return audio_out, audio_out
-        return video_out or audio_out, video_out or audio_out
+        else:
+            return video_out, video_out
     except Exception as e:
-        return str(e), None
+        return f"Error: {str(e)}", None
 
 def convert_video(*args):
     return asyncio.run(process_conversion(*args))
 
-# Gradio Interface
 with gr.Blocks(theme=gr.themes.Default(primary_hue="rose")) as demo:
     gr.Markdown("""
     # 🎥 **Low Quality Video Inator**