logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: f4da80803619aea52bb116f6191f78e1bd77d2c7
parent f412970164c349bea81bfd9d95e56fec7d16c8a1
Author: Sergey M․ <dstftw@gmail.com>
Date:   Sun,  7 Apr 2019 02:58:40 +0700

[xvideos] Extract all thumbnails (closes #20432)

Diffstat:

Myoutube_dl/extractor/xvideos.py17++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/youtube_dl/extractor/xvideos.py b/youtube_dl/extractor/xvideos.py @@ -57,10 +57,17 @@ class XVideosIE(InfoExtractor): webpage, 'title', default=None, group='title') or self._og_search_title(webpage) - thumbnail = self._search_regex( - (r'setThumbUrl\(\s*(["\'])(?P<thumbnail>(?:(?!\1).)+)\1', - r'url_bigthumb=(?P<thumbnail>.+?)&amp'), - webpage, 'thumbnail', fatal=False, group='thumbnail') + thumbnails = [] + for preference, thumbnail in enumerate(('', '169')): + thumbnail_url = self._search_regex( + r'setThumbUrl%s\(\s*(["\'])(?P<thumbnail>(?:(?!\1).)+)\1' % thumbnail, + webpage, 'thumbnail', default=None, group='thumbnail') + if thumbnail_url: + thumbnails.append({ + 'url': thumbnail_url, + 'preference': preference, + }) + duration = int_or_none(self._og_search_property( 'duration', webpage, default=None)) or parse_duration( self._search_regex( @@ -98,6 +105,6 @@ class XVideosIE(InfoExtractor): 'formats': formats, 'title': title, 'duration': duration, - 'thumbnail': thumbnail, + 'thumbnails': thumbnails, 'age_limit': 18, }