From 8d6782b5d6e7a62b2cccdda63752eb28653eb36a Mon Sep 17 00:00:00 2001 From: FA Date: Wed, 8 May 2019 11:52:10 -0700 Subject: [PATCH] Fail if video url not found --- youtube_dl/extractor/otomads.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/otomads.py b/youtube_dl/extractor/otomads.py index 800d4f18a..592302af6 100644 --- a/youtube_dl/extractor/otomads.py +++ b/youtube_dl/extractor/otomads.py @@ -5,6 +5,8 @@ from .common import InfoExtractor from ..utils import ( try_get, url_or_none, + ExtractorError, + js_to_json, ) @@ -53,8 +55,8 @@ class OtomadsIE(InfoExtractor): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) json_data = self._search_regex(r'', webpage, 'json') - json_info = self._parse_json(json_data, video_id) - video_info = try_get(json_info, lambda x: x['props']['pageProps']['initialState']['video']['video'], dict) or {} + json_info = self._parse_json(js_to_json(json_data), video_id) + video_info = json_info['props']['pageProps']['initialState']['video']['video'] video_qualities = video_info.get('qualities') or [] video_qualities.sort() @@ -62,11 +64,14 @@ class OtomadsIE(InfoExtractor): for quality in video_qualities: api_url = self._API_BASE_URL_ + video_info['_id'] + '/url/{0}'.format(quality) video_url = self._download_json(api_url, video_id, fatal=False).get('data') - if video_url is None: + if url_or_none(video_url) is None: continue video_quality = 1 if quality == 999 else 2 video_formats.append({ 'url': video_url, quality: video_quality }) + if len(video_formats) == 0: + raise ExtractorError('Unable to extract video urls') + title = self._html_search_meta('title', webpage, default=None) author = self._html_search_meta('author', webpage, default=None) description = self._html_search_meta('description', webpage, default=None)