浏览代码

[youtube] Fix automatic captions

Sergey M․ 9 年之前
父节点
当前提交
23d17e4beb
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      youtube_dl/extractor/youtube.py

+ 3 - 2
youtube_dl/extractor/youtube.py

@@ -369,6 +369,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         # RTMP (unnamed)
         # RTMP (unnamed)
         '_rtmp': {'protocol': 'rtmp'},
         '_rtmp': {'protocol': 'rtmp'},
     }
     }
+    _SUBTITLE_FORMATS = ('ttml', 'vtt')
 
 
     IE_NAME = 'youtube'
     IE_NAME = 'youtube'
     _TESTS = [
     _TESTS = [
@@ -918,7 +919,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             if lang in sub_lang_list:
             if lang in sub_lang_list:
                 continue
                 continue
             sub_formats = []
             sub_formats = []
-            for ext in ['ttml', 'vtt']:
+            for ext in self._SUBTITLE_FORMATS:
                 params = compat_urllib_parse.urlencode({
                 params = compat_urllib_parse.urlencode({
                     'lang': lang,
                     'lang': lang,
                     'v': video_id,
                     'v': video_id,
@@ -988,7 +989,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             for lang_node in caption_list.findall('target'):
             for lang_node in caption_list.findall('target'):
                 sub_lang = lang_node.attrib['lang_code']
                 sub_lang = lang_node.attrib['lang_code']
                 sub_formats = []
                 sub_formats = []
-                for ext in ['sbv', 'vtt', 'srt']:
+                for ext in self._SUBTITLE_FORMATS:
                     params = compat_urllib_parse.urlencode({
                     params = compat_urllib_parse.urlencode({
                         'lang': original_lang,
                         'lang': original_lang,
                         'tlang': sub_lang,
                         'tlang': sub_lang,