diff --git a/youtube_dl/extractor/wdr.py b/youtube_dl/extractor/wdr.py index b46802306..4916944ff 100644 --- a/youtube_dl/extractor/wdr.py +++ b/youtube_dl/extractor/wdr.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import itertools import re +import json from .common import InfoExtractor from ..compat import ( @@ -16,9 +17,8 @@ from ..utils import ( class WDRIE(InfoExtractor): - _PLAYER_REGEX = '-(?:video|audio)player(?:_size-[LMS])?' - _VALID_URL = r'(?Phttps?://www\d?\.(?:wdr\d?|funkhauseuropa)\.de/)(?P.+?)(?P%s)?\.html' % _PLAYER_REGEX - + _PLAYER_REGEX = 'https?://deviceids-medstdp.wdr.de/ondemand/.+?/.+?\.js' + _VALID_URL = r'(?Phttps?://www\d?\.(?:wdr\d?|funkhauseuropa)\.de/)(?P.+?)\.html' _TESTS = [ { 'url': 'http://www1.wdr.de/mediathek/video/sendungen/servicezeit/videoservicezeit560-videoplayer_size-L.html', @@ -95,80 +95,86 @@ class WDRIE(InfoExtractor): } ] + def _overiew_page_extractor(self, page_url, page_id, webpage): + entries = [] + for page_num in itertools.count(2): + hrefs = re.findall( + r'
  • \s*]*>\s*\s*\s*]*>\s*\s*\n
    \n