Imported Upstream version 2014.07.15

[youtubedl] / youtube_dl / extractor / wistia.py

diff --git a/youtube_dl/extractor/wistia.py b/youtube_dl/extractor/wistia.py
index e1748c2613bbcf94bb36b706ce7ddfdde6b2b86c..e6bfa9e147a2b62e6dbcdd52343675bb9ca52a65 100644 (file)
--- a/youtube_dl/extractor/wistia.py
+++ b/youtube_dl/extractor/wistia.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+

 import json
 import re
 
 import json
 import re
 


@@ -5,14 +7,16 @@ from .common import InfoExtractor
 
 
 class WistiaIE(InfoExtractor):
 
 
 class WistiaIE(InfoExtractor):

-    _VALID_URL = r'^https?://(?:fast\.)?wistia\.net/embed/iframe/(?P<id>[a-z0-9]+)'
+    _VALID_URL = r'https?://(?:fast\.)?wistia\.net/embed/iframe/(?P<id>[a-z0-9]+)'

 
     _TEST = {
 
     _TEST = {

-        u"url": u"http://fast.wistia.net/embed/iframe/sh7fpupwlt",
-        u"file": u"sh7fpupwlt.mov",
-        u"md5": u"cafeb56ec0c53c18c97405eecb3133df",
-        u"info_dict": {
-            u"title": u"cfh_resourceful_zdkh_final_1"
+        'url': 'http://fast.wistia.net/embed/iframe/sh7fpupwlt',
+        'md5': 'cafeb56ec0c53c18c97405eecb3133df',
+        'info_dict': {
+            'id': 'sh7fpupwlt',
+            'ext': 'mov',
+            'title': 'Being Resourceful',
+            'duration': 117,

         },
     }
 
         },
     }
 


@@ -22,7 +26,7 @@ class WistiaIE(InfoExtractor):
 
         webpage = self._download_webpage(url, video_id)
         data_json = self._html_search_regex(
 
         webpage = self._download_webpage(url, video_id)
         data_json = self._html_search_regex(

-            r'Wistia.iframeInit\((.*?), {}\);', webpage, u'video data')
+            r'Wistia\.iframeInit\((.*?), {}\);', webpage, 'video data')

 
         data = json.loads(data_json)
 
 
         data = json.loads(data_json)
 


@@ -44,12 +48,15 @@ class WistiaIE(InfoExtractor):
                 'height': a['height'],
                 'filesize': a['size'],
                 'ext': a['ext'],
                 'height': a['height'],
                 'filesize': a['size'],
                 'ext': a['ext'],

+                'preference': 1 if atype == 'original' else None,

             })
             })

-        formats.sort(key=lambda a: a['filesize'])
+
+        self._sort_formats(formats)

 
         return {
             'id': video_id,
             'title': data['name'],
             'formats': formats,
             'thumbnails': thumbnails,
 
         return {
             'id': video_id,
             'title': data['name'],
             'formats': formats,
             'thumbnails': thumbnails,

+            'duration': data.get('duration'),

         }
         }