projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
574e9db
)
[heise] Add support for kaltura embeds (closes #14961)
author
kayb94
<30302445+kayb94@users.noreply.github.com>
Tue, 6 Mar 2018 16:10:01 +0000
(17:10 +0100)
committer
Sergey M
<dstftw@gmail.com>
Tue, 6 Mar 2018 16:10:01 +0000
(23:10 +0700)
youtube_dl/extractor/heise.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/heise.py
b/youtube_dl/extractor/heise.py
index 82e11a7d88735f2105d0dff70c4304ecbf274ff0..8f49f52efd5398abbc7b922b9e2a268b3f609e2a 100644
(file)
--- 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 __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,
from .youtube import YoutubeIE
from ..utils import (
determine_ext,
int_or_none,
parse_iso8601,
+ smuggle_url,
xpath_text,
)
xpath_text,
)
@@
-42,6
+44,19
@@
class HeiseIE(InfoExtractor):
'params': {
'skip_download': True,
},
'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',
+ },
+ '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,
}, {
'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())
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')
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')
sequenz_id = self._search_regex(
r'<div class="videoplayerjw"[^>]+data-sequenz="([0-9]+)"',
webpage, 'sequenz ID')