diff options
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/mofosex.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/youtube_dl/extractor/mofosex.py b/youtube_dl/extractor/mofosex.py index b9430b09b..d658647e6 100644 --- a/youtube_dl/extractor/mofosex.py +++ b/youtube_dl/extractor/mofosex.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import os import re @@ -8,15 +10,17 @@ from ..utils import ( compat_urllib_parse, ) + class MofosexIE(InfoExtractor): - _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>mofosex\.com/videos/(?P<videoid>[0-9]+)/.*?\.html)' + _VALID_URL = r'^https?://(?:www\.)?(?P<url>mofosex\.com/videos/(?P<videoid>[0-9]+)/.*?\.html)' _TEST = { - u'url': u'http://www.mofosex.com/videos/5018/japanese-teen-music-video.html', - u'file': u'5018.mp4', - u'md5': u'1b2eb47ac33cc75d4a80e3026b613c5a', - u'info_dict': { - u"title": u"Japanese Teen Music Video", - u"age_limit": 18, + 'url': 'http://www.mofosex.com/videos/5018/japanese-teen-music-video.html', + 'md5': '1b2eb47ac33cc75d4a80e3026b613c5a', + 'info_dict': { + 'id': '5018', + 'ext': 'mp4', + 'title': 'Japanese Teen Music Video', + 'age_limit': 18, } } @@ -29,8 +33,8 @@ class MofosexIE(InfoExtractor): req.add_header('Cookie', 'age_verified=1') webpage = self._download_webpage(req, video_id) - video_title = self._html_search_regex(r'<h1>(.+?)<', webpage, u'title') - video_url = compat_urllib_parse.unquote(self._html_search_regex(r'flashvars.video_url = \'([^\']+)', webpage, u'video_url')) + video_title = self._html_search_regex(r'<h1>(.+?)<', webpage, 'title') + video_url = compat_urllib_parse.unquote(self._html_search_regex(r'flashvars.video_url = \'([^\']+)', webpage, 'video_url')) path = compat_urllib_parse_urlparse(video_url).path extension = os.path.splitext(path)[1][1:] format = path.split('/')[5].split('_')[:2] |