From 4846122f7dfc5d99cb52fb1b6f16d159c20142ca Mon Sep 17 00:00:00 2001 From: Evil-Crab Date: Sun, 17 Mar 2019 00:07:23 +0100 Subject: [PATCH 1/2] [vrv] fix thumbnails --- youtube_dl/extractor/vrv.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/youtube_dl/extractor/vrv.py b/youtube_dl/extractor/vrv.py index 6c060ae76..16aafb3d3 100644 --- a/youtube_dl/extractor/vrv.py +++ b/youtube_dl/extractor/vrv.py @@ -181,15 +181,17 @@ class VRVIE(VRVBaseIE): }) thumbnails = [] - for thumbnail in video_data.get('images', {}).get('thumbnails', []): - thumbnail_url = thumbnail.get('source') - if not thumbnail_url: - continue - thumbnails.append({ - 'url': thumbnail_url, - 'width': int_or_none(thumbnail.get('width')), - 'height': int_or_none(thumbnail.get('height')), - }) + thumbnails_list = video_data.get('images', {}).get('thumbnail', []) + if thumbnails_list: + for thumbnail in thumbnails_list[0]: + thumbnail_url = thumbnail.get('source') + if not thumbnail_url: + continue + thumbnails.append({ + 'url': thumbnail_url, + 'width': int_or_none(thumbnail.get('width')), + 'height': int_or_none(thumbnail.get('height')), + }) return { 'id': video_id, From 2d6ea1d99fc0d8954728631928d1a735e9d61130 Mon Sep 17 00:00:00 2001 From: Evil-Crab Date: Sun, 17 Mar 2019 00:34:36 +0100 Subject: [PATCH 2/2] [vrv] fix thumbnails - reliability improvements --- youtube_dl/extractor/vrv.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/vrv.py b/youtube_dl/extractor/vrv.py index 16aafb3d3..069f343d7 100644 --- a/youtube_dl/extractor/vrv.py +++ b/youtube_dl/extractor/vrv.py @@ -19,6 +19,8 @@ from ..utils import ( ExtractorError, float_or_none, int_or_none, + url_or_none, + try_get ) @@ -181,10 +183,10 @@ class VRVIE(VRVBaseIE): }) thumbnails = [] - thumbnails_list = video_data.get('images', {}).get('thumbnail', []) + thumbnails_list = try_get(video_data, lambda x: x['images']['thumbnail'][0], list) if thumbnails_list: - for thumbnail in thumbnails_list[0]: - thumbnail_url = thumbnail.get('source') + for thumbnail in thumbnails_list: + thumbnail_url = url_or_none(thumbnail.get('source')) if not thumbnail_url: continue thumbnails.append({