Fix --list options not implying -s in some cases (#5296)

Authored by: bashonly, Grub4K
This commit is contained in:
bashonly 2022-11-11 08:54:57 +00:00 committed by GitHub
parent bd7e919a75
commit e4221b700f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -672,6 +672,13 @@ class YoutubeDL:
else: else:
self.params['nooverwrites'] = not self.params['overwrites'] self.params['nooverwrites'] = not self.params['overwrites']
if self.params.get('simulate') is None and any((
self.params.get('list_thumbnails'),
self.params.get('listformats'),
self.params.get('listsubtitles'),
)):
self.params['simulate'] = 'list_only'
self.params.setdefault('forceprint', {}) self.params.setdefault('forceprint', {})
self.params.setdefault('print_to_file', {}) self.params.setdefault('print_to_file', {})
@ -2643,8 +2650,7 @@ class YoutubeDL:
# The pre-processors may have modified the formats # The pre-processors may have modified the formats
formats = self._get_formats(info_dict) formats = self._get_formats(info_dict)
list_only = self.params.get('simulate') is None and ( list_only = self.params.get('simulate') == 'list_only'
self.params.get('list_thumbnails') or self.params.get('listformats') or self.params.get('listsubtitles'))
interactive_format_selection = not list_only and self.format_selector == '-' interactive_format_selection = not list_only and self.format_selector == '-'
if self.params.get('list_thumbnails'): if self.params.get('list_thumbnails'):
self.list_thumbnails(info_dict) self.list_thumbnails(info_dict)