Update app.py

app.py

@@ -47,23 +47,70 @@ async def cleanup_file(filepath: Path):
         logging.error(f"Error during cleanup of {filepath.parent}: {e}")
 
 def get_best_formats_with_fallback(data: dict, requested_quality: int):
-    # This function remains the same as before.
-    if "formats" not in data: raise ValueError("The 'formats' key is missing from the Info API response.")
-    video_url, audio_url = None, None
-    video_formats = [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")]
+    """
+    Parses the Info API response to find the best matching video format
+    with a robust fallback, and the best audio format.
+    """
+    if "formats" not in data:
+        raise ValueError("The 'formats' key is missing from the Info API response.")
+
+    # --- Video Selection (Revised and Improved) ---
+    video_url = None
+    # Filter for any video-only stream that has resolution info
+    video_formats = [
+        f for f in data.get("formats", [])
+        if f.get("vcodec") not in (None, "none") and f.get("acodec") == "none" and f.get("height")
+    ]
+
+    # Sort by height from best to worst
     video_formats.sort(key=lambda f: f["height"], reverse=True)
+
+    if not video_formats:
+        raise ValueError("Could not find any suitable video-only streams in the API response.")
+
+    # Try to find the best format that is at or below the requested quality
+    selected_format = None
     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 not video_url and video_formats: f = video_formats[-1]; video_url = f["url"]; logging.warning(f"Requested quality not available. Falling back to lowest available: {f['height']}p")
-    audio_formats = [f for f in data.get("formats", []) if f.get("acodec") not in (None, "none") and f.get("vcodec") == "none"]
+        if f["height"] <= requested_quality:
+            selected_format = f
+            break # Found the best possible match
+
+    # If no match was found (e.g., user requested 144p but only 360p+ is available),
+    # then default to the absolute best quality available.
+    if selected_format is None:
+        selected_format = video_formats[0] # Fallback to the best overall
+        logging.warning(
+            f"Requested quality ({requested_quality}p) is not available. "
+            f"Falling back to best available quality: {selected_format.get('height')}p."
+        )
+
+    video_url = selected_format.get("url")
+    logging.info(
+        f"Selected video: {selected_format.get('height')}p "
+        f"(format_id: {selected_format.get('format_id')}, ext: {selected_format.get('ext')})"
+    )
+
+
+    # --- Audio Selection ---
+    audio_url = None
+    audio_formats = [
+        f for f in data.get("formats", [])
+        if f.get("acodec") not in (None, "none") and f.get("vcodec") == "none"
+    ]
     if audio_formats:
         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')}, bitrate {selected_audio.get('abr', 'N/A')}k, codec {selected_audio.get('acodec')}")
+        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:
-        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.")
+        raise ValueError("Could not find a suitable video and/or audio stream.")
+
     return video_url, audio_url