Consolidates source-specific policy (youtube / facebook / reddit / generic) that was scattered across worker.py, backfill.py, service.py, formats.py and storage.py with no shared source identity. app/downloads/adapters.py holds the base (= generic yt-dlp behaviour) + per-source overrides; resolve_adapter(source_kind, source_ref, info) picks one by source_kind, the yt-dlp extractor_key, or the URL host, falling back to generic. yt-dlp stays the engine — the adapter is policy only. Moved into adapters (behaviour-equivalent): - uploader_url derivation (YouTube channel_url / Facebook uploader_id / reddit None) — removes the worker/backfill duplication (build_uploader_url + _should_refetch gone). - the player-client fallback sets + retriable markers + YouTube extractor_args/POT (build_ydl_opts now takes source-agnostic opts plus an `extra` dict from the adapter). - source_url reconstruction (service.source_url delegates to the adapter). Two intentional (approved) behaviour changes: - the player-client fallback is now YouTube-only; non-YouTube sources make a single extraction attempt instead of a pointless double attempt with youtube-only client args. - the .nfo <uniqueid type=...> follows the source (adapter.nfo_uniqueid_type) instead of the hardcoded "youtube" that mislabelled every url-source download. Deliberately left generic (documented non-moves): title cleaning (normalize_title is harmless across sources), the classify marker table, thumbnail_to_jpg, the format selectors, and og.py's YouTube-hqdefault og:image preference (a self-contained thumbnail heuristic on the share path). Verified end-to-end on localdev across all four adapters: downloads succeed and uploader_url + the .nfo uniqueid type are correct per source.
223 lines
10 KiB
Python
223 lines
10 KiB
Python
"""Format profiles → yt-dlp options, and the cache signature.
|
|
|
|
A profile `spec` (stored on DownloadProfile / snapshotted on DownloadJob) is the single source
|
|
of truth for what file gets produced. `format_sig` hashes exactly the fields that change the
|
|
OUTPUT BYTES, so two users picking equivalent settings share one cached MediaAsset.
|
|
`build_ydl_opts` turns a spec into a yt-dlp options dict (format selector + postprocessors).
|
|
|
|
spec shape (all keys optional; defaults applied by `normalize`):
|
|
mode "av" (audio+video) | "v" (video-only) | "a" (audio-only)
|
|
max_height int | null (null = best)
|
|
container "mp4" | "mkv" | "webm" | null (merge/remux target for av/v)
|
|
audio_format "m4a" | "mp3" | "opus" | null (extract target for mode "a")
|
|
vcodec "h264" | "vp9" | "av1" | null (preference, best-effort)
|
|
embed_subs bool embed_chapters bool embed_thumbnail bool sponsorblock bool
|
|
"""
|
|
import hashlib
|
|
import json
|
|
|
|
# Fields that affect the produced file — and therefore the cache identity.
|
|
_SIG_KEYS = (
|
|
"mode",
|
|
"max_height",
|
|
"container",
|
|
"audio_format",
|
|
"vcodec",
|
|
"embed_subs",
|
|
"embed_chapters",
|
|
"embed_thumbnail",
|
|
"sponsorblock",
|
|
)
|
|
|
|
_DEFAULTS = {
|
|
"mode": "av",
|
|
"max_height": None,
|
|
"container": "mp4",
|
|
"audio_format": "m4a",
|
|
"vcodec": None,
|
|
# Embedding is OFF by default: it rewrites the whole file (doubles I/O — a 10 GB video
|
|
# gets a 10 GB temp copy), and the Plex `.nfo` + poster sidecars already carry the
|
|
# metadata/thumbnail. Users who want self-contained files opt in via a custom profile.
|
|
"embed_subs": False,
|
|
"embed_chapters": False,
|
|
"embed_thumbnail": False,
|
|
"sponsorblock": False,
|
|
}
|
|
|
|
# Bump when the spec→output-bytes mapping changes so an identical spec gets a fresh cache
|
|
# identity instead of hitting a stale asset produced by the old rule. v2: mp4 downloads now
|
|
# prefer H.264+AAC (browser/iOS-compatible) rather than yt-dlp's default VP9/Opus best.
|
|
# v3: mp4 compat now *selects* H.264 (avc1) with a progressive fallback + re-encodes the rare
|
|
# AV1/VP9-only result to H.264, so cached AV1 assets must re-derive (fixes iOS broken-player).
|
|
_SIG_VERSION = 3
|
|
|
|
_SPONSORBLOCK_CATEGORIES = ["sponsor", "selfpromo", "interaction"]
|
|
_VCODEC_SORT = {"h264": "vcodec:h264", "vp9": "vcodec:vp9", "av1": "vcodec:av01"}
|
|
|
|
|
|
def normalize(spec: dict) -> dict:
|
|
"""Fill defaults + coerce types so signature and yt-dlp opts are deterministic."""
|
|
s = dict(_DEFAULTS)
|
|
for k in _DEFAULTS:
|
|
if spec.get(k) is not None:
|
|
s[k] = spec[k]
|
|
if s["mode"] not in ("av", "v", "a"):
|
|
s["mode"] = "av"
|
|
if s["max_height"] is not None:
|
|
# A malformed max_height (non-numeric inline spec / stored profile) falls back to "best"
|
|
# rather than raising an unhandled 500 at enqueue.
|
|
try:
|
|
s["max_height"] = int(s["max_height"])
|
|
except (TypeError, ValueError):
|
|
s["max_height"] = None
|
|
for b in ("embed_subs", "embed_chapters", "embed_thumbnail", "sponsorblock"):
|
|
s[b] = bool(s[b])
|
|
# Audio-only files can't embed subtitles/thumbnails as video; keep the flags meaningful.
|
|
if s["mode"] == "a":
|
|
s["embed_subs"] = False
|
|
return s
|
|
|
|
|
|
def format_sig(spec: dict, salt: str | None = None) -> str:
|
|
"""Stable short hash of the output-affecting spec — the MediaAsset cache key component.
|
|
|
|
`salt` forks a distinct, non-dedup identity for the same spec (used by force-redownload so it
|
|
always re-fetches into its own asset instead of sharing a cached file with other jobs)."""
|
|
s = normalize(spec)
|
|
data = {k: s[k] for k in _SIG_KEYS}
|
|
data["_v"] = _SIG_VERSION
|
|
if salt is not None:
|
|
data["_salt"] = salt
|
|
payload = json.dumps(data, sort_keys=True, separators=(",", ":"))
|
|
return hashlib.sha256(payload.encode()).hexdigest()[:24]
|
|
|
|
|
|
def build_ydl_opts(
|
|
spec: dict,
|
|
outtmpl: str,
|
|
progress_hook,
|
|
extra: dict | None = None,
|
|
) -> dict:
|
|
"""Assemble yt-dlp options for a single download to `outtmpl` (a full path template).
|
|
|
|
`extra` is source-specific options contributed by the SourceAdapter (e.g. YouTube's
|
|
`extractor_args` with the player-client set + bgutil PO-token base_url); it is merged onto the
|
|
generic options below. Everything here is source-agnostic."""
|
|
s = normalize(spec)
|
|
h = s["max_height"]
|
|
opts: dict = {
|
|
"outtmpl": outtmpl,
|
|
"noplaylist": True,
|
|
"quiet": True,
|
|
"no_warnings": True,
|
|
"noprogress": True,
|
|
"writethumbnail": True, # kept for the poster.jpg sidecar (and embed, if requested)
|
|
"progress_hooks": [progress_hook],
|
|
"postprocessors": [],
|
|
# Force IPv4: containers often have no working IPv6 route, but googlevideo CDN hosts
|
|
# advertise AAAA records, so ffmpeg/the downloader would try IPv6 and fail with
|
|
# "[Errno -5] No address associated with hostname". Binding to the IPv4 any-address
|
|
# makes every connection IPv4-only. (yt-dlp's --force-ipv4 does the same thing.)
|
|
"source_address": "0.0.0.0",
|
|
# Self-heal transient network blips instead of failing the whole job.
|
|
"retries": 10,
|
|
"fragment_retries": 10,
|
|
"extractor_retries": 3,
|
|
"retry_sleep": {"http": 5, "fragment": 5, "extractor": 5},
|
|
"socket_timeout": 30,
|
|
}
|
|
|
|
# Source-specific options from the adapter (e.g. YouTube's extractor_args: player_client + POT).
|
|
if extra:
|
|
opts.update(extra)
|
|
|
|
if s["mode"] == "a":
|
|
opts["format"] = "bestaudio/best"
|
|
opts["postprocessors"].append(
|
|
{
|
|
"key": "FFmpegExtractAudio",
|
|
"preferredcodec": s["audio_format"] or "m4a",
|
|
"preferredquality": "0",
|
|
}
|
|
)
|
|
else:
|
|
hcap = f"[height<=?{h}]" if h else ""
|
|
# Compatibility-first for mp4 (the universal container): produce H.264 video + AAC audio
|
|
# so shared/downloaded files play in EVERY browser, including iOS/Safari. WebKit (which
|
|
# every iOS browser, Brave included, is forced to use) decodes only H.264/H.265 + AAC
|
|
# inside mp4 — a VP9/AV1-in-mp4 file shows a broken player there, even though Chromium
|
|
# plays it fine. A custom profile that explicitly sets `vcodec` opts out.
|
|
compat = s["container"] == "mp4" and s["vcodec"] is None
|
|
if s["mode"] == "v":
|
|
if compat:
|
|
# Video-only: keep it audio-free. Prefer an H.264 *video-only* stream, then any
|
|
# video-only, and only fall to a progressive (audio-bearing) `best` as a last
|
|
# resort — same audio-free-when-possible guarantee as the old `bestvideo/best`.
|
|
opts["format"] = (
|
|
f"bestvideo[vcodec^=avc1]{hcap}/bestvideo{hcap}"
|
|
f"/best[vcodec^=avc1]{hcap}/best{hcap}"
|
|
)
|
|
else:
|
|
opts["format"] = f"bestvideo{hcap}/best{hcap}"
|
|
else: # av
|
|
if compat:
|
|
# Prefer H.264 at the SELECTION level, not just via format_sort: a sort key is only
|
|
# a *preference* and can't conjure an H.264 stream a source doesn't expose as
|
|
# video-only. A non-YouTube source (e.g. Facebook) may ship AV1 as the best
|
|
# video-only stream and H.264 only as a *progressive* (a+v) format — which
|
|
# `bestvideo` skips — so `bestvideo+bestaudio` picked AV1 and iOS broke. This chain
|
|
# tries avc1 video-only, then the avc1 progressive, then anything.
|
|
opts["format"] = (
|
|
f"bestvideo[vcodec^=avc1]{hcap}+bestaudio[acodec^=mp4a]"
|
|
f"/best[vcodec^=avc1]{hcap}"
|
|
f"/bestvideo{hcap}+bestaudio/best{hcap}"
|
|
)
|
|
else:
|
|
opts["format"] = f"bestvideo{hcap}+bestaudio/best{hcap}"
|
|
if s["container"]:
|
|
opts["merge_output_format"] = s["container"]
|
|
sort = []
|
|
# Keep the codec preference as a tiebreaker (ranks H.264/AAC above resolution among the
|
|
# selected candidates); the selector above is the hard guarantee, this is belt-and-braces.
|
|
if compat:
|
|
sort += ["vcodec:h264", "acodec:aac"]
|
|
if h:
|
|
sort.append(f"res:{h}")
|
|
if s["vcodec"] in _VCODEC_SORT:
|
|
sort.append(_VCODEC_SORT[s["vcodec"]])
|
|
if sort:
|
|
opts["format_sort"] = sort
|
|
|
|
# SponsorBlock first (marks segments), then strip them from the media + chapters.
|
|
if s["sponsorblock"]:
|
|
opts["postprocessors"].append(
|
|
{"key": "SponsorBlock", "categories": _SPONSORBLOCK_CATEGORIES, "when": "after_filter"}
|
|
)
|
|
opts["postprocessors"].append(
|
|
{"key": "ModifyChapters", "remove_sponsor_segments": _SPONSORBLOCK_CATEGORIES}
|
|
)
|
|
if s["embed_subs"] and s["mode"] != "a":
|
|
opts["writesubtitles"] = True
|
|
opts["subtitleslangs"] = ["en.*", "hu.*", "de.*"]
|
|
opts["postprocessors"].append({"key": "FFmpegEmbedSubtitle"})
|
|
if s["embed_chapters"]:
|
|
opts["postprocessors"].append(
|
|
{"key": "FFmpegMetadata", "add_chapters": True, "add_metadata": True}
|
|
)
|
|
# NOTE: we deliberately do NOT add yt-dlp's `FFmpegThumbnailsConvertor` here. Its jpg conversion
|
|
# runs `ffmpeg -bsf:v mjpeg2jpeg` when the written thumbnail is already JPEG bytes (Reddit serves
|
|
# a JPEG under a `.png` name), and that bitstream filter *fails* on some such images — and since a
|
|
# postprocessor error is fatal, it used to kill the WHOLE download even though the media was fine.
|
|
# The `<name>.jpg` poster sidecar is instead produced robustly by our own pipeline (worker
|
|
# `_download` → `editmod.thumbnail_to_jpg`, with `ensure_poster` cutting a video frame as a
|
|
# fallback), so the og:image share preview (Facebook Messenger / MS Teams) keeps working.
|
|
# The opt-in EmbedThumbnail below is unaffected: it does its OWN format handling — it embeds a
|
|
# jpg/png thumbnail directly and converts anything else to PNG (not the crashing mjpeg2jpeg-to-jpg
|
|
# path), so it never needed the convertor and does not reintroduce the crash.
|
|
if s["embed_thumbnail"]:
|
|
opts["postprocessors"].append(
|
|
{"key": "EmbedThumbnail", "already_have_thumbnail": True}
|
|
)
|
|
|
|
return opts
|