From a2b6aba8ded704f55a6650fc3e20b2e6c8aec094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 14 Nov 2017 22:49:25 +0700 Subject: [PATCH] [vshare] Improve extraction, fix formats sorting and carry long lines --- youtube_dl/extractor/vshare.py | 41 ++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/youtube_dl/extractor/vshare.py b/youtube_dl/extractor/vshare.py index 20ce22e16..e4ec77889 100644 --- a/youtube_dl/extractor/vshare.py +++ b/youtube_dl/extractor/vshare.py @@ -26,13 +26,20 @@ class VShareIE(InfoExtractor): 'only_matching': True, }] + @staticmethod + def _extract_urls(webpage): + return re.findall( + r']+?src=["\'](?P(?:https?:)?//(?:www\.)?vshare\.io/v/[^/?#&]+)', + webpage) + def _extract_packed(self, webpage): - packed = self._search_regex(r'(eval\(function.+)', webpage, 'packed code') + packed = self._search_regex( + r'(eval\(function.+)', webpage, 'packed code') unpacked = decode_packed_codes(packed) digits = self._search_regex(r'\[((?:\d+,?)+)\]', unpacked, 'digits') - digits = digits.split(',') - digits = [int(digit) for digit in digits] - key_digit = self._search_regex(r'fromCharCode\(.+?(\d+)\)}', unpacked, 'key digit') + digits = [int(digit) for digit in digits.split(',')] + key_digit = self._search_regex( + r'fromCharCode\(.+?(\d+)\)}', unpacked, 'key digit') chars = [compat_chr(d - int(key_digit)) for d in digits] return ''.join(chars) @@ -40,9 +47,11 @@ class VShareIE(InfoExtractor): video_id = self._match_id(url) webpage = self._download_webpage( - 'https://vshare.io/v/%s/width-650/height-430/1' % video_id, video_id) + 'https://vshare.io/v/%s/width-650/height-430/1' % video_id, + video_id) - title = self._html_search_regex(r'([^<]+)', webpage, 'title') + title = self._html_search_regex( + r'([^<]+)', webpage, 'title') title = title.split(' - ')[0] error = self._html_search_regex( @@ -51,17 +60,15 @@ class VShareIE(InfoExtractor): if error: raise ExtractorError(error, expected=True) - unpacked = self._extract_packed(webpage) - video_urls = re.findall(r'%s' % self._extract_packed(webpage), + video_id)[0] + + self._sort_formats(info['formats']) + + info.update({ 'id': video_id, 'title': title, - 'formats': formats, - } + }) - @staticmethod - def _extract_urls(webpage): - return re.findall( - r']+?src=["\'](?P(?:https?:)?//(?:www\.)?vshare\.io/v/[^/?#&]+)', - webpage) + return info