X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fwimp.py;h=79fd53e0c8e85daae8efd86b70dc1302c1c0a629;hb=a9c2896e2252839c2e4801189f10acce7ff6413e;hp=9d52c947ea4c96a011f612877b5bdc4e9c7b1826;hpb=d1bd37deac4fb61b350ba488bdbdf230aa0b335c;p=youtube-dl

diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index 9d52c947e..79fd53e0c 100644
--- a/youtube_dl/extractor/wimp.py
+++ b/youtube_dl/extractor/wimp.py
@@ -1,25 +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 = re.search('\<meta name\="description" content="(.+?)" \/\>',webpage).group(1)
-        thumbnail_url = re.search('\<meta property\=\"og\:image" content\=\"(.+?)\" />',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]
-        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