aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkayb94 <30302445+kayb94@users.noreply.github.com>2018-03-06 17:10:01 +0100
committerSergey M <dstftw@gmail.com>2018-03-06 23:10:01 +0700
commit6202f08e1bb4621873cf12d471cd566c4d5cfbc8 (patch)
tree44a87e545dc44cdb1e397915dbbe5563d7f7aa1f
parent574e9db2b051ddb9b553ad89abb474daf474d408 (diff)
downloadyoutube-dl-6202f08e1bb4621873cf12d471cd566c4d5cfbc8.tar.xz
[heise] Add support for kaltura embeds (closes #14961)
-rw-r--r--youtube_dl/extractor/heise.py20
1 files changed, 20 insertions, 0 deletions
diff --git a/youtube_dl/extractor/heise.py b/youtube_dl/extractor/heise.py
index 82e11a7d8..8f49f52ef 100644
--- a/youtube_dl/extractor/heise.py
+++ b/youtube_dl/extractor/heise.py
@@ -2,11 +2,13 @@
from __future__ import unicode_literals
from .common import InfoExtractor
+from .kaltura import KalturaIE
from .youtube import YoutubeIE
from ..utils import (
determine_ext,
int_or_none,
parse_iso8601,
+ smuggle_url,
xpath_text,
)
@@ -43,6 +45,19 @@ class HeiseIE(InfoExtractor):
'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',
+ },
+ 'params': {
+ 'skip_download': True,
+ },
+ }, {
'url': 'http://www.heise.de/ct/artikel/c-t-uplink-3-3-Owncloud-Tastaturen-Peilsender-Smartphone-2403911.html',
'only_matching': True,
}, {
@@ -67,9 +82,14 @@ class HeiseIE(InfoExtractor):
if yt_urls:
return self.playlist_from_matches(yt_urls, video_id, title, ie=YoutubeIE.ie_key())
+ kaltura_url = KalturaIE._extract_url(webpage)
+ if kaltura_url:
+ return self.url_result(smuggle_url(kaltura_url, {'source_url': url}), KalturaIE.ie_key())
+
container_id = self._search_regex(
r'<div class="videoplayerjw"[^>]+data-container="([0-9]+)"',
webpage, 'container ID')
+
sequenz_id = self._search_regex(
r'<div class="videoplayerjw"[^>]+data-sequenz="([0-9]+)"',
webpage, 'sequenz ID')