fenix
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix encoding in youtube subtitle download (Closes #669)

This commit is contained in:
Philipp Hagemeister 2013-02-05 13:30:02 +01:00
parent 3a9918d37f
commit fb778e66df
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/InfoExtractors.py
View File

@ -264,13 +264,18 @@ class YoutubeIE(InfoExtractor):
srt_lang = list(srt_lang_list.keys())[0] srt_lang = list(srt_lang_list.keys())[0]
if not srt_lang in srt_lang_list: if not srt_lang in srt_lang_list:
return (u'WARNING: no closed captions found in the specified language', None) return (u'WARNING: no closed captions found in the specified language', None)
request = compat_urllib_request.Request('http://www.youtube.com/api/timedtext?lang=%s&name=%s&v=%s' % (srt_lang, srt_lang_list[srt_lang], video_id)) params = compat_urllib_parse.urlencode({
'lang': srt_lang,
'name': srt_lang_list[srt_lang].encode('utf-8'),
'v': video_id,
})
url = 'http://www.youtube.com/api/timedtext?' + params
try: try:
srt_xml = compat_urllib_request.urlopen(request).read().decode('utf-8') srt_xml = compat_urllib_request.urlopen(url).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'WARNING: unable to download video subtitles: %s' % compat_str(err), None) return (u'WARNING: unable to download video subtitles: %s' % compat_str(err), None)
if not srt_xml: if not srt_xml:
return (u'WARNING: unable to download video subtitles', None) return (u'WARNING: Did not fetch video subtitles', None)
return (None, self._closed_captions_xml_to_srt(srt_xml)) return (None, self._closed_captions_xml_to_srt(srt_xml))
def _print_formats(self, formats): def _print_formats(self, formats):