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

[dl:ytdl] implement '_ytdl_manifest_remux'

Browse Source
This commit is contained in:
Mike Fährmann
2026-01-06 20:12:12 +01:00
parent 223779f456
commit 3c0509e80c
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gallery_dl/downloader/ytdl.py
View File

@@ -70,6 +70,7 @@ class YoutubeDLDownloader(DownloaderBase):
self.ytdl_instance = ytdl_instance = ytdl.construct_YoutubeDL(
module, self, self.ytdl_opts, kwdict.get("_ytdl_params"))
self.ytdl_pp = module.postprocessor
if self.outtmpl == "default":
self.outtmpl = module.DEFAULT_OUTTMPL
self._prepare(ytdl_instance)
@@ -171,23 +172,27 @@ class YoutubeDLDownloader(DownloaderBase):
type = kwdict["_ytdl_manifest"]
data = kwdict.get("_ytdl_manifest_data")
remux = kwdict.get("_ytdl_manifest_remux")
headers = kwdict.get("_ytdl_manifest_headers")
if type == "hls":
ext = "ytdl" if remux else "mp4"
protocol = "m3u8_native"
if data is None:
try:
fmts, subs = extr._extract_m3u8_formats_and_subtitles(
url, video_id, "mp4", headers=headers)
url, video_id, ext, protocol, headers=headers)
except AttributeError:
fmts = extr._extract_m3u8_formats(
url, video_id, "mp4", headers=headers)
url, video_id, ext, protocol, headers=headers)
subs = None
else:
try:
fmts, subs = extr._parse_m3u8_formats_and_subtitles(
data, url, "mp4", headers=headers)
data, url, ext, protocol, headers=headers)
except AttributeError:
fmts = extr._parse_m3u8_formats(
data, url, "mp4", headers=headers)
data, url, ext, protocol, headers=headers)
subs = None
elif type == "dash":
@@ -224,7 +229,13 @@ class YoutubeDLDownloader(DownloaderBase):
"formats" : fmts,
"subtitles": subs,
}
return ytdl.process_ie_result(info_dict, download=False)
info_dict = ytdl.process_ie_result(info_dict, download=False)
if remux:
info_dict["__postprocessors"] = [
self.ytdl_pp.FFmpegVideoRemuxerPP(self.ytdl_instance, remux)]
return info_dict
def _download_video(self, ytdl_instance, pathfmt, info_dict):
if "url" in info_dict:
@@ -251,7 +262,7 @@ class YoutubeDLDownloader(DownloaderBase):
pathfmt.path = pathfmt.directory + filename
pathfmt.realpath = pathfmt.temppath = (
pathfmt.realdirectory + filename)
else:
elif info_dict["ext"] != "ytdl":
pathfmt.set_extension(info_dict["ext"])
pathfmt.build_path()