gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3461 from tinybug/patch-2

Browse source 
Update vube.py
This commit is contained in:
Sergey M. 2014-08-07 19:14:48 +07:00
parent cccfab6412 d42b2d2985
commit d9760fd43c
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
youtube_dl/extractor/vube.py
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)