R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added video_id to multiple ExtractorError messages

Browse Source
This commit is contained in:
iTitus 2016-11-09 23:18:01 +01:00 committed by GitHub
parent db3367f43e
commit 66bc860d92
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/youtube.py
View File

@ -1321,7 +1321,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
if regions_allowed: if regions_allowed:
raise ExtractorError('YouTube said: This video is available in %s only' % ( raise ExtractorError('YouTube said: This video is available in %s only' % (
', '.join(map(ISO3166Utils.short2full, regions_allowed.split(',')))), ', '.join(map(ISO3166Utils.short2full, regions_allowed.split(',')))),
expected=True) expected=True, video_id=video_id)
raise ExtractorError( raise ExtractorError(
'YouTube said: %s' % video_info['reason'][0], 'YouTube said: %s' % video_info['reason'][0],
expected=True, video_id=video_id) expected=True, video_id=video_id)
@ -1389,14 +1389,14 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
# Check for "rental" videos # Check for "rental" videos
if 'ypc_video_rental_bar_text' in video_info and 'author' not in video_info: if 'ypc_video_rental_bar_text' in video_info and 'author' not in video_info:
raise ExtractorError('"rental" videos not supported') raise ExtractorError('"rental" videos not supported', video_id=video_id)
# Start extracting information # Start extracting information
self.report_information_extraction(video_id) self.report_information_extraction(video_id)
# uploader # uploader
if 'author' not in video_info: if 'author' not in video_info:
raise ExtractorError('Unable to extract uploader name') raise ExtractorError('Unable to extract uploader name', video_id=video_id)
video_uploader = compat_urllib_parse_unquote_plus(video_info['author'][0]) video_uploader = compat_urllib_parse_unquote_plus(video_info['author'][0])
# uploader_id # uploader_id
@ -1511,7 +1511,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
elif len(video_info.get('url_encoded_fmt_stream_map', [''])[0]) >= 1 or len(video_info.get('adaptive_fmts', [''])[0]) >= 1: elif len(video_info.get('url_encoded_fmt_stream_map', [''])[0]) >= 1 or len(video_info.get('adaptive_fmts', [''])[0]) >= 1:
encoded_url_map = video_info.get('url_encoded_fmt_stream_map', [''])[0] + ',' + video_info.get('adaptive_fmts', [''])[0] encoded_url_map = video_info.get('url_encoded_fmt_stream_map', [''])[0] + ',' + video_info.get('adaptive_fmts', [''])[0]
if 'rtmpe%3Dyes' in encoded_url_map: if 'rtmpe%3Dyes' in encoded_url_map:
raise ExtractorError('rtmpe downloads are not supported, see https://github.com/rg3/youtube-dl/issues/343 for more information.', expected=True) raise ExtractorError('rtmpe downloads are not supported, see https://github.com/rg3/youtube-dl/issues/343 for more information.', expected=True, video_id=video_id)
formats_spec = {} formats_spec = {}
fmt_list = video_info.get('fmt_list', [''])[0] fmt_list = video_info.get('fmt_list', [''])[0]
if fmt_list: if fmt_list:
@ -1650,8 +1650,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
r'(?s)<h1[^>]+id="unavailable-message"[^>]*>(.+?)</h1>', r'(?s)<h1[^>]+id="unavailable-message"[^>]*>(.+?)</h1>',
video_webpage, 'unavailable message', default=None) video_webpage, 'unavailable message', default=None)
if unavailable_message: if unavailable_message:
raise ExtractorError(unavailable_message, expected=True) raise ExtractorError(unavailable_message, expected=True, video_id=video_id)
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', video_id=video_id)
# Look for the DASH manifest # Look for the DASH manifest
if self._downloader.params.get('youtube_include_dash_manifest', True): if self._downloader.params.get('youtube_include_dash_manifest', True):