diff options
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/empflix.py | 51 |
2 files changed, 10 insertions, 43 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index ff5b9a29e..d54ad8057 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -86,7 +86,7 @@ from .ellentv import ( EllenTVClipsIE, ) from .elpais import ElPaisIE -from .empflix import EmpflixIE +from .empflix import EMPFlixIE from .engadget import EngadgetIE from .eporner import EpornerIE from .escapist import EscapistIE diff --git a/youtube_dl/extractor/empflix.py b/youtube_dl/extractor/empflix.py index 1c498d8c8..70f8efe27 100644 --- a/youtube_dl/extractor/empflix.py +++ b/youtube_dl/extractor/empflix.py @@ -1,58 +1,25 @@ from __future__ import unicode_literals -import re +from .tnaflix import TNAFlixIE -from .common import InfoExtractor -from ..utils import fix_xml_ampersands +class EMPFlixIE(TNAFlixIE): + _VALID_URL = r'^https?://www\.empflix\.com/videos/(?P<display_id>[0-9a-zA-Z-]+)-(?P<id>[0-9]+)\.html' + + _TITLE_REGEX = r'name="title" value="(?P<title>[^"]*)"' + _DESCRIPTION_REGEX = r'name="description" value="([^"]*)"' + _CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"' -class EmpflixIE(InfoExtractor): - _VALID_URL = r'^https?://www\.empflix\.com/videos/.*?-(?P<id>[0-9]+)\.html' _TEST = { 'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html', 'md5': 'b1bc15b6412d33902d6e5952035fcabc', 'info_dict': { 'id': '33051', + 'display_id': 'Amateur-Finger-Fuck', 'ext': 'mp4', 'title': 'Amateur Finger Fuck', 'description': 'Amateur solo finger fucking.', + 'thumbnail': 're:https?://.*\.jpg$', 'age_limit': 18, } } - - def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - - webpage = self._download_webpage(url, video_id) - age_limit = self._rta_search(webpage) - - video_title = self._html_search_regex( - r'name="title" value="(?P<title>[^"]*)"', webpage, 'title') - video_description = self._html_search_regex( - r'name="description" value="([^"]*)"', webpage, 'description', fatal=False) - - cfg_url = self._html_search_regex( - r'flashvars\.config = escape\("([^"]+)"', - webpage, 'flashvars.config') - - cfg_xml = self._download_xml( - cfg_url, video_id, note='Downloading metadata', - transform_source=fix_xml_ampersands) - - formats = [ - { - 'url': item.find('videoLink').text, - 'format_id': item.find('res').text, - } for item in cfg_xml.findall('./quality/item') - ] - thumbnail = cfg_xml.find('./startThumb').text - - return { - 'id': video_id, - 'title': video_title, - 'description': video_description, - 'thumbnail': thumbnail, - 'formats': formats, - 'age_limit': age_limit, - } |