Merge pull request #3461 from tinybug/patch-2

Update vube.py
This commit is contained in:
Sergey M. 2014-08-07 19:14:48 +07:00
commit d9760fd43c

View file

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