midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[redditr] Fix review issues and extract source thumbnail (closes #27503)

Browse source
This commit is contained in:
Sergey M․ 2020-12-31 05:06:54 +07:00
parent d1d0612160
commit 4046ffe1e1
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
youtube_dl/extractor/reddit.py
View file

@ -8,8 +8,8 @@ from ..utils import (
int_or_none, int_or_none,
float_or_none, float_or_none,
try_get, try_get,
url_or_none,
unescapeHTML, unescapeHTML,
url_or_none,
) )
@ -57,7 +57,8 @@ class RedditRIE(InfoExtractor):
'id': 'zv89llsvexdz', 'id': 'zv89llsvexdz',
'ext': 'mp4', 'ext': 'mp4',
'title': 'That small heart attack.', 'title': 'That small heart attack.',
'thumbnail': r're:^https?://.*\.jpg$', 'thumbnail': r're:^https?://.*\.(?:jpg|png)',
'thumbnails': 'count:4',
'timestamp': 1501941939, 'timestamp': 1501941939,
'upload_date': '20170805', 'upload_date': '20170805',
'uploader': 'Antw87', 'uploader': 'Antw87',
@ -120,16 +121,27 @@ class RedditRIE(InfoExtractor):
age_limit = None age_limit = None
thumbnails = [] thumbnails = []
images = try_get(
data, lambda x: x['preview']['images'][0]['resolutions']) or [] def add_thumbnail(src):
for image in images: if not isinstance(src, dict):
url = url_or_none(unescapeHTML(image['url'])) return
if url is not None: thumbnail_url = url_or_none(src.get('url'))
thumbnails.append({ if not thumbnail_url:
'url': url, return
'width': int_or_none(image['width']), thumbnails.append({
'height': int_or_none(image['height']), 'url': unescapeHTML(thumbnail_url),
}) 'width': int_or_none(src.get('width')),
'height': int_or_none(src.get('height')),
})
for image in try_get(data, lambda x: x['preview']['images']) or []:
if not isinstance(image, dict):
continue
add_thumbnail(image.get('source'))
resolutions = image.get('resolutions')
if isinstance(resolutions, list):
for resolution in resolutions:
add_thumbnail(resolution)
return { return {
'_type': 'url_transparent', '_type': 'url_transparent',