X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fwimp.py;h=c27dda9440e62274e13b9359f24c2a909516b4bc;hb=ad3bc6acd5d6724875b9fa59f9b5cdb9b904ec91;hp=b9c3b13f918f5fbffa73010cbefb46543dac9586;hpb=6f5ac90cf314e8e1a7c5c416fb51e3a7b8483e9c;p=youtube-dl
diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index b9c3b13f9..c27dda944 100644
--- a/youtube_dl/extractor/wimp.py
+++ b/youtube_dl/extractor/wimp.py
@@ -1,36 +1,55 @@
+from __future__ import unicode_literals
+
import re
-import base64
from .common import InfoExtractor
+from .youtube import YoutubeIE
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."
+ _VALID_URL = r'http://(?:www\.)?wimp\.com/([^/]+)/'
+ _TESTS = [{
+ 'url': 'http://www.wimp.com/maruexhausted/',
+ 'md5': 'f1acced123ecb28d9bb79f2479f2b6a1',
+ 'info_dict': {
+ 'id': 'maruexhausted',
+ 'ext': 'flv',
+ 'title': 'Maru is exhausted.',
+ 'description': 'md5:57e099e857c0a4ea312542b684a869b8',
}
- }
+ }, {
+ # youtube video
+ 'url': 'http://www.wimp.com/clowncar/',
+ 'info_dict': {
+ 'id': 'cG4CEr2aiSg',
+ 'ext': 'mp4',
+ 'title': 'Basset hound clown car...incredible!',
+ 'description': 'md5:8d228485e0719898c017203f900b3a35',
+ 'uploader': 'Gretchen Hoey',
+ 'uploader_id': 'gretchenandjeff1',
+ 'upload_date': '20140303',
+ },
+ 'add_ie': ['Youtube'],
+ }]
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(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,
- 'ext': ext,
- 'title': title,
- 'thumbnail': thumbnail_url,
- }]
+ video_url = self._search_regex(
+ r's1\.addVariable\("file",\s*"([^"]+)"\);', webpage, 'video URL')
+ if YoutubeIE.suitable(video_url):
+ self.to_screen('Found YouTube video')
+ return {
+ '_type': 'url',
+ 'url': video_url,
+ 'ie_key': YoutubeIE.ie_key(),
+ }
+ 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),
+ }