X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fwimp.py;h=b9c3b13f918f5fbffa73010cbefb46543dac9586;hb=a93cc0d9435fca79787369d3670fce0742ae47ef;hp=9ff5112a6bf94a3feaba708f67638110c6e55a75;hpb=f64e7695a174b597d62a7cd6211d69b5b0f0d0a0;p=youtube-dl

diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index 9ff5112a6..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 = self._search_regex('\<meta name\="description" content="(.+?)" \/\>',webpage, 'video title')
-        thumbnail_url = self._search_regex('\<meta property\=\"og\:image" content\=\"(.+?)\" />',webpage,'video thumbnail')
-        googleString = self._search_regex("googleCode = '(.*?)'", webpage,'file url')
-        googleString = base64.b64decode(googleString)
-        final_url = self._search_regex(b'","(.*?)"', googleString,'final video url')
-        ext = final_url.split('.')[-1]
+        title = self._search_regex(r'<meta name="description" content="(.+?)" />',webpage, 'video title')
+        thumbnail_url = self._search_regex(r'<meta property="og\:image" content="(.+?)" />', 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,