youtube-dl

commit d9760fd43ca2ffb956d789dcf9747be1e9d5e40c
parent cccfab64127df3bf8ffa8fd0f4acea786b9ea06a
Author: Sergey M <dstftw@gmail.com>
Date:   Thu,  7 Aug 2014 19:14:48 +0700

Merge pull request #3461 from tinybug/patch-2

Update vube.py
Diffstat:
M
youtube_dl/extractor/vube.py
 | 
8
++------

1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/youtube_dl/extractor/vube.py b/youtube_dl/extractor/vube.py
@@ -71,12 +71,8 @@ class VubeIE(InfoExtractor):
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
 
-        webpage = self._download_webpage(url, video_id)
-        data_json = self._search_regex(
-            r'(?s)window\["(?:tapiVideoData|vubeOriginalVideoData)"\]\s*=\s*(\{.*?\n});\n',
-            webpage, 'video data'
-        )
-        data = json.loads(data_json)
+        json_url = 'http://vube.com/t-api/v1/video/%s?country=US&limit=120&region=US' % video_id
+        data = self._download_json(json_url, video_id)
         video = (
             data.get('video') or
             data)