diff --git a/youtube_dl/extractor/mediahuis.py b/youtube_dl/extractor/mediahuis.py index 7399cf847..088a01fab 100644 --- a/youtube_dl/extractor/mediahuis.py +++ b/youtube_dl/extractor/mediahuis.py @@ -149,26 +149,25 @@ class MediahuisIE(InfoExtractor): description = self._og_search_description(webpage) url_type = None - iframe_m = re.search(r']+src="(.+?kaltura.com.*?)"', webpage) + iframe_m = re.search(r']+src="(.+?kaltura\.com.*?)"', webpage) if iframe_m: video_url = smuggle_url(KalturaIE._extract_url(webpage), {'source_url': url}) url_type = 'url_transparent' - iframe_m = re.search(r']+src="(.+?vier.be.*?)"', webpage) + iframe_m = re.search(r']+src="(.+?vier\.be.*?)"', webpage) if iframe_m: video_url = (iframe_m.group(1)) url_type = 'url_transparent' - iframe_m = re.search(r']+src="(.+?vrt.be.*?)"', webpage) + iframe_m = re.search(r']+src="(.+?vrt\.be.*?)"', webpage) if iframe_m: webpage = self._download_webpage(iframe_m.group(1), "vrt-iframe") - video_url = self._search_regex(r'sources.pdl = "(.*?)";', webpage, 'vrt-video') + video_url = self._search_regex(r'sources.pdl\s*=\s*"(.*?)";', webpage, 'vrt-video') - iframe_m = re.search(r']+src="(.+?vmma.be.*?)"', webpage) + iframe_m = re.search(r']+src="(.+?vmma\.be.*?)"', webpage) if iframe_m: video_url = (iframe_m.group(1)) url_type = 'url_transparent' - # return self.url_result(video_url, 'Medialaan') # Source: flvpd.vtm.be/video.medialaancdn.be iframe_m = re.search(r']+videoUrl:\'(.+?)\'', webpage) diff --git a/youtube_dl/extractor/medialaan.py b/youtube_dl/extractor/medialaan.py index 6212bf8e6..a2a566636 100644 --- a/youtube_dl/extractor/medialaan.py +++ b/youtube_dl/extractor/medialaan.py @@ -7,6 +7,7 @@ from ..compat import compat_str from ..utils import ( ExtractorError, int_or_none, + str_or_none, parse_duration, try_get, unified_timestamp, @@ -85,6 +86,10 @@ class MedialaanIE(InfoExtractor): # clip 'url': 'http://vtmkzoom.be/k3-dansstudio/een-nieuw-seizoen-van-k3-dansstudio', 'only_matching': True, + }, { + # syndication.medialaan.be + 'url': 'https://syndication.medialaan.be/syndication/?vID=50534bb11fe5827eb25cad5c3445c5ae', + 'only_matching': True, }] def _real_initialize(self): @@ -147,8 +152,7 @@ class MedialaanIE(InfoExtractor): if player: video = player[-1] info = { - 'id': video_id, - # 'id': str_or_none(video['id']) or video_id, + 'id': str_or_none(video['id']) or video_id, 'url': video['videoUrl'], 'title': video['title'], 'thumbnail': video.get('imageUrl'),