logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: 321b5e082a7340225091ea5ad852e12b2dc499e9
parent 3711fa1eb24224a5b898ede355136c9009355a87
Author: Sergey M․ <dstftw@gmail.com>
Date:   Mon,  8 Aug 2016 22:36:18 +0700

[extractor/common] Respect default in _search_json_ld

Diffstat:

Myoutube_dl/extractor/common.py11+++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py @@ -816,11 +816,14 @@ class InfoExtractor(object): json_ld = self._search_regex( r'(?s)<script[^>]+type=(["\'])application/ld\+json\1[^>]*>(?P<json_ld>.+?)</script>', html, 'JSON-LD', group='json_ld', **kwargs) + default = kwargs.get('default', NO_DEFAULT) if not json_ld: - return {} - return self._json_ld( - json_ld, video_id, fatal=kwargs.get('fatal', True), - expected_type=expected_type) + return default if default is not NO_DEFAULT else {} + # JSON-LD may be malformed and thus `fatal` should be respected. + # At the same time `default` may be passed that assumes `fatal=False` + # for _search_regex. Let's simulate the same behavior here as well. + fatal = kwargs.get('fatal', True) if default == NO_DEFAULT else False + return self._json_ld(json_ld, video_id, fatal=fatal, expected_type=expected_type) def _json_ld(self, json_ld, video_id, fatal=True, expected_type=None): if isinstance(json_ld, compat_str):