X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fspankwire.py;h=692fd78e886c0a6a932adce4659f2564beeab7e6;hb=5c2266df4b9aeb7881ed8c026a038e2a25e43734;hp=3362b3db85c65c97d8839d8707e36fecf8bc6646;hpb=9ac0a675816e47c2c4ef450522c33c760a4a2290;p=youtube-dl diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py index 3362b3db8..692fd78e8 100644 --- a/youtube_dl/extractor/spankwire.py +++ b/youtube_dl/extractor/spankwire.py @@ -1,84 +1,129 @@ from __future__ import unicode_literals -import os import re from .common import InfoExtractor -from ..utils import ( +from ..compat import ( + compat_urllib_parse_unquote, compat_urllib_parse_urlparse, - compat_urllib_request, - compat_urllib_parse, ) -from ..aes import ( - aes_decrypt_text +from ..utils import ( + sanitized_Request, + str_to_int, + unified_strdate, ) +from ..aes import aes_decrypt_text class SpankwireIE(InfoExtractor): - _VALID_URL = r'^(?:https?://)?(?:www\.)?(?Pspankwire\.com/[^/]*/video(?P[0-9]+)/?)' - _TEST = { + _VALID_URL = r'https?://(?:www\.)?(?Pspankwire\.com/[^/]*/video(?P[0-9]+)/?)' + _TESTS = [{ + # download URL pattern: */P_K_.mp4 'url': 'http://www.spankwire.com/Buckcherry-s-X-Rated-Music-Video-Crazy-Bitch/video103545/', - 'file': '103545.mp4', - 'md5': '1b3f55e345500552dbc252a3e9c1af43', + 'md5': '8bbfde12b101204b39e4b9fe7eb67095', 'info_dict': { - "uploader": "oreusz", - "title": "Buckcherry`s X Rated Music Video Crazy Bitch", - "description": "Crazy Bitch X rated music video.", - "age_limit": 18, + 'id': '103545', + 'ext': 'mp4', + 'title': 'Buckcherry`s X Rated Music Video Crazy Bitch', + 'description': 'Crazy Bitch X rated music video.', + 'uploader': 'oreusz', + 'uploader_id': '124697', + 'upload_date': '20070507', + 'age_limit': 18, } - } + }, { + # download URL pattern: */mp4__.mp4 + 'url': 'http://www.spankwire.com/Titcums-Compiloation-I/video1921551/', + 'md5': '09b3c20833308b736ae8902db2f8d7e6', + 'info_dict': { + 'id': '1921551', + 'ext': 'mp4', + 'title': 'Titcums Compiloation I', + 'description': 'cum on tits', + 'uploader': 'dannyh78999', + 'uploader_id': '3056053', + 'upload_date': '20150822', + 'age_limit': 18, + }, + }] 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 = mobj.group('id') - req = compat_urllib_request.Request(url) + req = sanitized_Request('http://www.' + mobj.group('url')) req.add_header('Cookie', 'age_verified=1') webpage = self._download_webpage(req, video_id) - video_title = self._html_search_regex(r'

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

([^<]+)', webpage, 'title') description = self._html_search_regex( - r'([^<]+)<', webpage, 'description', fatal=False) + r'(?s)(.+?)', + webpage, 'description', fatal=False) + thumbnail = self._html_search_regex( + r'playerData\.screenShot\s*=\s*["\']([^"\']+)["\']', + webpage, 'thumbnail', fatal=False) - video_urls = list(map(compat_urllib_parse.unquote , re.findall(r'flashvars\.quality_[0-9]{3}p = "([^"]+)', webpage))) + uploader = self._html_search_regex( + r'by:\s*]*>(.+?)', + webpage, 'uploader', fatal=False) + uploader_id = self._html_search_regex( + r'by:\s* on (.+?) at \d+:\d+', + webpage, 'upload date', fatal=False)) + + view_count = str_to_int(self._html_search_regex( + r'
([\d,\.]+) views
', + webpage, 'view count', fatal=False)) + comment_count = str_to_int(self._html_search_regex( + r']*>([\d,\.]+)', + webpage, 'comment count', fatal=False)) + + videos = re.findall( + r'playerData\.cdnPath([0-9]{3,})\s*=\s*(?:encodeURIComponent\()?["\']([^"\']+)["\']', webpage) + heights = [int(video[0]) for video in videos] + video_urls = list(map(compat_urllib_parse_unquote, [video[1] for video in videos])) if webpage.find('flashvars\.encrypted = "true"') != -1: - password = self._html_search_regex(r'flashvars\.video_title = "([^"]+)', webpage, 'password').replace('+', ' ') - video_urls = list(map(lambda s: aes_decrypt_text(s, password, 32).decode('utf-8'), video_urls)) + password = self._search_regex( + r'flashvars\.video_title = "([^"]+)', + webpage, 'password').replace('+', ' ') + video_urls = list(map( + lambda s: aes_decrypt_text(s, password, 32).decode('utf-8'), + video_urls)) formats = [] - for video_url in video_urls: + for height, video_url in zip(heights, video_urls): path = compat_urllib_parse_urlparse(video_url).path - extension = os.path.splitext(path)[1][1:] - format = path.split('/')[4].split('_')[:2] - resolution, bitrate_str = format - format = "-".join(format) - height = int(resolution.rstrip('P')) - tbr = int(bitrate_str.rstrip('K')) - - formats.append({ + _, quality = path.split('/')[4].split('_')[:2] + f = { 'url': video_url, - 'ext': extension, - 'resolution': resolution, - 'format': format, - 'tbr': tbr, 'height': height, - 'format_id': format, - }) + } + tbr = self._search_regex(r'^(\d+)[Kk]$', quality, 'tbr', default=None) + if tbr: + f.update({ + 'tbr': int(tbr), + 'format_id': '%dp' % height, + }) + else: + f['format_id'] = quality + formats.append(f) self._sort_formats(formats) age_limit = self._rta_search(webpage) return { 'id': video_id, - 'uploader': video_uploader, - 'title': video_title, - 'thumbnail': thumbnail, + 'title': title, 'description': description, + 'thumbnail': thumbnail, + 'uploader': uploader, + 'uploader_id': uploader_id, + 'upload_date': upload_date, + 'view_count': view_count, + 'comment_count': comment_count, 'formats': formats, 'age_limit': age_limit, }