mirror of
https://github.com/l1ving/youtube-dl
synced 2025-02-10 07:33:03 +08:00
Continue trying after _parse_jwplayer_data fails
This commit is contained in:
parent
c797db4a2f
commit
8ea9ae6008
@ -3119,9 +3119,13 @@ class GenericIE(InfoExtractor):
|
|||||||
jwplayer_data = self._find_jwplayer_data(
|
jwplayer_data = self._find_jwplayer_data(
|
||||||
webpage, video_id, transform_source=js_to_json)
|
webpage, video_id, transform_source=js_to_json)
|
||||||
if jwplayer_data:
|
if jwplayer_data:
|
||||||
info = self._parse_jwplayer_data(
|
try:
|
||||||
jwplayer_data, video_id, require_title=False, base_url=url)
|
info = self._parse_jwplayer_data(
|
||||||
return merge_dicts(info, info_dict)
|
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
|
# Video.js embed
|
||||||
mobj = re.search(
|
mobj = re.search(
|
||||||
|
@ -748,6 +748,7 @@ class ExtractorError(YoutubeDLError):
|
|||||||
msg = video_id + ': ' + msg
|
msg = video_id + ': ' + msg
|
||||||
if cause:
|
if cause:
|
||||||
msg += ' (caused by %r)' % cause
|
msg += ' (caused by %r)' % cause
|
||||||
|
self.msg_without_bug_report = msg
|
||||||
if not expected:
|
if not expected:
|
||||||
msg += bug_reports_message()
|
msg += bug_reports_message()
|
||||||
super(ExtractorError, self).__init__(msg)
|
super(ExtractorError, self).__init__(msg)
|
||||||
|
Loading…
Reference in New Issue
Block a user