浏览代码

[viewster] reduce format requests

Remita Amine 6 年之前
父节点
当前提交
7d9e858132
共有 1 个文件被更改,包括 10 次插入10 次删除
  1. 10 10
      youtube_dl/extractor/viewster.py

+ 10 - 10
youtube_dl/extractor/viewster.py

@@ -130,16 +130,16 @@ class ViewsterIE(InfoExtractor):
             def concat(suffix, sep='-'):
             def concat(suffix, sep='-'):
                 return (base_format_id + '%s%s' % (sep, suffix)) if base_format_id else suffix
                 return (base_format_id + '%s%s' % (sep, suffix)) if base_format_id else suffix
 
 
-            for media_type in ('application/f4m+xml', 'application/x-mpegURL', 'video/mp4'):
-                media = self._download_json(
-                    'https://public-api.viewster.com/movies/%s/video' % entry_id,
-                    video_id, 'Downloading %s JSON' % concat(media_type, ' '), fatal=False, query={
-                        'mediaType': media_type,
-                        'language': audio,
-                        'subtitle': subtitle,
-                    })
-                if not media:
-                    continue
+            medias = self._download_json(
+                'https://public-api.viewster.com/movies/%s/videos' % entry_id,
+                video_id, fatal=False, query={
+                    'mediaTypes': ['application/f4m+xml', 'application/x-mpegURL', 'video/mp4'],
+                    'language': audio,
+                    'subtitle': subtitle,
+                })
+            if not medias:
+                continue
+            for media in medias:
                 video_url = media.get('Uri')
                 video_url = media.get('Uri')
                 if not video_url:
                 if not video_url:
                     continue
                     continue