[wimp] simplify

pull/1921/merge
Philipp Hagemeister 2013-12-08 07:22:19 +01:00
parent d4df5ed14c
commit 11bf848191
1 changed files with 10 additions and 12 deletions

View File

@ -11,7 +11,8 @@ class WimpIE(InfoExtractor):
u'file': u'deerfence.flv', u'file': u'deerfence.flv',
u'md5': u'8b215e2e0168c6081a1cf84b2846a2b5', u'md5': u'8b215e2e0168c6081a1cf84b2846a2b5',
u'info_dict': { u'info_dict': {
u"title": u"Watch Till End: Herd of deer jump over a fence." 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.",
} }
} }
@ -19,18 +20,15 @@ class WimpIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group(1) video_id = mobj.group(1)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
title = self._search_regex(r'<meta name="description" content="(.+?)" />',webpage, 'video title') title = self._html_search_meta('description', webpage, u'video title')
thumbnail_url = self._search_regex(r'<meta property="og\:image" content="(.+?)" />', webpage,'video thumbnail')
googleString = self._search_regex("googleCode = '(.*?)'", webpage, 'file url') googleString = self._search_regex("googleCode = '(.*?)'", webpage, 'file url')
googleString = base64.b64decode(googleString).decode('ascii') googleString = base64.b64decode(googleString).decode('ascii')
final_url = self._search_regex('","(.*?)"', googleString,'final video url') final_url = self._search_regex('","(.*?)"', googleString,'final video url')
ext = final_url.rpartition(u'.')[2]
return [{ return {
'id': video_id, 'id': video_id,
'url': final_url, 'url': final_url,
'ext': ext, 'title': self._og_search_title(webpage),
'title': title, 'thumbnail': self._og_search_thumbnail(webpage),
'thumbnail': thumbnail_url, 'description': self._og_search_description(webpage),
}] }