X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fwimp.py;h=79fd53e0c8e85daae8efd86b70dc1302c1c0a629;hb=84769e708c81a1600ff24e7140c889fefc4aa6ef;hp=a548e0fa0668c154a7b3a36f48fe192d11c4e4d7;hpb=b1dfdc51b1062f8e6c5a3270ec04fbf18cd5a867;p=youtube-dl diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py index a548e0fa0..79fd53e0c 100644 --- a/youtube_dl/extractor/wimp.py +++ b/youtube_dl/extractor/wimp.py @@ -1,26 +1,34 @@ +from __future__ import unicode_literals + import re -import base64 + from .common import InfoExtractor class WimpIE(InfoExtractor): - _VALID_URL = r'(?:http://)?(?:www\.)?wimp\.com/([^/]+)/' + _VALID_URL = r'http://(?:www\.)?wimp\.com/([^/]+)/' + _TEST = { + 'url': 'http://www.wimp.com/maruexhausted/', + 'md5': 'f1acced123ecb28d9bb79f2479f2b6a1', + 'info_dict': { + 'id': 'maruexhausted', + 'ext': 'flv', + 'title': 'Maru is exhausted.', + 'description': 'md5:57e099e857c0a4ea312542b684a869b8', + } + } def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) video_id = mobj.group(1) webpage = self._download_webpage(url, video_id) - title = self._search_regex('\',webpage, 'video title') - thumbnail_url = self._search_regex('\',webpage,'video thumbnail') - googleString = self._search_regex("googleCode = '(.*?)'", webpage,'file url') - googleString = base64.b64decode(googleString).decode('ascii') - final_url = self._search_regex('","(.*?)"', googleString,'final video url') - ext = final_url.split('.')[-1] - return [{ - 'id': video_id, - 'url': final_url, - 'ext': ext, - 'title': title, - 'thumbnail': thumbnail_url, - }] + video_url = self._search_regex( + r's1\.addVariable\("file",\s*"([^"]+)"\);', webpage, 'video URL') + return { + 'id': video_id, + 'url': video_url, + 'title': self._og_search_title(webpage), + 'thumbnail': self._og_search_thumbnail(webpage), + 'description': self._og_search_description(webpage), + } \ No newline at end of file