aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaimemf93@gmail.com>2013-03-30 14:11:33 +0100
committerJaime Marquínez Ferrándiz <jaimemf93@gmail.com>2013-03-30 14:11:33 +0100
commit0fb375640990d5f1038000dc7937cd6cba6dfeb2 (patch)
tree21b806028663c40ff083a87258ba4469c6668358
parentfbbdf475b1a534389585d696db5e6c8b3fd212fb (diff)
downloadyoutube-dl-0fb375640990d5f1038000dc7937cd6cba6dfeb2.tar.xz
Fix crash when subtitles are not found
-rwxr-xr-xyoutube_dl/InfoExtractors.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 2881ae67c..71f57b7c9 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -282,8 +282,14 @@ class YoutubeIE(InfoExtractor):
return (None, sub_lang, sub)
def _extract_subtitle(self, video_id):
+ """
+ Return a list with a tuple:
+ [(error_message, sub_lang, sub)]
+ """
sub_lang_list = self._get_available_subtitles(video_id)
sub_format = self._downloader.params.get('subtitlesformat')
+ if isinstance(sub_lang_list,tuple): #There was some error, it didn't get the available subtitles
+ return [(sub_lang_list[0], None, None)]
if self._downloader.params.get('subtitleslang', False):
sub_lang = self._downloader.params.get('subtitleslang')
elif 'en' in sub_lang_list:
@@ -291,7 +297,7 @@ class YoutubeIE(InfoExtractor):
else:
sub_lang = list(sub_lang_list.keys())[0]
if not sub_lang in sub_lang_list:
- return (u'WARNING: no closed captions found in the specified language "%s"' % sub_lang, None)
+ return [(u'WARNING: no closed captions found in the specified language "%s"' % sub_lang, None, None)]
subtitle = self._request_subtitle(sub_lang, sub_lang_list[sub_lang].encode('utf-8'), video_id, sub_format)
return [subtitle]