From: Boris Wachtmeister Date: Thu, 26 May 2016 14:59:45 +0000 (+0200) Subject: [WDR] use _download_json with a strip_jsonp X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=37f972954da0d0f1f0c5e97da8357c4baf687ee6;p=youtube-dl [WDR] use _download_json with a strip_jsonp --- diff --git a/youtube_dl/extractor/wdr.py b/youtube_dl/extractor/wdr.py index 05bfe7deb..73a343c69 100644 --- a/youtube_dl/extractor/wdr.py +++ b/youtube_dl/extractor/wdr.py @@ -9,6 +9,7 @@ from ..compat import ( compat_urlparse, ) from ..utils import ( + strip_jsonp, unified_strdate, ExtractorError, ) @@ -112,9 +113,8 @@ class WDRIE(InfoExtractor): raise ExtractorError('No downloadable streams found', expected=True) - js_data = self._download_webpage(js_url, 'metadata') - json_data = self._search_regex(r'\(({.*})\)', js_data, 'json') - metadata = self._parse_json(json_data, display_id) + metadata = self._download_json( + js_url, 'metadata', transform_source=strip_jsonp) metadata_tracker_data = metadata['trackerData'] metadata_media_resource = metadata['mediaResource']