X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fwimp.py;h=9a6bb0c768a046e96bac0aa3dd39875821119e83;hb=58d915df51ce1db2eacdf1ded02fa9338b565a6f;hp=a548e0fa0668c154a7b3a36f48fe192d11c4e4d7;hpb=b1dfdc51b1062f8e6c5a3270ec04fbf18cd5a867;p=youtube-dl.git
diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index a548e0fa0..9a6bb0c76 100644
--- a/youtube_dl/extractor/wimp.py
+++ b/youtube_dl/extractor/wimp.py
@@ -1,26 +1,33 @@
+from __future__ import unicode_literals
+
import re
-import base64
+
from .common import InfoExtractor
class WimpIE(InfoExtractor):
_VALID_URL = r'(?:http://)?(?:www\.)?wimp\.com/([^/]+)/'
+ _TEST = {
+ 'url': 'http://www.wimp.com/deerfence/',
+ 'file': 'deerfence.flv',
+ 'md5': '8b215e2e0168c6081a1cf84b2846a2b5',
+ 'info_dict': {
+ "title": "Watch Till End: Herd of deer jump over a fence.",
+ "description": "These deer look as fluid as running water when they jump over this fence as a herd. This video is one that needs to be watched until the very end for the true majesty to be witnessed, but once it comes, it's sure to take your breath away.",
+ }
+ }
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('\',webpage, 'video title')
- thumbnail_url = self._search_regex('\',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]
- 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),
+ }