[empflix] Simplify (#2903)

pull/8/head
Philipp Hagemeister 11 years ago
parent feb7221209
commit 65314dccf8

@ -1,3 +1,5 @@
from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
@ -5,42 +7,42 @@ from ..utils import (
ExtractorError, ExtractorError,
) )
class EmpflixIE(InfoExtractor): class EmpflixIE(InfoExtractor):
_VALID_URL = r'^https?://www\.empflix\.com/videos/(?P<videoid>[^\.]+)\.html' _VALID_URL = r'^https?://www\.empflix\.com/videos/.*?-(?P<id>[0-9]+)\.html'
_TEST = { _TEST = {
u'url': u'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html', 'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html',
u'file': u'Amateur-Finger-Fuck-33051.flv', 'md5': '5e5cc160f38ca9857f318eb97146e13e',
u'md5': u'5e5cc160f38ca9857f318eb97146e13e', 'info_dict': {
u'info_dict': { 'id': '33051',
u"title": u"Amateur Finger Fuck", 'ext': 'flv',
u"age_limit": 18, 'title': 'Amateur Finger Fuck',
'age_limit': 18,
} }
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
video_id = mobj.group('videoid')
# Get webpage content
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
age_limit = self._rta_search(webpage) age_limit = self._rta_search(webpage)
# Get the video title video_title = self._html_search_regex(
video_title = self._html_search_regex(r'name="title" value="(?P<title>[^"]*)"', r'name="title" value="(?P<title>[^"]*)"', webpage, 'title')
webpage, u'title').strip()
cfg_url = self._html_search_regex(r'flashvars\.config = escape\("([^"]+)"', cfg_url = self._html_search_regex(
webpage, u'flashvars.config').strip() r'flashvars\.config = escape\("([^"]+)"',
webpage, 'flashvars.config')
cfg_xml = self._download_xml(cfg_url, video_id, note=u'Downloading metadata') cfg_xml = self._download_xml(
cfg_url, video_id, note='Downloading metadata')
video_url = cfg_xml.find('videoLink').text video_url = cfg_xml.find('videoLink').text
info = {'id': video_id, return {
'id': video_id,
'url': video_url, 'url': video_url,
'title': video_title,
'ext': 'flv', 'ext': 'flv',
'age_limit': age_limit} 'title': video_title,
'age_limit': age_limit,
return [info] }

Loading…
Cancel
Save