projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
27d8e08
)
[generic] Skip unsuccessful jwplayer extraction (closes #16735)
author
Mohammed Yaseen Mowzer
<yaseen@mowzer.co.za>
Thu, 14 Jun 2018 15:12:33 +0000
(17:12 +0200)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 2 Sep 2018 19:15:17 +0000
(
02:15
+0700)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 229dfda1bc6ea9e56dc9ee38bf15ff6bcddd3ecf..1db154c4feb4ed2e343116c1c9039e515198702c 100644
(file)
--- 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:
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(
# Video.js embed
mobj = re.search(