[heise] Fix kaltura embeds extraction (closes #22514)

This commit is contained in:
Sergey M․ 2019-09-26 23:11:02 +07:00
parent 2a88a0c44d
commit cb3e4a2947
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -105,8 +105,7 @@ def extract_title(default=NO_DEFAULT):
webpage, default=None) or self._html_search_meta( webpage, default=None) or self._html_search_meta(
'description', webpage) 'description', webpage)
kaltura_url = KalturaIE._extract_url(webpage) def _make_kaltura_result(kaltura_url):
if kaltura_url:
return { return {
'_type': 'url_transparent', '_type': 'url_transparent',
'url': smuggle_url(kaltura_url, {'source_url': url}), 'url': smuggle_url(kaltura_url, {'source_url': url}),
@ -115,6 +114,16 @@ def extract_title(default=NO_DEFAULT):
'description': description, 'description': description,
} }
kaltura_url = KalturaIE._extract_url(webpage)
if kaltura_url:
return _make_kaltura_result(kaltura_url)
kaltura_id = self._search_regex(
r'entry-id=(["\'])(?P<id>(?:(?!\1).)+)\1', webpage, 'kaltura id',
default=None, group='id')
if kaltura_id:
return _make_kaltura_result('kaltura:2238431:%s' % kaltura_id)
yt_urls = YoutubeIE._extract_urls(webpage) yt_urls = YoutubeIE._extract_urls(webpage)
if yt_urls: if yt_urls:
return self.playlist_from_matches( return self.playlist_from_matches(