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

[ytdl] fix some compatibility issues (#1680)

Browse Source
This commit is contained in:
Mike Fährmann
2021-11-15 22:37:03 +01:00
parent 2aaac3c997
commit 8eaedb0bd3
1 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
gallery_dl/ytdl.py
View File

@@ -155,9 +155,11 @@ def parse_command_line(module, argv):
if _video_multistreams_set is False and _audio_multistreams_set is False: if _video_multistreams_set is False and _audio_multistreams_set is False:
_unused_compat_opt("multistreams") _unused_compat_opt("multistreams")
outtmpl = opts.outtmpl if isinstance(opts.outtmpl, dict):
outtmpl_default = \ outtmpl = opts.outtmpl
outtmpl.get("default") if isinstance(outtmpl, dict) else outtmpl outtmpl_default = outtmpl.get("default")
else:
opts.outtmpl = outtmpl = outtmpl_default = ""
if "filename" in compat_opts: if "filename" in compat_opts:
if outtmpl_default is None: if outtmpl_default is None:
@@ -168,29 +170,32 @@ def parse_command_line(module, argv):
if opts.extractaudio and not opts.keepvideo and opts.format is None: if opts.extractaudio and not opts.keepvideo and opts.format is None:
opts.format = "bestaudio/best" opts.format = "bestaudio/best"
def metadataparser_actions(f): if ytdlp:
if isinstance(f, str): def metadataparser_actions(f):
yield module.MetadataFromFieldPP.to_action(f) if isinstance(f, str):
else: yield module.MetadataFromFieldPP.to_action(f)
REPLACE = module.MetadataParserPP.Actions.REPLACE else:
args = f[1:] REPLACE = module.MetadataParserPP.Actions.REPLACE
for x in f[0].split(","): args = f[1:]
action = [REPLACE, x] for x in f[0].split(","):
action += args action = [REPLACE, x]
yield action action += args
yield action
if getattr(opts, "parse_metadata", None) is None: if getattr(opts, "parse_metadata", None) is None:
opts.parse_metadata = [] opts.parse_metadata = []
if opts.metafromtitle is not None: if opts.metafromtitle is not None:
opts.parse_metadata.append("title:%s" % opts.metafromtitle) opts.parse_metadata.append("title:%s" % opts.metafromtitle)
opts.parse_metadata = list(itertools.chain.from_iterable(map( opts.metafromtitle = None
metadataparser_actions, opts.parse_metadata))) opts.parse_metadata = list(itertools.chain.from_iterable(map(
metadataparser_actions, opts.parse_metadata)))
else:
opts.parse_metadata = ()
download_archive_fn = module.expand_path(opts.download_archive) \ download_archive_fn = module.expand_path(opts.download_archive) \
if opts.download_archive is not None else opts.download_archive if opts.download_archive is not None else opts.download_archive
printing_json = opts.dumpjson or opts.print_json or opts.dump_single_json if getattr(opts, "getcomments", None):
if getattr(opts, "getcomments", None) and not printing_json:
opts.writeinfojson = True opts.writeinfojson = True
if getattr(opts, "no_sponsorblock", None): if getattr(opts, "no_sponsorblock", None):
@@ -210,6 +215,11 @@ def parse_command_line(module, argv):
# PostProcessors # PostProcessors
postprocessors = [] postprocessors = []
if opts.metafromtitle:
postprocessors.append({
"key": "MetadataFromTitle",
"titleformat": opts.metafromtitle,
})
if getattr(opts, "add_postprocessors", None): if getattr(opts, "add_postprocessors", None):
postprocessors += list(opts.add_postprocessors) postprocessors += list(opts.add_postprocessors)
if sponsorblock_query: if sponsorblock_query:
@@ -226,11 +236,11 @@ def parse_command_line(module, argv):
"when": "pre_process", "when": "pre_process",
}) })
if opts.convertsubtitles: if opts.convertsubtitles:
postprocessors.append({ pp = {"key": "FFmpegSubtitlesConvertor",
"key": "FFmpegSubtitlesConvertor", "format": opts.convertsubtitles}
"format": opts.convertsubtitles, if ytdlp:
"when": "before_dl", pp["when"] = "before_dl"
}) postprocessors.append(pp)
if getattr(opts, "convertthumbnails", None): if getattr(opts, "convertthumbnails", None):
postprocessors.append({ postprocessors.append({
"key": "FFmpegThumbnailsConvertor", "key": "FFmpegThumbnailsConvertor",
@@ -311,7 +321,8 @@ def parse_command_line(module, argv):
}) })
if not already_have_thumbnail: if not already_have_thumbnail:
opts.writethumbnail = True opts.writethumbnail = True
opts.outtmpl["pl_thumbnail"] = "" if isinstance(opts.outtmpl, dict):
opts.outtmpl["pl_thumbnail"] = ""
if getattr(opts, "split_chapters", None): if getattr(opts, "split_chapters", None):
postprocessors.append({ postprocessors.append({
"key": "FFmpegSplitChapters", "key": "FFmpegSplitChapters",
@@ -351,8 +362,6 @@ def parse_command_line(module, argv):
"forcefilename": opts.getfilename, "forcefilename": opts.getfilename,
"forceformat": opts.getformat, "forceformat": opts.getformat,
"forceprint": getattr(opts, "forceprint", None) or (), "forceprint": getattr(opts, "forceprint", None) or (),
"forcejson": opts.dumpjson or opts.print_json,
"dump_single_json": opts.dump_single_json,
"force_write_download_archive": getattr( "force_write_download_archive": getattr(
opts, "force_write_download_archive", None), opts, "force_write_download_archive", None),
"simulate": opts.simulate, "simulate": opts.simulate,
@@ -471,7 +480,6 @@ def parse_command_line(module, argv):
"postprocessors": postprocessors, "postprocessors": postprocessors,
"fixup": opts.fixup, "fixup": opts.fixup,
"source_address": opts.source_address, "source_address": opts.source_address,
"call_home": opts.call_home,
"sleep_interval_requests": getattr( "sleep_interval_requests": getattr(
opts, "sleep_interval_requests", None), opts, "sleep_interval_requests", None),
"sleep_interval": opts.sleep_interval, "sleep_interval": opts.sleep_interval,
@@ -479,7 +487,6 @@ def parse_command_line(module, argv):
"sleep_interval_subtitles": getattr( "sleep_interval_subtitles": getattr(
opts, "sleep_interval_subtitles", None), opts, "sleep_interval_subtitles", None),
"external_downloader": opts.external_downloader, "external_downloader": opts.external_downloader,
"list_thumbnails": opts.list_thumbnails,
"playlist_items": opts.playlist_items, "playlist_items": opts.playlist_items,
"xattr_set_filesize": opts.xattr_set_filesize, "xattr_set_filesize": opts.xattr_set_filesize,
"match_filter": match_filter, "match_filter": match_filter,