diff --git a/youtube_dl/extractor/npo.py b/youtube_dl/extractor/npo.py index 0580461bb..54be06a4e 100644 --- a/youtube_dl/extractor/npo.py +++ b/youtube_dl/extractor/npo.py @@ -159,14 +159,17 @@ class NPOIE(NPOBaseIE): 'quality': stream.get('kwaliteit'), }) - subtitles = {} + self._sort_formats(formats) - tt888 = metadata.get('tt888') - if self._have_to_download_any_subtitles and tt888 == 'ja': + subtitles = {} + if metadata.get('tt888') == 'ja': subtitles['nl'] = 'http://e.omroep.nl/tt888/%s' % video_id - subtitles = self.extract_subtitles(video_id, subtitles) - self._sort_formats(formats) + if self._downloader.params.get('listsubtitles', False): + self._list_available_subtitles(video_id, subtitles) + return + + subtitles = self.extract_subtitles(video_id, subtitles) return { 'id': video_id,