fenix
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[WDR] use _download_json with a strip_jsonp

This commit is contained in:
Boris Wachtmeister 2016-05-26 16:59:45 +02:00
parent 3874e6ea66
commit 37f972954d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube_dl/extractor/wdr.py
View File

@ -9,6 +9,7 @@ from ..compat import (
compat_urlparse, compat_urlparse,
) )
from ..utils import ( from ..utils import (
strip_jsonp,
unified_strdate, unified_strdate,
ExtractorError, ExtractorError,
) )
@ -112,9 +113,8 @@ class WDRIE(InfoExtractor):
raise ExtractorError('No downloadable streams found', expected=True) raise ExtractorError('No downloadable streams found', expected=True)
js_data = self._download_webpage(js_url, 'metadata') metadata = self._download_json(
json_data = self._search_regex(r'\(({.*})\)', js_data, 'json') js_url, 'metadata', transform_source=strip_jsonp)
metadata = self._parse_json(json_data, display_id)
metadata_tracker_data = metadata['trackerData'] metadata_tracker_data = metadata['trackerData']
metadata_media_resource = metadata['mediaResource'] metadata_media_resource = metadata['mediaResource']