瀏覽代碼

[npo] Fix subtitles (Closes #3638)

Sergey M․ 10 年之前
父節點
當前提交
9e91449c8d
共有 1 個文件被更改,包括 8 次插入5 次删除
  1. 8 5
      youtube_dl/extractor/npo.py

+ 8 - 5
youtube_dl/extractor/npo.py

@@ -159,14 +159,17 @@ class NPOIE(NPOBaseIE):
                     'quality': stream.get('kwaliteit'),
                     '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['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 {
         return {
             'id': video_id,
             'id': video_id,