From f31cd4c8be93df6356972bada64f924af2c815ce Mon Sep 17 00:00:00 2001 From: JChris246 Date: Fri, 12 Apr 2019 00:29:12 -0400 Subject: [PATCH 1/3] [spankwire] Fixed extractor Fixed spankwire and added duration, categories and tags --- youtube_dl/extractor/spankwire.py | 79 +++++++++++++------------------ 1 file changed, 32 insertions(+), 47 deletions(-) diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py index 44d8fa52f30..6cdec6ce564 100644 --- a/youtube_dl/extractor/spankwire.py +++ b/youtube_dl/extractor/spankwire.py @@ -3,16 +3,11 @@ import re from .common import InfoExtractor -from ..compat import ( - compat_urllib_parse_unquote, - compat_urllib_parse_urlparse, -) from ..utils import ( + int_or_none, sanitized_Request, - str_to_int, unified_strdate, ) -from ..aes import aes_decrypt_text class SpankwireIE(InfoExtractor): @@ -54,61 +49,48 @@ def _real_extract(self, url): req = sanitized_Request('http://www.' + mobj.group('url')) req.add_header('Cookie', 'age_verified=1') webpage = self._download_webpage(req, video_id) + video_data = self._download_json( + sanitized_Request('https://www.spankwire.com/api/video/' + video_id + '.json'), video_id) - title = self._html_search_regex( + title = video_data.get('title') or self._html_search_regex( r'

([^<]+)', webpage, 'title') - description = self._html_search_regex( - r'(?s)(.+?)', - webpage, 'description', fatal=False) - thumbnail = self._html_search_regex( - r'playerData\.screenShot\s*=\s*["\']([^"\']+)["\']', - webpage, 'thumbnail', fatal=False) + thumbnail = video_data.get('poster') + description = video_data.get('description') - uploader = self._html_search_regex( - r'by:\s*]*>(.+?)', - webpage, 'uploader', fatal=False) + uploader = self._search_regex( + r']+class="uploaded__by"[^>]*>(.+?)', + webpage, 'uploader', flags=re.DOTALL, fatal=False) uploader_id = self._html_search_regex( - r'by:\s* on (.+?) at \d+:\d+', + r'(.+?) at \d+:\d+ (?:AM|PM) by', 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)) + view_count = int_or_none(video_data.get('viewed')) + comment_count = int_or_none(video_data.get('comments')) + duration = int_or_none(video_data.get('duration')) + + def extract_list(arr): + names = [] + for i in arr: + names.append(i.get('name')) + return names - 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(r'flashvars\.encrypted = "true"') != -1: - 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)) + categories = extract_list(video_data.get('categories')) + tags = extract_list(video_data.get('tags')) + videos = video_data.get('videos').items() + videos.sort() formats = [] - for height, video_url in zip(heights, video_urls): - path = compat_urllib_parse_urlparse(video_url).path - m = re.search(r'/(?P\d+)[pP]_(?P\d+)[kK]', path) - if m: - tbr = int(m.group('tbr')) - height = int(m.group('height')) - else: - tbr = None + for quality, video_url in videos: + height = quality.replace('quality_', '').replace('p', '') formats.append({ 'url': video_url, - 'format_id': '%dp' % height, - 'height': height, - 'tbr': tbr, + 'format_id': quality, + 'height': int_or_none(height), + 'tbr': None }) - self._sort_formats(formats) age_limit = self._rta_search(webpage) @@ -124,4 +106,7 @@ def _real_extract(self, url): 'comment_count': comment_count, 'formats': formats, 'age_limit': age_limit, + 'duration': duration, + 'categories': categories, + 'tags': tags, } From 3745cedfe4e736ab8008665d94808d2b45e61b11 Mon Sep 17 00:00:00 2001 From: JChris246 Date: Mon, 6 May 2019 15:34:43 -0400 Subject: [PATCH 2/3] made changes removed sanitized_request made webpage non fatal moved flags into regex made check for null arr removed tbr from video data format attrs re-added code for pulling video urls from webpage removed videos.sort in favor of _sort_formats --- youtube_dl/extractor/spankwire.py | 68 +++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py index 6cdec6ce564..7cde073e3dd 100644 --- a/youtube_dl/extractor/spankwire.py +++ b/youtube_dl/extractor/spankwire.py @@ -4,10 +4,16 @@ from .common import InfoExtractor from ..utils import ( + ExtractorError, int_or_none, sanitized_Request, unified_strdate, ) +from youtube_dl.aes import aes_decrypt_text +from youtube_dl.compat import ( + compat_urllib_parse_urlparse, + compat_urllib_parse_unquote, +) class SpankwireIE(InfoExtractor): @@ -48,9 +54,9 @@ def _real_extract(self, url): req = sanitized_Request('http://www.' + mobj.group('url')) req.add_header('Cookie', 'age_verified=1') - webpage = self._download_webpage(req, video_id) - video_data = self._download_json( - sanitized_Request('https://www.spankwire.com/api/video/' + video_id + '.json'), video_id) + webpage = self._download_webpage(req, video_id, fatal=False) + video_data = self._download_json('https://www.spankwire.com/api/video/' + + video_id + '.json', video_id) title = video_data.get('title') or self._html_search_regex( r'

([^<]+)', webpage, 'title') @@ -58,8 +64,9 @@ def _real_extract(self, url): description = video_data.get('description') uploader = self._search_regex( - r']+class="uploaded__by"[^>]*>(.+?)', - webpage, 'uploader', flags=re.DOTALL, fatal=False) + re.compile(r']+class="uploaded__by"[^>]*>(.+?)', re.DOTALL), + webpage, 'uploader', fatal=False) + uploader_id = self._html_search_regex( r'by\s*\d+)[pP]_(?P\d+)[kK]', path) + if m: + tbr = int(m.group('tbr')) + height = int(m.group('height')) + else: + tbr = None + formats.append({ + 'url': video_url, + 'format_id': '%dp' % height, + 'height': height, + 'tbr': tbr, + }) + else: + for quality, video_url in video_data.get('videos').items(): + height = quality.replace('quality_', '').replace('p', '') + formats.append({ + 'url': video_url, + 'format_id': quality, + 'height': int_or_none(height), + }) + self._sort_formats(formats) age_limit = self._rta_search(webpage) From 3f0716c8c66a90ec10f4d08ba53493446ef45811 Mon Sep 17 00:00:00 2001 From: JChris246 Date: Mon, 6 May 2019 15:40:45 -0400 Subject: [PATCH 3/3] made changes removed sanitized_Request made webpage non fatal moved flags into regex made a check if arr is null removed pointless tbr re-added code to pull video urls from webpage removed sort in favor of _sort_formats --- youtube_dl/extractor/spankwire.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py index 7cde073e3dd..df266ec7058 100644 --- a/youtube_dl/extractor/spankwire.py +++ b/youtube_dl/extractor/spankwire.py @@ -4,7 +4,6 @@ from .common import InfoExtractor from ..utils import ( - ExtractorError, int_or_none, sanitized_Request, unified_strdate,