From 8ea9ae60086a8d7dabf570928e6b2692c59babeb Mon Sep 17 00:00:00 2001 From: Mohammed Yaseen Mowzer Date: Thu, 14 Jun 2018 17:12:33 +0200 Subject: [PATCH] Continue trying after _parse_jwplayer_data fails --- youtube_dl/extractor/generic.py | 10 +++++++--- youtube_dl/utils.py | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index dad951b75..1a88a03d0 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -3119,9 +3119,13 @@ class GenericIE(InfoExtractor): jwplayer_data = self._find_jwplayer_data( webpage, video_id, transform_source=js_to_json) if jwplayer_data: - info = self._parse_jwplayer_data( - jwplayer_data, video_id, require_title=False, base_url=url) - return merge_dicts(info, info_dict) + try: + info = self._parse_jwplayer_data( + jwplayer_data, video_id, require_title=False, base_url=url) + return merge_dicts(info, info_dict) + except ExtractorError, e: + self.to_screen(e.msg_without_bug_report) + self.to_screen("Trying different extractor") # Video.js embed mobj = re.search( diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 6a3199fb9..979661a1a 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -748,6 +748,7 @@ class ExtractorError(YoutubeDLError): msg = video_id + ': ' + msg if cause: msg += ' (caused by %r)' % cause + self.msg_without_bug_report = msg if not expected: msg += bug_reports_message() super(ExtractorError, self).__init__(msg)