X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvzaar.py;h=b7d02fca3ac426679b21f2ba7213e2ac6fdb701b;hb=HEAD;hp=b43975eadb7b2b64b19aff088b5af1d834dd8d0f;hpb=6797de75e059ec02ed91548ec8bfed8c89578344;p=youtube-dl

diff --git a/youtube_dl/extractor/vzaar.py b/youtube_dl/extractor/vzaar.py
index b43975ead..b7d02fca3 100644
--- a/youtube_dl/extractor/vzaar.py
+++ b/youtube_dl/extractor/vzaar.py
@@ -34,12 +34,15 @@ class VzaarIE(InfoExtractor):
         },
     }, {
         # hlsAes = true
-        'url': 'https://view.vzaar.com/10165560/player',
-        'md5': '5f66f121fb28b9d16cce3d4f3df7e72e',
+        'url': 'https://view.vzaar.com/11379930/player',
         'info_dict': {
-            'id': '10165560',
+            'id': '11379930',
             'ext': 'mp4',
-            'title': 'Video Demo vzaar Secure.mp4',
+            'title': 'Videoaula',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
         },
     }, {
         # with null videoTitle
@@ -87,12 +90,15 @@ class VzaarIE(InfoExtractor):
         usp = video_data.get('usp')
         if video_data.get('uspEnabled') and isinstance(video_guid, compat_str) and isinstance(usp, dict):
             hls_aes = video_data.get('hlsAes')
-            m3u8_url = ('http://fable.vzaar.com/v5/usp%s/%s/%s.ism/.m3u8?'
-                        % ('aes' if hls_aes else '', video_guid, video_id)) + '&'.join(
-                '%s=%s' % (k, v) for k, v in usp.items())
-            formats.extend(self._extract_m3u8_formats(
-                m3u8_url, video_id, 'mp4', 'm3u8' if hls_aes else 'm3u8_native',
-                m3u8_id='hls', fatal=False))
+            qs = '&'.join('%s=%s' % (k, v) for k, v in usp.items())
+            url_templ = 'http://%%s.vzaar.com/v5/usp%s/%s/%s.ism%%s?' % ('aes' if hls_aes else '', video_guid, video_id)
+            m3u8_formats = self._extract_m3u8_formats(
+                url_templ % ('fable', '/.m3u8') + qs, video_id, 'mp4', 'm3u8_native',
+                m3u8_id='hls', fatal=False)
+            if hls_aes:
+                for f in m3u8_formats:
+                    f['_decryption_key_url'] = url_templ % ('goose', '') + qs
+            formats.extend(m3u8_formats)
 
         self._sort_formats(formats)