kumi/yt-dlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[youtube] Retry on 'Unknown Error' (#854)

Browse source 
and do not repeat unimportant alerts

Closes #839
Authored by: coletdjnz
This commit is contained in:
coletdjnz 2021-09-04 02:33:42 +00:00 committed by GitHub
parent 02def2714c
commit c0ac49bcca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
yt_dlp/extractor/youtube.py
View file

@ -48,6 +48,7 @@ from ..utils import (
parse_iso8601, parse_iso8601,
parse_qs, parse_qs,
qualities, qualities,
remove_end,
remove_start, remove_start,
smuggle_url, smuggle_url,
str_or_none, str_or_none,
@ -720,7 +721,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
if message: if message:
yield alert_type, message yield alert_type, message
def _report_alerts(self, alerts, expected=True, fatal=True): def _report_alerts(self, alerts, expected=True, fatal=True, only_once=False):
errors = [] errors = []
warnings = [] warnings = []
for alert_type, alert_message in alerts: for alert_type, alert_message in alerts:
@ -730,7 +731,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
warnings.append([alert_type, alert_message]) warnings.append([alert_type, alert_message])
for alert_type, alert_message in (warnings + errors[:-1]): for alert_type, alert_message in (warnings + errors[:-1]):
self.report_warning('YouTube said: %s - %s' % (alert_type, alert_message)) self.report_warning('YouTube said: %s - %s' % (alert_type, alert_message), only_once=only_once)
if errors: if errors:
raise ExtractorError('YouTube said: %s' % errors[-1][1], expected=expected) raise ExtractorError('YouTube said: %s' % errors[-1][1], expected=expected)
@ -779,7 +780,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
while count < retries: while count < retries:
count += 1 count += 1
if last_error: if last_error:
self.report_warning('%s. Retrying ...' % last_error) self.report_warning('%s. Retrying ...' % remove_end(last_error, '.'))
try: try:
response = self._call_api( response = self._call_api(
ep=ep, fatal=True, headers=headers, ep=ep, fatal=True, headers=headers,
@ -814,8 +815,13 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
else: else:
# Youtube may send alerts if there was an issue with the continuation page # Youtube may send alerts if there was an issue with the continuation page
try: try:
self._extract_and_report_alerts(response, expected=False) self._extract_and_report_alerts(response, expected=False, only_once=True)
except ExtractorError as e: except ExtractorError as e:
# YouTube servers may return errors we want to retry on in a 200 OK response
# See: https://github.com/yt-dlp/yt-dlp/issues/839
if 'unknown error' in e.msg.lower():
last_error = e.msg
continue
if fatal: if fatal:
raise raise
self.report_warning(error_to_compat_str(e)) self.report_warning(error_to_compat_str(e))
@ -4285,7 +4291,7 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
# YouTube sometimes provides a button to reload playlist with unavailable videos. # YouTube sometimes provides a button to reload playlist with unavailable videos.
if 'no-youtube-unavailable-videos' not in compat_opts: if 'no-youtube-unavailable-videos' not in compat_opts:
data = self._reload_with_unavailable_videos(item_id, data, webpage) or data data = self._reload_with_unavailable_videos(item_id, data, webpage) or data
self._extract_and_report_alerts(data) self._extract_and_report_alerts(data, only_once=True)
tabs = try_get( tabs = try_get(
data, lambda x: x['contents']['twoColumnBrowseResultsRenderer']['tabs'], list) data, lambda x: x['contents']['twoColumnBrowseResultsRenderer']['tabs'], list)
if tabs: if tabs: