aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M. <dstftw@gmail.com>2014-08-07 19:14:48 +0700
committerSergey M. <dstftw@gmail.com>2014-08-07 19:14:48 +0700
commitd9760fd43ca2ffb956d789dcf9747be1e9d5e40c (patch)
treee8c145c30459f47c63268856d518b0618140f1e9
parentcccfab64127df3bf8ffa8fd0f4acea786b9ea06a (diff)
parentd42b2d2985f851078226e587fcdc8cdfd7cde435 (diff)
Merge pull request #3461 from tinybug/patch-2
Update vube.py
-rw-r--r--youtube_dl/extractor/vube.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/youtube_dl/extractor/vube.py b/youtube_dl/extractor/vube.py
index f1b9e9a19..109c4b459 100644
--- 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)