Archives/youtube-dl
2
0
Fork 0
mirror of https://source.netsyms.com/Mirrors/youtube-dl synced 2024-11-03 03:40:20 +00:00
Code Issues Projects Releases Wiki Activity

More fixes on subtitles errors handling

Browse Source
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-03-30 14:17:12 +01:00
parent 0fb3756409
commit 6a205c8876
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/InfoExtractors.py
View File

@ -265,6 +265,10 @@ class YoutubeIE(InfoExtractor):
self.report_video_subtitles_available(video_id, sub_lang_list)
def _request_subtitle(self, sub_lang, sub_name, video_id, format):
"""
Return tuple:
(error_message, sub_lang, sub)
"""
self.report_video_subtitles_request(video_id, sub_lang, format)
params = compat_urllib_parse.urlencode({
'lang': sub_lang,
@ -276,9 +280,9 @@ class YoutubeIE(InfoExtractor):
try:
sub = compat_urllib_request.urlopen(url).read().decode('utf-8')
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
return (u'WARNING: unable to download video subtitles: %s' % compat_str(err), None)
return (u'WARNING: unable to download video subtitles: %s' % compat_str(err), None, None)
if not sub:
return (u'WARNING: Did not fetch video subtitles', None)
return (u'WARNING: Did not fetch video subtitles', None, None)
return (None, sub_lang, sub)
def _extract_subtitle(self, video_id):