Update app.py

app.py

@@ -70,34 +70,45 @@ def get_best_formats_with_fallback(data: dict, requested_quality: int):
         f for f in data["formats"]
         if f.get("vcodec") != "none" and f.get("acodec") == "none" and f.get("ext") == "mp4" and f.get("height")
     ]
-    # Sort by height, descending
     video_formats.sort(key=lambda f: f["height"], reverse=True)
 
-    # Find the best format that is less than or equal to the requested quality
     for f in video_formats:
         if f["height"] <= requested_quality:
             video_url = f["url"]
             logging.info(f"Selected video quality: {f['height']}p (requested <= {requested_quality}p)")
             break
 
-    # If no suitable format was found, fallback to the lowest available quality
     if not video_url and video_formats:
-        f = video_formats[-1] # Smallest resolution
+        f = video_formats[-1]
         video_url = f["url"]
         logging.warning(f"Requested quality not available. Falling back to lowest available: {f['height']}p")
 
-    # --- Audio Selection ---
+    # --- Audio Selection (Revised and Improved) ---
     audio_url = None
+    # Find all streams that are audio-only
     audio_formats = [
-        f for f in data["formats"]
-        if f.get("acodec") != "none" and f.get("vcodec") == "none" and "m4a" in f.get("format_id", "")
+        f for f in data.get("formats", [])
+        if f.get("acodec") not in (None, "none") and f.get("vcodec") == "none"
     ]
-    audio_formats.sort(key=lambda f: f.get("abr", 0), reverse=True) # Sort by audio bitrate
+
+    # Sort by audio bitrate (abr) to find the best quality
     if audio_formats:
-        audio_url = audio_formats[0]["url"]
-        logging.info(f"Selected best available audio with bitrate {audio_formats[0].get('abr', 'N/A')}k.")
+        audio_formats.sort(key=lambda f: f.get("abr", 0) or 0, reverse=True)
+        selected_audio = audio_formats[0]
+        audio_url = selected_audio.get("url")
+        logging.info(
+            f"Selected best audio: format_id {selected_audio.get('format_id')}, "
+            f"bitrate {selected_audio.get('abr', 'N/A')}k, "
+            f"codec {selected_audio.get('acodec')}"
+        )
 
+    # --- Final Check ---
     if not video_url or not audio_url:
+        # Add more detailed logging for easier debugging
+        if not video_url:
+            logging.error("Failed to find a suitable video_url.")
+        if not audio_url:
+            logging.error("Failed to find a suitable audio_url.")
         raise ValueError("Could not find suitable video and/or audio streams from the Info API.")
 
     return video_url, audio_url