diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-02-18 17:57:10 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-02-18 17:57:10 +0100 |
| commit | b9b42f2ea0c564f3e75a8f052bfe0dfe21cf320f (patch) | |
| tree | 7fd583ded93fc17a920fced881d383c39b614209 /youtube_dl/extractor/npo.py | |
| parent | 311c39383827e42649a287633a67ef021476d23a (diff) | |
| download | youtube-dl-b9b42f2ea0c564f3e75a8f052bfe0dfe21cf320f.tar.gz youtube-dl-b9b42f2ea0c564f3e75a8f052bfe0dfe21cf320f.tar.xz youtube-dl-b9b42f2ea0c564f3e75a8f052bfe0dfe21cf320f.zip | |
[npo] Convert to new subtitles system
Diffstat (limited to 'youtube_dl/extractor/npo.py')
| -rw-r--r-- | youtube_dl/extractor/npo.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/youtube_dl/extractor/npo.py b/youtube_dl/extractor/npo.py index c075618e8..9c01eb0af 100644 --- a/youtube_dl/extractor/npo.py +++ b/youtube_dl/extractor/npo.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from .subtitles import SubtitlesInfoExtractor from .common import InfoExtractor from ..utils import ( fix_xml_ampersands, @@ -12,7 +11,7 @@ from ..utils import ( ) -class NPOBaseIE(SubtitlesInfoExtractor): +class NPOBaseIE(InfoExtractor): def _get_token(self, video_id): token_page = self._download_webpage( 'http://ida.omroep.nl/npoplayer/i.js', @@ -164,13 +163,10 @@ class NPOIE(NPOBaseIE): subtitles = {} if metadata.get('tt888') == 'ja': - subtitles['nl'] = 'http://e.omroep.nl/tt888/%s' % video_id - - if self._downloader.params.get('listsubtitles', False): - self._list_available_subtitles(video_id, subtitles) - return - - subtitles = self.extract_subtitles(video_id, subtitles) + subtitles['nl'] = [{ + 'ext': 'vtt', + 'url': 'http://e.omroep.nl/tt888/%s' % video_id, + }] return { 'id': video_id, |