dfd

helper/download.py

@@ -20,7 +20,7 @@ import time
 import traceback
 from pathlib import Path
 from typing import Any, Dict, Iterator, List, Optional
-from urllib.parse import urljoin
+from urllib.parse import urljoin, urlparse
 
 import httpx
 
@@ -62,14 +62,11 @@ def _progress_callback(status: Dict[str, Any]) -> None:
         percent = status.get("_percent_str", "?")
         speed = status.get("_speed_str", "?")
         eta = status.get("_eta_str", "?")
-        # Print progress to stdout with carriage return to update in place
         sys.stdout.write(f"\r[download] {percent} at {speed} ETA {eta}   ")
         sys.stdout.flush()
     elif event == "finished":
-        # Clear the progress line
         sys.stdout.write("\r" + " " * 70 + "\r")
         sys.stdout.flush()
-        # Log finished message (visible)
         debug(f"✓ Download finished: {status.get('filename')}")
     elif event in ("postprocessing", "processing"):
         debug(f"Post-processing: {status.get('postprocessor')}")
@@ -99,17 +96,7 @@ def is_url_supported_by_ytdlp(url: str) -> bool:
 
 
 def list_formats(url: str, no_playlist: bool = False, playlist_items: Optional[str] = None) -> Optional[List[Dict[str, Any]]]:
-    """Get list of available formats for a URL using yt-dlp.
-    
-    Args:
-        url: URL to get formats for
-        no_playlist: If True, ignore playlists and list formats for single video
-        playlist_items: If specified, only list formats for these playlist items (e.g., "1,3,5-8")
-        
-    Returns:
-        List of format dictionaries with keys: format_id, format, resolution, fps, vcodec, acodec, filesize, etc.
-        Returns None if yt-dlp is not available or format listing fails.
-    """
+    """Get list of available formats for a URL using yt-dlp."""
     _ensure_yt_dlp_ready()
 
     try:
@@ -118,28 +105,25 @@ def list_formats(url: str, no_playlist: bool = False, playlist_items: Optional[s
             "no_warnings": True,
             "socket_timeout": 30,
         }
-        
-        # Add no_playlist option if specified
+
         if no_playlist:
             ydl_opts["noplaylist"] = True
-        
-        # Add playlist_items filter if specified
+
         if playlist_items:
             ydl_opts["playlist_items"] = playlist_items
 
         with yt_dlp.YoutubeDL(ydl_opts) as ydl:
             debug(f"Fetching format list for: {url}")
             info = ydl.extract_info(url, download=False)
-            
+
             formats = info.get("formats", [])
             if not formats:
                 log("No formats available", file=sys.stderr)
                 return None
-            
-            # Parse and extract relevant format info
+
             result_formats = []
             for fmt in formats:
-                format_info = {
+                result_formats.append({
                     "format_id": fmt.get("format_id", ""),
                     "format": fmt.get("format", ""),
                     "ext": fmt.get("ext", ""),
@@ -150,13 +134,12 @@ def list_formats(url: str, no_playlist: bool = False, playlist_items: Optional[s
                     "vcodec": fmt.get("vcodec", "none"),
                     "acodec": fmt.get("acodec", "none"),
                     "filesize": fmt.get("filesize"),
-                    "tbr": fmt.get("tbr"),  # Total bitrate
-                }
-                result_formats.append(format_info)
-            
+                    "tbr": fmt.get("tbr"),
+                })
+
             debug(f"Found {len(result_formats)} available formats")
             return result_formats
-    
+
     except Exception as e:
         log(f"✗ Error fetching formats: {e}", file=sys.stderr)
         return None
@@ -779,8 +762,28 @@ def download_media(
                     debug_logger.write_record("libgen-resolve-failed", {"url": opts.url})
                 return _download_direct_file(opts.url, opts.output_dir, debug_logger)
     
-    # Try yt-dlp first if URL is supported
-    if not is_url_supported_by_ytdlp(opts.url):
+    # Handle GoFile shares with a dedicated resolver before yt-dlp/direct fallbacks
+    try:
+        netloc = urlparse(opts.url).netloc.lower()
+    except Exception:
+        netloc = ""
+    if "gofile.io" in netloc:
+        msg = "GoFile links are currently unsupported"
+        debug(msg)
+        if debug_logger is not None:
+            debug_logger.write_record("gofile-unsupported", {"url": opts.url})
+        raise DownloadError(msg)
+
+    # Determine if yt-dlp should be used
+    ytdlp_supported = is_url_supported_by_ytdlp(opts.url)
+    if ytdlp_supported:
+        probe_result = probe_url(opts.url, no_playlist=opts.no_playlist)
+        if probe_result is None:
+            log(f"URL supported by yt-dlp but no media detected, falling back to direct download: {opts.url}")
+            if debug_logger is not None:
+                debug_logger.write_record("ytdlp-skip-no-media", {"url": opts.url})
+            return _download_direct_file(opts.url, opts.output_dir, debug_logger)
+    else:
         log(f"URL not supported by yt-dlp, trying direct download: {opts.url}")
         if debug_logger is not None:
             debug_logger.write_record("direct-file-attempt", {"url": opts.url})