R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes - one left, still need to replace the re.search's (#2)

Browse Source 
* Add test for syndication.medialaan.be
* Fixes for remarks on mediahuis/medialaan extractor
This commit is contained in:
midas02 2017-04-24 23:11:03 +02:00 committed by Jeroen Meulemeester
parent 01a33c66d6
commit 5051dcbb44
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/mediahuis.py
View File

@ -149,26 +149,25 @@ class MediahuisIE(InfoExtractor):
description = self._og_search_description(webpage) description = self._og_search_description(webpage)
url_type = None url_type = None
iframe_m = re.search(r'<script[^>]+src="(.+?kaltura.com.*?)"', webpage) iframe_m = re.search(r'<script[^>]+src="(.+?kaltura\.com.*?)"', webpage)
if iframe_m: if iframe_m:
video_url = smuggle_url(KalturaIE._extract_url(webpage), {'source_url': url}) video_url = smuggle_url(KalturaIE._extract_url(webpage), {'source_url': url})
url_type = 'url_transparent' url_type = 'url_transparent'
iframe_m = re.search(r'<iframe[^>]+src="(.+?vier.be.*?)"', webpage) iframe_m = re.search(r'<iframe[^>]+src="(.+?vier\.be.*?)"', webpage)
if iframe_m: if iframe_m:
video_url = (iframe_m.group(1)) video_url = (iframe_m.group(1))
url_type = 'url_transparent' url_type = 'url_transparent'
iframe_m = re.search(r'<iframe[^>]+src="(.+?vrt.be.*?)"', webpage) iframe_m = re.search(r'<iframe[^>]+src="(.+?vrt\.be.*?)"', webpage)
if iframe_m: if iframe_m:
webpage = self._download_webpage(iframe_m.group(1), "vrt-iframe") 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'<iframe[^>]+src="(.+?vmma.be.*?)"', webpage) iframe_m = re.search(r'<iframe[^>]+src="(.+?vmma\.be.*?)"', webpage)
if iframe_m: if iframe_m:
video_url = (iframe_m.group(1)) video_url = (iframe_m.group(1))
url_type = 'url_transparent' url_type = 'url_transparent'
# return self.url_result(video_url, 'Medialaan')
# Source: flvpd.vtm.be/video.medialaancdn.be # Source: flvpd.vtm.be/video.medialaancdn.be
iframe_m = re.search(r'<script.+?[^>]+videoUrl:\'(.+?)\'', webpage) iframe_m = re.search(r'<script.+?[^>]+videoUrl:\'(.+?)\'', webpage)

8
youtube_dl/extractor/medialaan.py
View File

@ -7,6 +7,7 @@ from ..compat import compat_str
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
int_or_none, int_or_none,
str_or_none,
parse_duration, parse_duration,
try_get, try_get,
unified_timestamp, unified_timestamp,
@ -85,6 +86,10 @@ class MedialaanIE(InfoExtractor):
# clip # clip
'url': 'http://vtmkzoom.be/k3-dansstudio/een-nieuw-seizoen-van-k3-dansstudio', 'url': 'http://vtmkzoom.be/k3-dansstudio/een-nieuw-seizoen-van-k3-dansstudio',
'only_matching': True, 'only_matching': True,
}, {
# syndication.medialaan.be
'url': 'https://syndication.medialaan.be/syndication/?vID=50534bb11fe5827eb25cad5c3445c5ae',
'only_matching': True,
}] }]
def _real_initialize(self): def _real_initialize(self):
@ -147,8 +152,7 @@ class MedialaanIE(InfoExtractor):
if player: if player:
video = player[-1] video = player[-1]
info = { 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'], 'url': video['videoUrl'],
'title': video['title'], 'title': video['title'],
'thumbnail': video.get('imageUrl'), 'thumbnail': video.get('imageUrl'),