|
|
@ -85,7 +85,7 @@ class TEDIE(SubtitlesInfoExtractor):
|
|
|
|
'ext': 'mp4',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'url': stream['file'],
|
|
|
|
'url': stream['file'],
|
|
|
|
'format': stream['id']
|
|
|
|
'format': stream['id']
|
|
|
|
} for stream in info['htmlStreams']]
|
|
|
|
} for stream in info['htmlStreams']]
|
|
|
|
|
|
|
|
|
|
|
|
video_id = info['id']
|
|
|
|
video_id = info['id']
|
|
|
|
|
|
|
|
|
|
|
@ -95,7 +95,7 @@ class TEDIE(SubtitlesInfoExtractor):
|
|
|
|
self._list_available_subtitles(video_id, webpage)
|
|
|
|
self._list_available_subtitles(video_id, webpage)
|
|
|
|
return
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
info = {
|
|
|
|
return {
|
|
|
|
'id': video_id,
|
|
|
|
'id': video_id,
|
|
|
|
'title': title,
|
|
|
|
'title': title,
|
|
|
|
'thumbnail': thumbnail,
|
|
|
|
'thumbnail': thumbnail,
|
|
|
@ -104,11 +104,6 @@ class TEDIE(SubtitlesInfoExtractor):
|
|
|
|
'formats': formats,
|
|
|
|
'formats': formats,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# TODO: Remove when #980 has been merged
|
|
|
|
|
|
|
|
info.update(info['formats'][-1])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return info
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _get_available_subtitles(self, video_id, webpage):
|
|
|
|
def _get_available_subtitles(self, video_id, webpage):
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
options = self._search_regex(r'(?:<select name="subtitles_language_select" id="subtitles_language_select">)(.*?)(?:</select>)', webpage, 'subtitles_language_select', flags=re.DOTALL)
|
|
|
|
options = self._search_regex(r'(?:<select name="subtitles_language_select" id="subtitles_language_select">)(.*?)(?:</select>)', webpage, 'subtitles_language_select', flags=re.DOTALL)
|
|
|
|