Register new version in the changelog.

[youtubedl] / youtube_dl / extractor / wistia.py

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

-import json
-import re
-

 from .common import InfoExtractor
 from .common import InfoExtractor

+from ..compat import compat_urllib_request
+from ..utils import ExtractorError

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

+    _API_URL = 'http://fast.wistia.com/embed/medias/{0:}.json'

 
     _TEST = {
         'url': 'http://fast.wistia.net/embed/iframe/sh7fpupwlt',
 
     _TEST = {
         'url': 'http://fast.wistia.net/embed/iframe/sh7fpupwlt',


@@ -21,14 +21,15 @@ class WistiaIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, video_id)
-        data_json = self._html_search_regex(
-            r'Wistia\.iframeInit\((.*?), {}\);', webpage, 'video data')
-
-        data = json.loads(data_json)
+        video_id = self._match_id(url)
+
+        request = compat_urllib_request.Request(self._API_URL.format(video_id))
+        request.add_header('Referer', url)  # Some videos require this.
+        data_json = self._download_json(request, video_id)
+        if data_json.get('error'):
+            raise ExtractorError('Error while getting the playlist',
+                                 expected=True)
+        data = data_json['media']

 
         formats = []
         thumbnails = []
 
         formats = []
         thumbnails = []