heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missed some modifications when updating youtube extractor

Browse Source
This commit is contained in:
James Taylor 2018-11-09 01:39:14 -08:00
parent 630b476e42
commit 9dd8308cf2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/youtube.py
View File

@ -1724,7 +1724,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
unavailable_message = extract_unavailable_message() unavailable_message = extract_unavailable_message()
if unavailable_message: if unavailable_message:
reason = unavailable_message reason = unavailable_message
raise ExtractorError( raise YoutubeError(
'YouTube said: %s' % reason, 'YouTube said: %s' % reason,
expected=True, video_id=video_id) expected=True, video_id=video_id)
else: else:
@ -1976,11 +1976,13 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
a_format.setdefault('http_headers', {})['Youtubedl-no-compression'] = 'True' a_format.setdefault('http_headers', {})['Youtubedl-no-compression'] = 'True'
formats.append(a_format) formats.append(a_format)
else: else:
error_message = clean_html(video_info.get('reason', [None])[0]) error_message = extract_unavailable_message()
alt_error_message = clean_html(video_info.get('reason', [None])[0])
print(alt_error_message)
if not error_message: if not error_message:
error_message = extract_unavailable_message() error_message = alt_error_message
if error_message: if error_message:
raise ExtractorError(error_message, expected=True) raise YoutubeError(error_message)
raise ExtractorError('no conn, hlsvp or url_encoded_fmt_stream_map information found in video info') raise ExtractorError('no conn, hlsvp or url_encoded_fmt_stream_map information found in video info')
# uploader # uploader