projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'duncankl/airmozilla'
[youtube-dl]
/
youtube_dl
/
extractor
/
ted.py
diff --git
a/youtube_dl/extractor/ted.py
b/youtube_dl/extractor/ted.py
index 59678399d5c5ba17894e557830e4c1d3e3236fab..4cec06f8bd6e2a18ac3062e916225746f5153c93 100644
(file)
--- a/
youtube_dl/extractor/ted.py
+++ b/
youtube_dl/extractor/ted.py
@@
-3,14
+3,14
@@
from __future__ import unicode_literals
import json
import re
import json
import re
-from .
subtitles import Subtitles
InfoExtractor
+from .
common import
InfoExtractor
from ..compat import (
compat_str,
)
from ..compat import (
compat_str,
)
-class TEDIE(
Subtitles
InfoExtractor):
+class TEDIE(InfoExtractor):
_VALID_URL = r'''(?x)
(?P<proto>https?://)
(?P<type>www|embed(?:-ssl)?)(?P<urlmain>\.ted\.com/
_VALID_URL = r'''(?x)
(?P<proto>https?://)
(?P<type>www|embed(?:-ssl)?)(?P<urlmain>\.ted\.com/
@@
-184,11
+184,6
@@
class TEDIE(SubtitlesInfoExtractor):
self._sort_formats(formats)
video_id = compat_str(talk_info['id'])
self._sort_formats(formats)
video_id = compat_str(talk_info['id'])
- # subtitles
- video_subtitles = self.extract_subtitles(video_id, talk_info)
- if self._downloader.params.get('listsubtitles', False):
- self._list_available_subtitles(video_id, talk_info)
- return
thumbnail = talk_info['thumb']
if not thumbnail.startswith('http'):
thumbnail = talk_info['thumb']
if not thumbnail.startswith('http'):
@@
-199,21
+194,25
@@
class TEDIE(SubtitlesInfoExtractor):
'uploader': talk_info['speaker'],
'thumbnail': thumbnail,
'description': self._og_search_description(webpage),
'uploader': talk_info['speaker'],
'thumbnail': thumbnail,
'description': self._og_search_description(webpage),
- 'subtitles':
video_subtitles
,
+ 'subtitles':
self._get_subtitles(video_id, talk_info)
,
'formats': formats,
'duration': talk_info.get('duration'),
}
'formats': formats,
'duration': talk_info.get('duration'),
}
- def _get_
available_
subtitles(self, video_id, talk_info):
+ def _get_subtitles(self, video_id, talk_info):
languages = [lang['languageCode'] for lang in talk_info.get('languages', [])]
if languages:
sub_lang_list = {}
for l in languages:
languages = [lang['languageCode'] for lang in talk_info.get('languages', [])]
if languages:
sub_lang_list = {}
for l in languages:
- url = 'http://www.ted.com/talks/subtitles/id/%s/lang/%s/format/srt' % (video_id, l)
- sub_lang_list[l] = url
+ sub_lang_list[l] = [
+ {
+ 'url': 'http://www.ted.com/talks/subtitles/id/%s/lang/%s/format/%s' % (video_id, l, ext),
+ 'ext': ext,
+ }
+ for ext in ['ted', 'srt']
+ ]
return sub_lang_list
else:
return sub_lang_list
else:
- self._downloader.report_warning('video doesn\'t have subtitles')
return {}
def _watch_info(self, url, name):
return {}
def _watch_info(self, url, name):