Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in 170605840e 

and related refactor
This commit is contained in:
pukkandan 2023-04-27 19:35:28 +05:30
parent 7cf51f2191
commit b5f61b69d4
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
yt_dlp/YoutubeDL.py
View File

@ -2916,36 +2916,30 @@ class YoutubeDL:
return info_copy return info_copy
def __forced_printings(self, info_dict, filename=None, incomplete=True): def __forced_printings(self, info_dict, filename=None, incomplete=True):
def print_mandatory(field, actual_field=None):
if actual_field is None:
actual_field = field
if (self.params.get('force%s' % field, False)
and (not incomplete or info_dict.get(actual_field) is not None)):
self.to_stdout(info_dict[actual_field])
def print_optional(field):
if (self.params.get('force%s' % field, False)
and info_dict.get(field) is not None):
self.to_stdout(info_dict[field])
if (self.params.get('forcejson') if (self.params.get('forcejson')
or self.params['forceprint'].get('video') or self.params['forceprint'].get('video')
or self.params['print_to_file'].get('video')): or self.params['print_to_file'].get('video')):
self.post_extract(info_dict) self.post_extract(info_dict)
if filename: if filename:
info_dict['filename'] = filename info_dict['filename'] = filename
info_dict = self._forceprint('video', info_dict) info_copy = self._forceprint('video', info_dict)
print_mandatory('title') def print_field(field, actual_field=None, optional=False):
print_mandatory('id') if actual_field is None:
print_mandatory('url', 'urls') actual_field = field
print_optional('thumbnail') if self.params.get(f'force{field}') and (
print_optional('description') info_copy.get(field) is not None or (not optional and not incomplete)):
print_optional('filename') self.to_stdout(info_copy[actual_field])
if self.params.get('forceduration') and info_dict.get('duration') is not None:
self.to_stdout(formatSeconds(info_dict['duration'])) print_field('title')
print_mandatory('format') print_field('id')
print_field('url', 'urls')
print_field('thumbnail', optional=True)
print_field('description', optional=True)
print_field('filename', optional=True)
if self.params.get('forceduration') and info_copy.get('duration') is not None:
self.to_stdout(formatSeconds(info_copy['duration']))
print_field('format')
if self.params.get('forcejson'): if self.params.get('forcejson'):
self.to_stdout(json.dumps(self.sanitize_info(info_dict))) self.to_stdout(json.dumps(self.sanitize_info(info_dict)))