From 405ec05cb2a1bb1ce27353a831924c17f57b86f4 Mon Sep 17 00:00:00 2001 From: "M.Yasoob Khalid" Date: Wed, 26 Jun 2013 15:25:53 +0500 Subject: added an IE for wimp.com --- youtube_dl/extractor/wimp.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 youtube_dl/extractor/wimp.py (limited to 'youtube_dl/extractor/wimp.py') diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py new file mode 100644 index 000000000..9d52c947e --- /dev/null +++ b/youtube_dl/extractor/wimp.py @@ -0,0 +1,25 @@ +import re +import base64 +from .common import InfoExtractor + + +class WimpIE(InfoExtractor): + _VALID_URL = r'(?:http://)?(?:www\.)?wimp\.com/([^/]+)/' + + 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, + }] -- cgit v1.2.3 From 5abeaf06506b35e4c0db315e847ce32843742fe2 Mon Sep 17 00:00:00 2001 From: "M.Yasoob Khalid" Date: Wed, 26 Jun 2013 17:26:59 +0500 Subject: changed wimp.py according to the changes suggested by jaime --- youtube_dl/extractor/wimp.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'youtube_dl/extractor/wimp.py') diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py index 9d52c947e..811b37cc1 100644 --- a/youtube_dl/extractor/wimp.py +++ b/youtube_dl/extractor/wimp.py @@ -10,11 +10,11 @@ class WimpIE(InfoExtractor): 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) + 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) + final_url = self._search_regex('","(.*?)"', googleString,'final video url') ext = final_url.split('.')[-1] return [{ 'id': video_id, @@ -23,3 +23,4 @@ class WimpIE(InfoExtractor): 'title': title, 'thumbnail': thumbnail_url, }] + -- cgit v1.2.3 From f64e7695a174b597d62a7cd6211d69b5b0f0d0a0 Mon Sep 17 00:00:00 2001 From: "M.Yasoob Khalid" Date: Wed, 26 Jun 2013 18:46:05 +0500 Subject: added b'' to my regex expression in order to solve the error on python 3 --- youtube_dl/extractor/wimp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'youtube_dl/extractor/wimp.py') diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py index 811b37cc1..9ff5112a6 100644 --- a/youtube_dl/extractor/wimp.py +++ b/youtube_dl/extractor/wimp.py @@ -14,7 +14,7 @@ class WimpIE(InfoExtractor): thumbnail_url = self._search_regex('\',webpage,'video thumbnail') googleString = self._search_regex("googleCode = '(.*?)'", webpage,'file url') googleString = base64.b64decode(googleString) - final_url = self._search_regex('","(.*?)"', googleString,'final video url') + final_url = self._search_regex(b'","(.*?)"', googleString,'final video url') ext = final_url.split('.')[-1] return [{ 'id': video_id, -- cgit v1.2.3 From b1dfdc51b1062f8e6c5a3270ec04fbf18cd5a867 Mon Sep 17 00:00:00 2001 From: "M.Yasoob Khalid" Date: Wed, 26 Jun 2013 19:41:55 +0500 Subject: added .decode('ascii') --- youtube_dl/extractor/wimp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'youtube_dl/extractor/wimp.py') diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py index 9ff5112a6..a548e0fa0 100644 --- a/youtube_dl/extractor/wimp.py +++ b/youtube_dl/extractor/wimp.py @@ -13,8 +13,8 @@ class WimpIE(InfoExtractor): 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) - final_url = self._search_regex(b'","(.*?)"', googleString,'final video 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, -- cgit v1.2.3