Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-17 14:54:31 +01:00
Code Issues Releases Wiki Activity

[WDR] extract jsonp-url by parsing data-extension of mediaLink

Browse Source
This commit is contained in:
Boris Wachtmeister 2016-05-26 19:08:12 +02:00
parent bec2c14f2c
commit 33a1ff7113
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/wdr.py
View File

@ -10,6 +10,7 @@ from ..compat import (
) )
from ..utils import ( from ..utils import (
determine_ext, determine_ext,
js_to_json,
strip_jsonp, strip_jsonp,
unified_strdate, unified_strdate,
ExtractorError, ExtractorError,
@ -21,8 +22,6 @@ class WDRIE(InfoExtractor):
_PAGE_REGEX = r'/mediathek/(?P<media_type>[^/]+)/(?P<type>[^/]+)/(?P<display_id>.+)\.html' _PAGE_REGEX = r'/mediathek/(?P<media_type>[^/]+)/(?P<type>[^/]+)/(?P<display_id>.+)\.html'
_VALID_URL = r'(?P<page_url>https?://(?:www\d\.)?wdr\d?\.de)' + _PAGE_REGEX + '|' + _CURRENT_MAUS_URL _VALID_URL = r'(?P<page_url>https?://(?:www\d\.)?wdr\d?\.de)' + _PAGE_REGEX + '|' + _CURRENT_MAUS_URL
_JS_URL_REGEX = r'(https?://deviceids-medp.wdr.de/ondemand/\d+/\d+\.js)'
_TESTS = [ _TESTS = [
{ {
'url': 'http://www1.wdr.de/mediathek/video/sendungen/doku-am-freitag/video-geheimnis-aachener-dom-100.html', 'url': 'http://www1.wdr.de/mediathek/video/sendungen/doku-am-freitag/video-geheimnis-aachener-dom-100.html',
@ -102,9 +101,13 @@ class WDRIE(InfoExtractor):
display_id = mobj.group('display_id') display_id = mobj.group('display_id')
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
js_url = self._search_regex(self._JS_URL_REGEX, webpage, 'js_url', default=None) # for wdr.de the data-extension is in a tag with the class "mediaLink"
# for wdrmaus its in a link to the page in a multiline "videoLink"-tag
json_metadata = self._html_search_regex(
r'class=(?:"mediaLink\b[^"]*"[^>]+|"videoLink\b[^"]*"[\s]*>\n[^\n]*)data-extension="([^"]+)"',
webpage, 'media link', default=None, flags=re.MULTILINE)
if not js_url: if not json_metadata:
entries = [ entries = [
self.url_result(page_url + href[0], 'WDR') self.url_result(page_url + href[0], 'WDR')
for href in re.findall( for href in re.findall(
@ -117,8 +120,12 @@ class WDRIE(InfoExtractor):
raise ExtractorError('No downloadable streams found', expected=True) raise ExtractorError('No downloadable streams found', expected=True)
media_link_obj = self._parse_json(json_metadata, display_id,
transform_source=js_to_json)
jsonp_url = media_link_obj['mediaObj']['url']
metadata = self._download_json( metadata = self._download_json(
js_url, 'metadata', transform_source=strip_jsonp) jsonp_url, 'metadata', transform_source=strip_jsonp)
metadata_tracker_data = metadata['trackerData'] metadata_tracker_data = metadata['trackerData']
metadata_media_resource = metadata['mediaResource'] metadata_media_resource = metadata['mediaResource']