mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-05 18:39:37 +02:00
changed YouTube closed captions URL; closes #382
This commit is contained in:
parent
363a4e1114
commit
dee5d76923
BIN
youtube-dl
BIN
youtube-dl
Binary file not shown.
BIN
youtube-dl.exe
BIN
youtube-dl.exe
Binary file not shown.
@ -366,7 +366,8 @@ def _real_extract(self, url):
|
||||
srt_list = urllib2.urlopen(request).read()
|
||||
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
|
||||
raise Trouble(u'WARNING: unable to download video subtitles: %s' % str(err))
|
||||
srt_lang_list = re.findall(r'lang_code="([\w\-]+)"', srt_list)
|
||||
srt_lang_list = re.findall(r'name="([^"]*)"[^>]+lang_code="([\w\-]+)"', srt_list)
|
||||
srt_lang_list = dict((l[1], l[0]) for l in srt_lang_list)
|
||||
if not srt_lang_list:
|
||||
raise Trouble(u'WARNING: video has no closed captions')
|
||||
if self._downloader.params.get('subtitleslang', False):
|
||||
@ -374,14 +375,16 @@ def _real_extract(self, url):
|
||||
elif 'en' in srt_lang_list:
|
||||
srt_lang = 'en'
|
||||
else:
|
||||
srt_lang = srt_lang_list[0]
|
||||
srt_lang = srt_lang_list.keys()[0]
|
||||
if not srt_lang in srt_lang_list:
|
||||
raise Trouble(u'WARNING: no closed captions found in the specified language')
|
||||
request = urllib2.Request('http://video.google.com/timedtext?hl=en&lang=%s&v=%s' % (srt_lang, video_id))
|
||||
request = urllib2.Request('http://www.youtube.com/api/timedtext?lang=%s&name=%s&v=%s' % (srt_lang, srt_lang_list[srt_lang], video_id))
|
||||
try:
|
||||
srt_xml = urllib2.urlopen(request).read()
|
||||
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
|
||||
raise Trouble(u'WARNING: unable to download video subtitles: %s' % str(err))
|
||||
if not srt_xml:
|
||||
raise Trouble(u'WARNING: unable to download video subtitles')
|
||||
video_subtitles = self._closed_captions_xml_to_srt(srt_xml.decode('utf-8'))
|
||||
except Trouble as trouble:
|
||||
self._downloader.trouble(trouble[0])
|
||||
|
Loading…
Reference in New Issue
Block a user