summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMohammed Yaseen Mowzer <[email protected]>2018-06-14 17:12:33 +0200
committerSergey M․ <[email protected]>2018-09-03 02:15:17 +0700
commit3d08f63dc57f000384703f26b7dcb4b683e18c05 (patch)
tree7d6f97c067997cee13da442ba7a7dd28e2ba59f8
parent27d8e089a21561480f5261f77665604bba2f5901 (diff)
downloadyoutube-dl-3d08f63dc57f000384703f26b7dcb4b683e18c05.tar.gz
youtube-dl-3d08f63dc57f000384703f26b7dcb4b683e18c05.zip
[generic] Skip unsuccessful jwplayer extraction (closes #16735)
-rw-r--r--youtube_dl/extractor/generic.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 229dfda1b..1db154c4f 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -3150,9 +3150,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:
+ # See https://github.com/rg3/youtube-dl/pull/16735
+ pass
# Video.js embed
mobj = re.search(