[viewster] extract formats for videos with multiple audios/subtitles

youtube_dl/extractor/viewster.py

@@ -78,11 +78,11 @@ class ViewsterIE(InfoExtractor):
 
     _ACCEPT_HEADER = 'application/json, text/javascript, */*; q=0.01'
 
-    def _download_json(self, url, video_id, note='Downloading JSON metadata', fatal=True):
+    def _download_json(self, url, video_id, note='Downloading JSON metadata', fatal=True, query={}):
         request = sanitized_Request(url)
         request.add_header('Accept', self._ACCEPT_HEADER)
         request.add_header('Auth-token', self._AUTH_TOKEN)
-        return super(ViewsterIE, self)._download_json(request, video_id, note, fatal=fatal)
+        return super(ViewsterIE, self)._download_json(request, video_id, note, fatal=fatal, query=query)
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -117,13 +117,26 @@ class ViewsterIE(InfoExtractor):
             return self.playlist_result(entries, video_id, title, description)
 
         formats = []
+        for language_set in info.get('LanguageSets', []):
             manifest_url = None
             m3u8_formats = []
+            audio = language_set.get('Audio') or ''
+            subtitle = language_set.get('Subtitle') or ''
+            base_format_id = audio
+            if subtitle:
+                base_format_id += '-%s' % subtitle
+
+            def concat(suffix, sep='-'):
+                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?mediaType=%s'
+                    'https://public-api.viewster.com/movies/%s/video' % entry_id,
-                % (entry_id, compat_urllib_parse.quote(media_type)),
+                    video_id, 'Downloading %s JSON' % concat(media_type, ' '), fatal=False, query={
-                video_id, 'Downloading %s JSON' % media_type, fatal=False)
+                        'mediaType': media_type,
+                        'language': audio,
+                        'subtitle': subtitle,
+                    })
                 if not media:
                     continue
                 video_url = media.get('Uri')
@@ -135,11 +148,11 @@ class ViewsterIE(InfoExtractor):
                     video_url += '&' if '?' in video_url else '?'
                     video_url += 'hdcore=3.2.0&plugin=flowplayer-3.2.0.1'
                     formats.extend(self._extract_f4m_formats(
-                    video_url, video_id, f4m_id='hds'))
+                        video_url, video_id, f4m_id=concat('hds')))
                 elif ext == 'm3u8':
                     manifest_url = video_url
                     m3u8_formats = self._extract_m3u8_formats(
-                    video_url, video_id, 'mp4', m3u8_id='hls',
+                        video_url, video_id, 'mp4', m3u8_id=concat('hls'),
                         fatal=False)  # m3u8 sometimes fail
                     if m3u8_formats:
                         formats.extend(m3u8_formats)
@@ -182,7 +195,7 @@ class ViewsterIE(InfoExtractor):
                                 'tbr': q,
                             })
 
-        if not formats and not info.get('LanguageSets') and not info.get('VODSettings'):
+        if not formats and not info.get('VODSettings'):
             self.raise_geo_restricted()
 
         self._sort_formats(formats)