fix(downloads): tighten SourceAdapter resolution + neutral nfo default (review)
- resolve_adapter: identify from the yt-dlp extractor_key only, not the full webpage_url (a sibling source's name in a URL path no longer misresolves); add youtube-nocookie.com to the YouTube host match so nocookie embeds keep the POT/player-client extraction strategy. - _download: re-resolve the adapter with the post-extraction info dict so the .nfo uniqueid type and uploader_url agree on one source (dedups the inline resolve too). - MediaMeta.uniqueid_type defaults to source-neutral "generic" instead of "youtube", so an un-updated caller can never falsely label a non-YouTube download as youtube. - Tests: lock extractor-key-only resolution + nocookie host; default nfo type.
This commit is contained in:
@@ -122,12 +122,17 @@ def resolve_adapter(
|
||||
"""Pick the adapter for a job. Matches on `source_kind` first, then the yt-dlp `extractor_key`
|
||||
from `info` (post-extraction), then the URL host in `source_ref` (pre-extraction). Falls back to
|
||||
the generic adapter — so behaviour is unchanged for any source without a dedicated one."""
|
||||
tag = ""
|
||||
if info:
|
||||
extractor = info.get("extractor_key") or info.get("extractor") or ""
|
||||
tag = f"{extractor} {info.get('webpage_url') or ''}".lower()
|
||||
# Identify from the yt-dlp extractor key alone — NOT the webpage_url, whose path could contain a
|
||||
# sibling source's name (e.g. a reddit post slug '.../youtube_is_dead') and cause a misresolve.
|
||||
tag = (info.get("extractor_key") or info.get("extractor") or "").lower() if info else ""
|
||||
host = urlparse(source_ref).netloc.lower() if source_ref else ""
|
||||
if source_kind == "youtube" or "youtube" in tag or "youtu.be" in host or "youtube.com" in host:
|
||||
if (
|
||||
source_kind == "youtube"
|
||||
or "youtube" in tag
|
||||
or "youtu.be" in host
|
||||
or "youtube.com" in host
|
||||
or "youtube-nocookie.com" in host
|
||||
):
|
||||
return _YOUTUBE
|
||||
if "facebook" in tag or "facebook.com" in host or "fb.watch" in host:
|
||||
return _FACEBOOK
|
||||
|
||||
Reference in New Issue
Block a user