github/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-21 20:46:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

Allow --no-write-thumbnail to override --write-all-thumbnail

Browse source 
Closes #1900
This commit is contained in:
pukkandan 2021-12-06 23:26:34 +05:30
parent 146cc4114a
commit acc0d6a411
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
yt_dlp/__init__.py
View file

@ -559,13 +559,12 @@ def report_unplayable_conflict(opt_name, arg, default=False, allowed=None):
'_from_cli': True, '_from_cli': True,
}) })
if opts.embedthumbnail: if opts.embedthumbnail:
already_have_thumbnail = opts.writethumbnail or opts.write_all_thumbnails
postprocessors.append({ postprocessors.append({
'key': 'EmbedThumbnail', 'key': 'EmbedThumbnail',
# already_have_thumbnail = True prevents the file from being deleted after embedding # already_have_thumbnail = True prevents the file from being deleted after embedding
'already_have_thumbnail': already_have_thumbnail 'already_have_thumbnail': opts.writethumbnail
}) })
if not already_have_thumbnail: if not opts.writethumbnail:
opts.writethumbnail = True opts.writethumbnail = True
opts.outtmpl['pl_thumbnail'] = '' opts.outtmpl['pl_thumbnail'] = ''
if opts.split_chapters: if opts.split_chapters:
@ -695,8 +694,8 @@ def report_deprecation(val, old, new=None):
'allow_playlist_files': opts.allow_playlist_files, 'allow_playlist_files': opts.allow_playlist_files,
'clean_infojson': opts.clean_infojson, 'clean_infojson': opts.clean_infojson,
'getcomments': opts.getcomments, 'getcomments': opts.getcomments,
'writethumbnail': opts.writethumbnail, 'writethumbnail': opts.writethumbnail is True,
'write_all_thumbnails': opts.write_all_thumbnails, 'write_all_thumbnails': opts.writethumbnail == 'all',
'writelink': opts.writelink, 'writelink': opts.writelink,
'writeurllink': opts.writeurllink, 'writeurllink': opts.writeurllink,
'writewebloclink': opts.writewebloclink, 'writewebloclink': opts.writewebloclink,

7
yt_dlp/options.py
View file

@ -1187,7 +1187,10 @@ def _dict_from_options_callback(
thumbnail = optparse.OptionGroup(parser, 'Thumbnail Options') thumbnail = optparse.OptionGroup(parser, 'Thumbnail Options')
thumbnail.add_option( thumbnail.add_option(
'--write-thumbnail', '--write-thumbnail',
action='store_true', dest='writethumbnail', default=False, action='callback', dest='writethumbnail', default=False,
# Should override --no-write-thumbnail, but not --write-all-thumbnail
callback=lambda option, _, __, parser: setattr(
parser.values, option.dest, getattr(parser.values, option.dest) or True),
help='Write thumbnail image to disk') help='Write thumbnail image to disk')
thumbnail.add_option( thumbnail.add_option(
'--no-write-thumbnail', '--no-write-thumbnail',
@ -1195,7 +1198,7 @@ def _dict_from_options_callback(
help='Do not write thumbnail image to disk (default)') help='Do not write thumbnail image to disk (default)')
thumbnail.add_option( thumbnail.add_option(
'--write-all-thumbnails', '--write-all-thumbnails',
action='store_true', dest='write_all_thumbnails', default=False, action='store_const', dest='writethumbnail', const='all',
help='Write all thumbnail image formats to disk') help='Write all thumbnail image formats to disk')
thumbnail.add_option( thumbnail.add_option(
'--list-thumbnails', '--list-thumbnails',