Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-12 01:12:56 +08:00
Code Issues Releases Wiki Activity

fix #1213 by returning an empty dictionary if there is no subtitle.

Browse Source
This commit is contained in:
Géraud Le Falher 2013-08-10 02:12:06 +02:00
parent 0f399e6e5e
commit 577dae1dfa
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/extractor/youtube.py
View File

@ -287,6 +287,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
}, },
}, },
] ]
_subtitle_error_message = u''
@classmethod @classmethod
@ -375,12 +376,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
try: try:
sub_list = compat_urllib_request.urlopen(request).read().decode('utf-8') sub_list = compat_urllib_request.urlopen(request).read().decode('utf-8')
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err: except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
return (u'unable to download video subtitles: %s' % compat_str(err), None) self._subtitle_error_message = u'unable to download video subtitles: %s' % compat_str(err)
return {}
sub_lang_list = re.findall(r'name="([^"]*)"[^>]+lang_code="([\w\-]+)"', sub_list) sub_lang_list = re.findall(r'name="([^"]*)"[^>]+lang_code="([\w\-]+)"', sub_list)
sub_lang_list = dict((l[1], l[0]) for l in sub_lang_list) if len(sub_lang_list) == 0:
if not sub_lang_list: self._subtitle_error_message = u'video doesn\'t have subtitles'
return (u'video doesn\'t have subtitles', None) return dict((l[1], l[0]) for l in sub_lang_list)
return sub_lang_list
def _list_available_subtitles(self, video_id): def _list_available_subtitles(self, video_id):
sub_lang_list = self._get_available_subtitles(video_id) sub_lang_list = self._get_available_subtitles(video_id)
@ -442,8 +443,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
""" """
sub_lang_list = self._get_available_subtitles(video_id) sub_lang_list = self._get_available_subtitles(video_id)
sub_format = self._downloader.params.get('subtitlesformat') sub_format = self._downloader.params.get('subtitlesformat')
if isinstance(sub_lang_list,tuple): #There was some error, it didn't get the available subtitles if not sub_lang_list: #There was some error, it didn't get the available subtitles
return [(sub_lang_list[0], None, None)] return [(self._subtitle_error_message, None, None)]
if self._downloader.params.get('subtitleslang', False): if self._downloader.params.get('subtitleslang', False):
sub_lang = self._downloader.params.get('subtitleslang') sub_lang = self._downloader.params.get('subtitleslang')
elif 'en' in sub_lang_list: elif 'en' in sub_lang_list:
@ -459,8 +460,9 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
def _extract_all_subtitles(self, video_id): def _extract_all_subtitles(self, video_id):
sub_lang_list = self._get_available_subtitles(video_id) sub_lang_list = self._get_available_subtitles(video_id)
sub_format = self._downloader.params.get('subtitlesformat') sub_format = self._downloader.params.get('subtitlesformat')
if isinstance(sub_lang_list,tuple): #There was some error, it didn't get the available subtitles if not sub_lang_list: #There was some error, it didn't get the available subtitles
return [(sub_lang_list[0], None, None)] print(self._subtitle_error_message)
return [(self._subtitle_error_message, None, None)]
subtitles = [] subtitles = []
for sub_lang in sub_lang_list: for sub_lang in sub_lang_list:
subtitle = self._request_subtitle(sub_lang, sub_lang_list[sub_lang].encode('utf-8'), video_id, sub_format) subtitle = self._request_subtitle(sub_lang, sub_lang_list[sub_lang].encode('utf-8'), video_id, sub_format)