X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fwimp.py;h=84f065a3df97c4d4b1c40c37cac5d4494d6ff8f6;hb=ed92bc9f6e402434e6d69d2947739d0c4151d77e;hp=a548e0fa0668c154a7b3a36f48fe192d11c4e4d7;hpb=b1dfdc51b1062f8e6c5a3270ec04fbf18cd5a867;p=youtube-dl diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py index a548e0fa0..84f065a3d 100644 --- a/youtube_dl/extractor/wimp.py +++ b/youtube_dl/extractor/wimp.py @@ -1,5 +1,6 @@ import re import base64 + from .common import InfoExtractor @@ -10,12 +11,13 @@ class WimpIE(InfoExtractor): 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') + title = self._search_regex(r'',webpage, 'video title') + thumbnail_url = self._search_regex(r'', 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] + ext = final_url.rpartition(u'.')[2] + return [{ 'id': video_id, 'url': final_url,