github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dl:ytdl] update '_extract_manifest()'

Browse Source 
- use 'kwdict' as single argument
- fix '_parse_m3u8_formats_and_subtitles' arguments
This commit is contained in:
Mike Fährmann
2025-12-04 19:13:28 +01:00
parent b2e377b650
commit 1f6577240d
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gallery_dl/downloader/ytdl.py
View File

@@ -85,11 +85,7 @@ class YoutubeDLDownloader(DownloaderBase):
ytdl_instance, url) ytdl_instance, url)
else: else:
info_dict = self._extract_manifest( info_dict = self._extract_manifest(
ytdl_instance, url, ytdl_instance, url, kwdict)
manifest,
kwdict.get("_ytdl_manifest_data"),
kwdict.get("_ytdl_manifest_headers"),
kwdict.get("_ytdl_manifest_cookies"))
except Exception as exc: except Exception as exc:
self.log.traceback(exc) self.log.traceback(exc)
self.log.warning("%s: %s", exc.__class__.__name__, exc) self.log.warning("%s: %s", exc.__class__.__name__, exc)
@@ -113,12 +109,11 @@ class YoutubeDLDownloader(DownloaderBase):
def _extract_url(self, ytdl, url): def _extract_url(self, ytdl, url):
return ytdl.extract_info(url, download=False) return ytdl.extract_info(url, download=False)
def _extract_manifest(self, ytdl, url, manifest_type, manifest_data=None, def _extract_manifest(self, ytdl, url, kwdict):
headers=None, cookies=None):
extr = ytdl.get_info_extractor("Generic") extr = ytdl.get_info_extractor("Generic")
video_id = extr._generic_id(url) video_id = extr._generic_id(url)
if cookies is not None: if cookies := kwdict.get("_ytdl_manifest_cookies"):
if isinstance(cookies, dict): if isinstance(cookies, dict):
cookies = cookies.items() cookies = cookies.items()
set_cookie = ytdl.cookiejar.set_cookie set_cookie = ytdl.cookiejar.set_cookie
@@ -129,8 +124,11 @@ class YoutubeDLDownloader(DownloaderBase):
False, None, False, None, None, {}, False, None, False, None, None, {},
)) ))
if manifest_type == "hls": type = kwdict["_ytdl_manifest"]
if manifest_data is None: data = kwdict.get("_ytdl_manifest_data")
headers = kwdict.get("_ytdl_manifest_headers")
if type == "hls":
if data is None:
try: try:
fmts, subs = extr._extract_m3u8_formats_and_subtitles( fmts, subs = extr._extract_m3u8_formats_and_subtitles(
url, video_id, "mp4", headers=headers) url, video_id, "mp4", headers=headers)
@@ -141,13 +139,14 @@ class YoutubeDLDownloader(DownloaderBase):
else: else:
try: try:
fmts, subs = extr._parse_m3u8_formats_and_subtitles( fmts, subs = extr._parse_m3u8_formats_and_subtitles(
url, video_id, "mp4") data, url, "mp4", headers=headers)
except AttributeError: except AttributeError:
fmts = extr._parse_m3u8_formats(url, video_id, "mp4") fmts = extr._parse_m3u8_formats(
data, url, "mp4", headers=headers)
subs = None subs = None
elif manifest_type == "dash": elif type == "dash":
if manifest_data is None: if data is None:
try: try:
fmts, subs = extr._extract_mpd_formats_and_subtitles( fmts, subs = extr._extract_mpd_formats_and_subtitles(
url, video_id, headers=headers) url, video_id, headers=headers)
@@ -156,18 +155,18 @@ class YoutubeDLDownloader(DownloaderBase):
url, video_id, headers=headers) url, video_id, headers=headers)
subs = None subs = None
else: else:
if isinstance(manifest_data, str): if isinstance(data, str):
manifest_data = ElementTree.fromstring(manifest_data) data = ElementTree.fromstring(data)
try: try:
fmts, subs = extr._parse_mpd_formats_and_subtitles( fmts, subs = extr._parse_mpd_formats_and_subtitles(
manifest_data, mpd_id="dash") data, mpd_id="dash")
except AttributeError: except AttributeError:
fmts = extr._parse_mpd_formats( fmts = extr._parse_mpd_formats(
manifest_data, mpd_id="dash") data, mpd_id="dash")
subs = None subs = None
else: else:
raise ValueError(f"Unsupported manifest type '{manifest_type}'") raise ValueError(f"Unsupported manifest type '{type}'")
info_dict = { info_dict = {
"extractor": "", "extractor": "",