X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/b238854ce845f3796daac74edab2e8a373e8ba1a..22bdf6fb907cce994fbfe062879d2a991e597a3f:/youtube_dl/extractor/xhamster.py diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index 279f75e..5374495 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -1,52 +1,59 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor from ..utils import ( - compat_urllib_parse, - unescapeHTML, - determine_ext, ExtractorError, + unified_strdate, + str_to_int, + int_or_none, + parse_duration, ) class XHamsterIE(InfoExtractor): """Information Extractor for xHamster""" - _VALID_URL = r'(?:http://)?(?:www\.)?xhamster\.com/movies/(?P[0-9]+)/(?P.+?)\.html(?:\?.*)?' - _TESTS = [{ - u'url': u'http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html', - u'file': u'1509445.flv', - u'md5': u'9f48e0e8d58e3076bb236ff412ab62fa', - u'info_dict': { - u"upload_date": u"20121014", - u"uploader_id": u"Ruseful2011", - u"title": u"FemaleAgent Shy beauty takes the bait", - u"age_limit": 18, - } - }, - { - u'url': u'http://xhamster.com/movies/2221348/britney_spears_sexy_booty.html?hd', - u'file': u'2221348.flv', - u'md5': u'970a94178ca4118c5aa3aaea21211b81', - u'info_dict': { - u"upload_date": u"20130914", - u"uploader_id": u"jojo747400", - u"title": u"Britney Spears Sexy Booty", - u"age_limit": 18, + _VALID_URL = r'http://(?:www\.)?xhamster\.com/movies/(?P[0-9]+)/(?P.+?)\.html(?:\?.*)?' + _TESTS = [ + { + 'url': 'http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html', + 'md5': '8281348b8d3c53d39fffb377d24eac4e', + 'info_dict': { + 'id': '1509445', + 'ext': 'mp4', + 'title': 'FemaleAgent Shy beauty takes the bait', + 'upload_date': '20121014', + 'uploader_id': 'Ruseful2011', + 'duration': 893, + 'age_limit': 18, + } + }, + { + 'url': 'http://xhamster.com/movies/2221348/britney_spears_sexy_booty.html?hd', + 'md5': '4cbd8d56708ecb4fb4124c23e4acb81a', + 'info_dict': { + 'id': '2221348', + 'ext': 'mp4', + 'title': 'Britney Spears Sexy Booty', + 'upload_date': '20130914', + 'uploader_id': 'jojo747400', + 'duration': 200, + 'age_limit': 18, + } } - }] + ] def _real_extract(self,url): def extract_video_url(webpage): - mobj = re.search(r'\'srv\': \'(?P[^\']*)\',\s*\'file\': \'(?P[^\']+)\',', webpage) - if mobj is None: - raise ExtractorError(u'Unable to extract media URL') - if len(mobj.group('server')) == 0: - return compat_urllib_parse.unquote(mobj.group('file')) + mp4 = re.search(r'', webpage) + if mp4 is None: + raise ExtractorError('Unable to extract media URL') else: - return mobj.group('server')+'/key='+mobj.group('file') + return mp4.group(1) def is_hd(webpage): - return webpage.find('
') != -1 + return '
(?P.+?) - xHamster\.com', - webpage, u'title') + title = self._html_search_regex(r'(?P<title>.+?) - xHamster\.com', webpage, 'title') # Only a few videos have an description - mobj = re.search('Description: (?P[^<]+)', webpage) - if mobj: - video_description = unescapeHTML(mobj.group('description')) - else: - video_description = None + mobj = re.search(r'Description: ([^<]+)', webpage) + description = mobj.group(1) if mobj else None + + upload_date = self._html_search_regex(r'hint=\'(\d{4}-\d{2}-\d{2}) \d{2}:\d{2}:\d{2} [A-Z]{3,4}\'', + webpage, 'upload date', fatal=False) + if upload_date: + upload_date = unified_strdate(upload_date) + + uploader_id = self._html_search_regex(r']+>(?P[^<]+)', + webpage, 'uploader id', default='anonymous') - mobj = re.search(r'hint=\'(?P[0-9]{4})-(?P[0-9]{2})-(?P[0-9]{2}) [0-9]{2}:[0-9]{2}:[0-9]{2} [A-Z]{3,4}\'', webpage) - if mobj: - video_upload_date = mobj.group('upload_date_Y')+mobj.group('upload_date_m')+mobj.group('upload_date_d') - else: - video_upload_date = None - self._downloader.report_warning(u'Unable to extract upload date') + thumbnail = self._html_search_regex(r'', webpage, 'thumbnail', fatal=False) - video_uploader_id = self._html_search_regex(r']+>(?P[^<]+)', - webpage, u'uploader id', default=u'anonymous') + duration = parse_duration(self._html_search_regex(r'Runtime: (\d+:\d+)
', + webpage, 'duration', fatal=False)) - video_thumbnail = self._search_regex(r'\'image\':\'(?P[^\']+)\'', - webpage, u'thumbnail', fatal=False) + view_count = self._html_search_regex(r'Views: ([^<]+)
', webpage, 'view count', fatal=False) + if view_count: + view_count = str_to_int(view_count) + + mobj = re.search(r"hint='(?P\d+) Likes / (?P\d+) Dislikes'", webpage) + (like_count, dislike_count) = (mobj.group('likecount'), mobj.group('dislikecount')) if mobj else (None, None) + + mobj = re.search(r'Comments \((?P\d+)\)', webpage) + comment_count = mobj.group('commentcount') if mobj else 0 age_limit = self._rta_search(webpage) - video_url = extract_video_url(webpage) hd = is_hd(webpage) + + video_url = extract_video_url(webpage) formats = [{ 'url': video_url, - 'ext': determine_ext(video_url), - 'format': 'hd' if hd else 'sd', 'format_id': 'hd' if hd else 'sd', + 'preference': 1, }] + if not hd: - webpage = self._download_webpage(mrss_url+'?hd', video_id) + mrss_url = self._search_regex(r'