X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fpornhub.py;h=2ca15b717ec5dd9a36b6aa2bfc7e9019148c0493;hb=5f6a1245ffa9276c1af59b0835afeef67e2fb5b1;hp=3dbd2ab699e31ab27c2e191ef757ac5e70eff940;hpb=eb6a2277a2ab1cb48b4705dbb4bfe95cb03ee8e4;p=youtube-dl diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py index 3dbd2ab69..2ca15b717 100644 --- a/youtube_dl/extractor/pornhub.py +++ b/youtube_dl/extractor/pornhub.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import os import re @@ -6,62 +8,93 @@ from ..utils import ( compat_urllib_parse_urlparse, compat_urllib_request, compat_urllib_parse, - unescapeHTML, + str_to_int, ) from ..aes import ( aes_decrypt_text ) + class PornHubIE(InfoExtractor): - _VALID_URL = r'^(?:https?://)?(?:www\.)?(?Ppornhub\.com/view_video\.php\?viewkey=(?P[0-9]+))' + _VALID_URL = r'^https?://(?:www\.)?pornhub\.com/view_video\.php\?viewkey=(?P[0-9a-f]+)' _TEST = { - u'url': u'http://www.pornhub.com/view_video.php?viewkey=648719015', - u'file': u'648719015.mp4', - u'md5': u'882f488fa1f0026f023f33576004a2ed', - u'info_dict': { - u"uploader": u"BABES-COM", - u"title": u"Seductive Indian beauty strips down and fingers her pink pussy", + 'url': 'http://www.pornhub.com/view_video.php?viewkey=648719015', + 'md5': '882f488fa1f0026f023f33576004a2ed', + 'info_dict': { + 'id': '648719015', + 'ext': 'mp4', + "uploader": "Babes", + "title": "Seductive Indian beauty strips down and fingers her pink pussy", + "age_limit": 18 } } + def _extract_count(self, pattern, webpage, name): + count = self._html_search_regex(pattern, webpage, '%s count' % name, fatal=False) + if count: + count = str_to_int(count) + return count + def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('videoid') - url = 'http://www.' + mobj.group('url') + video_id = self._match_id(url) req = compat_urllib_request.Request(url) req.add_header('Cookie', 'age_verified=1') webpage = self._download_webpage(req, video_id) - video_title = self._html_search_regex(r'

]+>([^<]+)', webpage, u'title') - video_uploader = self._html_search_regex(r'From: (?:\s|<[^>]*>)*(.+?)<', webpage, u'uploader', fatal=False) - thumbnail = self._html_search_regex(r'"image_url":"([^"]+)', webpage, u'thumbnail', fatal=False) + video_title = self._html_search_regex(r'

]+>([^<]+)', webpage, 'title') + video_uploader = self._html_search_regex( + r'(?s)From: .+?<(?:a href="/users/|a href="/channels/|([\d,\.]+) views', webpage, 'view') + like_count = self._extract_count(r'([\d,\.]+)', webpage, 'like') + dislike_count = self._extract_count(r'([\d,\.]+)', webpage, 'dislike') + comment_count = self._extract_count( + r'All comments \(([\d,\.]+)', webpage, 'comment') + + video_urls = list(map(compat_urllib_parse.unquote, re.findall(r'"quality_[0-9]{3}p":"([^"]+)', webpage))) if webpage.find('"encrypted":true') != -1: - password = self._html_search_regex(r'"video_title":"([^"]+)', webpage, u'password').replace('+', ' ') + password = compat_urllib_parse.unquote_plus(self._html_search_regex(r'"video_title":"([^"]+)', webpage, 'password')) video_urls = list(map(lambda s: aes_decrypt_text(s, password, 32).decode('utf-8'), video_urls)) formats = [] for video_url in video_urls: - path = compat_urllib_parse_urlparse( video_url ).path - extension = os.path.splitext( path )[1][1:] + path = compat_urllib_parse_urlparse(video_url).path + extension = os.path.splitext(path)[1][1:] format = path.split('/')[5].split('_')[:2] - format = "-".join( format ) + format = "-".join(format) + + m = re.match(r'^(?P[0-9]+)P-(?P[0-9]+)K$', format) + if m is None: + height = None + tbr = None + else: + height = int(m.group('height')) + tbr = int(m.group('tbr')) + formats.append({ 'url': video_url, 'ext': extension, 'format': format, 'format_id': format, + 'tbr': tbr, + 'height': height, }) - formats.sort(key=lambda format: list(map(lambda s: s.zfill(6), format['format'].split('-')))) + self._sort_formats(formats) return { 'id': video_id, 'uploader': video_uploader, 'title': video_title, 'thumbnail': thumbnail, + 'view_count': view_count, + 'like_count': like_count, + 'dislike_count': dislike_count, + 'comment_count': comment_count, 'formats': formats, + 'age_limit': 18, }