X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fwimp.py;h=c27dda9440e62274e13b9359f24c2a909516b4bc;hb=af8812bb9b50586dd228c624b1bc569639070254;hp=9d52c947ea4c96a011f612877b5bdc4e9c7b1826;hpb=405ec05cb2a1bb1ce27353a831924c17f57b86f4;p=youtube-dl.git
diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index 9d52c947e..c27dda944 100644
--- a/youtube_dl/extractor/wimp.py
+++ b/youtube_dl/extractor/wimp.py
@@ -1,25 +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/([^/]+)/'
+ _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 = 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]
- 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),
+ }