1
0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-11 03:20:09 +08:00

[heise] delegate to KalturaIE when necessary (#14961)

This commit is contained in:
Kay B 2018-03-01 02:18:32 +01:00
parent 44dc11db61
commit 744fd94d1b

View File

@ -3,11 +3,14 @@ from __future__ import unicode_literals
from .common import InfoExtractor
from .youtube import YoutubeIE
from .kaltura import KalturaIE
from ..utils import (
determine_ext,
int_or_none,
parse_iso8601,
xpath_text,
smuggle_url,
ExtractorError,
)
@ -42,6 +45,16 @@ class HeiseIE(InfoExtractor):
'params': {
'skip_download': True,
},
}, {
'url': 'https://www.heise.de/video/artikel/nachgehakt-Wie-sichert-das-c-t-Tool-Restric-tor-Windows-10-ab-3700244.html',
'md5': '4b58058b46625bdbd841fc2804df95fc',
'info_dict': {
'id': '1_ntrmio2s',
'timestamp': 1512470717,
'upload_date': '20171205',
'ext': 'mp4',
'title': 'ct10 nachgehakt hos restrictor',
},
}, {
'url': 'http://www.heise.de/ct/artikel/c-t-uplink-3-3-Owncloud-Tastaturen-Peilsender-Smartphone-2403911.html',
'only_matching': True,
@ -67,9 +80,16 @@ class HeiseIE(InfoExtractor):
if yt_urls:
return self.playlist_from_matches(yt_urls, video_id, title, ie=YoutubeIE.ie_key())
container_id = self._search_regex(
r'<div class="videoplayerjw"[^>]+data-container="([0-9]+)"',
webpage, 'container ID')
try:
container_id = self._search_regex(
r'<div class="videoplayerjw"[^>]+data-container="([0-9]+)"',
webpage, 'container ID')
except ExtractorError:
kaltura_url = KalturaIE._extract_url(webpage)
if kaltura_url:
return self.url_result(smuggle_url(kaltura_url, {'source_url': url}), KalturaIE.ie_key())
sequenz_id = self._search_regex(
r'<div class="videoplayerjw"[^>]+data-sequenz="([0-9]+)"',
webpage, 'sequenz ID')