mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Wimp] Use new URL relay method

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-01-22 02:01:23 +01:00
parent 99f770caa8
commit 2250865fb0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
youtube_dl/extractor/wimp.py
View File

@ -1,5 +1,6 @@
from __future__ import unicode_literals
import re import re
import base64
from .common import InfoExtractor from .common import InfoExtractor
@ -7,12 +8,12 @@ from .common import InfoExtractor
class WimpIE(InfoExtractor): class WimpIE(InfoExtractor):
_VALID_URL = r'(?:http://)?(?:www\.)?wimp\.com/([^/]+)/' _VALID_URL = r'(?:http://)?(?:www\.)?wimp\.com/([^/]+)/'
_TEST = { _TEST = {
u'url': u'http://www.wimp.com/deerfence/', 'url': 'http://www.wimp.com/deerfence/',
u'file': u'deerfence.flv', 'file': 'deerfence.flv',
u'md5': u'8b215e2e0168c6081a1cf84b2846a2b5', 'md5': '8b215e2e0168c6081a1cf84b2846a2b5',
u'info_dict': { 'info_dict': {
u"title": u"Watch Till End: Herd of deer jump over a fence.", "title": "Watch Till End: Herd of deer jump over a fence.",
u"description": u"These deer look as fluid as running water when they jump over this fence as a herd. This video is one that needs to be watched until the very end for the true majesty to be witnessed, but once it comes, it's sure to take your breath away.", "description": "These deer look as fluid as running water when they jump over this fence as a herd. This video is one that needs to be watched until the very end for the true majesty to be witnessed, but once it comes, it's sure to take your breath away.",
} }
} }
@ -20,13 +21,12 @@ class WimpIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group(1) video_id = mobj.group(1)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
googleString = self._search_regex("googleCode = '(.*?)'", webpage, 'file url') video_url = self._search_regex(
googleString = base64.b64decode(googleString).decode('ascii') r's1\.addVariable\("file",\s*"([^"]+)"\);', webpage, 'video URL')
final_url = self._search_regex('","(.*?)"', googleString, u'final video url')
return { return {
'id': video_id, 'id': video_id,
'url': final_url, 'url': video_url,
'title': self._og_search_title(webpage), 'title': self._og_search_title(webpage),
'thumbnail': self._og_search_thumbnail(webpage), 'thumbnail': self._og_search_thumbnail(webpage),
'description': self._og_search_description(webpage), 'description': self._og_search_description(webpage),