X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fwimp.py;h=b9c3b13f918f5fbffa73010cbefb46543dac9586;hb=b5ba7b9dcfed5ded96c841a0ebbbf12132de838f;hp=9d52c947ea4c96a011f612877b5bdc4e9c7b1826;hpb=d1bd37deac4fb61b350ba488bdbdf230aa0b335c;p=youtube-dl.git
diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index 9d52c947e..b9c3b13f9 100644
--- a/youtube_dl/extractor/wimp.py
+++ b/youtube_dl/extractor/wimp.py
@@ -1,21 +1,31 @@
import re
import base64
+
from .common import InfoExtractor
class WimpIE(InfoExtractor):
_VALID_URL = r'(?:http://)?(?:www\.)?wimp\.com/([^/]+)/'
+ _TEST = {
+ u'url': u'http://www.wimp.com/deerfence/',
+ u'file': u'deerfence.flv',
+ u'md5': u'8b215e2e0168c6081a1cf84b2846a2b5',
+ u'info_dict': {
+ u"title": u"Watch Till End: Herd of deer jump over a fence."
+ }
+ }
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 = 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)
- ext = final_url.split('.')[-1]
+ 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.rpartition(u'.')[2]
+
return [{
'id': video_id,
'url': final_url,
@@ -23,3 +33,4 @@ class WimpIE(InfoExtractor):
'title': title,
'thumbnail': thumbnail_url,
}]
+