Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-09 12:25:37 +08:00
Code Issues Releases Wiki Activity

Continue trying after _parse_jwplayer_data fails

Browse Source
This commit is contained in:
Mohammed Yaseen Mowzer 2018-06-14 17:12:33 +02:00
parent c797db4a2f
commit 8ea9ae6008
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/generic.py
View File

@ -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(

1
youtube_dl/utils.py
View File

@ -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)