From: M.Yasoob Khalid Date: Wed, 26 Jun 2013 12:26:59 +0000 (+0500) Subject: changed wimp.py according to the changes suggested by jaime X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=5abeaf06506b35e4c0db315e847ce32843742fe2;p=youtube-dl changed wimp.py according to the changes suggested by jaime --- diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py index 9d52c947e..811b37cc1 100644 --- a/youtube_dl/extractor/wimp.py +++ b/youtube_dl/extractor/wimp.py @@ -10,11 +10,11 @@ class WimpIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) video_id = mobj.group(1) webpage = self._download_webpage(url, video_id) - title = re.search('\',webpage).group(1) - thumbnail_url = re.search('\',webpage).group(1) - googleString = re.search("googleCode = '(.*?)'", webpage) - googleString = base64.b64decode(googleString.group(1)) - final_url = re.search('","(.*?)"', googleString).group(1) + 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) + final_url = self._search_regex('","(.*?)"', googleString,'final video url') ext = final_url.split('.')[-1] return [{ 'id': video_id, @@ -23,3 +23,4 @@ class WimpIE(InfoExtractor): 'title': title, 'thumbnail': thumbnail_url, }] +