xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 14:14:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better error message when no --live-from-start format

Browse Source
This commit is contained in:
pukkandan 2022-03-04 19:40:42 +05:30
parent 4c3f8c3fb6
commit 319b6059d2
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yt_dlp/YoutubeDL.py
View File

@ -954,13 +954,13 @@ def report_file_delete(self, file_name):
except UnicodeEncodeError: except UnicodeEncodeError:
self.to_screen('Deleting existing file') self.to_screen('Deleting existing file')
def raise_no_formats(self, info, forced=False): def raise_no_formats(self, info, forced=False, *, msg=None):
has_drm = info.get('__has_drm') has_drm = info.get('__has_drm')
msg = 'This video is DRM protected' if has_drm else 'No video formats found!' ignored, expected = self.params.get('ignore_no_formats_error'), bool(msg)
expected = self.params.get('ignore_no_formats_error') msg = msg or has_drm and 'This video is DRM protected' or 'No video formats found!'
if forced or not expected: if forced or not ignored:
raise ExtractorError(msg, video_id=info['id'], ie=info['extractor'], raise ExtractorError(msg, video_id=info['id'], ie=info['extractor'],
expected=has_drm or expected) expected=has_drm or ignored or expected)
else: else:
self.report_warning(msg) self.report_warning(msg)
@ -2440,11 +2440,14 @@ def sanitize_numeric_fields(info):
if not self.params.get('allow_unplayable_formats'): if not self.params.get('allow_unplayable_formats'):
formats = [f for f in formats if not f.get('has_drm')] formats = [f for f in formats if not f.get('has_drm')]
if info_dict.get('is_live'): get_from_start = not info_dict.get('is_live') or bool(self.params.get('live_from_start'))
get_from_start = bool(self.params.get('live_from_start'))
formats = [f for f in formats if bool(f.get('is_from_start')) == get_from_start]
if not get_from_start: if not get_from_start:
info_dict['title'] += ' ' + datetime.datetime.now().strftime('%Y-%m-%d %H:%M') info_dict['title'] += ' ' + datetime.datetime.now().strftime('%Y-%m-%d %H:%M')
if info_dict.get('is_live') and formats:
formats = [f for f in formats if bool(f.get('is_from_start')) == get_from_start]
if get_from_start and not formats:
self.raise_no_formats(info_dict, msg='--live-from-start is passed, but there are no formats that can be downloaded from the start. '
'If you want to download from the current time, pass --no-live-from-start')
if not formats: if not formats:
self.raise_no_formats(info_dict) self.raise_no_formats(info_dict)