summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhilipp Hagemeister <[email protected]>2014-01-22 02:01:23 +0100
committerPhilipp Hagemeister <[email protected]>2014-01-22 02:01:39 +0100
commit2250865fb09062418e78d79618fefe8817235488 (patch)
tree47f10a14aa402dbf79254759fd7c0369a44145f0
parent99f770caa8e064358fcc03308e17f347791b25b1 (diff)
downloadyoutube-dl-2250865fb09062418e78d79618fefe8817235488.tar.gz
youtube-dl-2250865fb09062418e78d79618fefe8817235488.zip
[Wimp] Use new URL relay method
-rw-r--r--youtube_dl/extractor/wimp.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/youtube_dl/extractor/wimp.py b/youtube_dl/extractor/wimp.py
index 82a626e0e..9a6bb0c76 100644
--- a/youtube_dl/extractor/wimp.py
+++ b/youtube_dl/extractor/wimp.py
@@ -1,5 +1,6 @@
+from __future__ import unicode_literals
+
import re
-import base64
from .common import InfoExtractor
@@ -7,12 +8,12 @@ from .common import InfoExtractor
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.",
- u"description": u"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.",
+ '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.",
}
}
@@ -20,13 +21,12 @@ class WimpIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group(1)
webpage = self._download_webpage(url, video_id)
- googleString = self._search_regex("googleCode = '(.*?)'", webpage, 'file url')
- googleString = base64.b64decode(googleString).decode('ascii')
- final_url = self._search_regex('","(.*?)"', googleString, u'final video url')
+ video_url = self._search_regex(
+ r's1\.addVariable\("file",\s*"([^"]+)"\);', webpage, 'video URL')
return {
'id': video_id,
- 'url': final_url,
+ 'url': video_url,
'title': self._og_search_title(webpage),
'thumbnail': self._og_search_thumbnail(webpage),
'description': self._og_search_description(webpage),