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

Merge pull request #98 from ytdl-org/master

Browse Source 
[pull] master from ytdl-org:master
This commit is contained in:
pull[bot] 2019-09-26 16:17:07 +00:00 committed by GitHub
commit 74995ec902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/extractor/heise.py
View File

@ -105,8 +105,7 @@ class HeiseIE(InfoExtractor):
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 @@ class HeiseIE(InfoExtractor):
'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(

2
youtube_dl/extractor/openload.py
View File

@ -362,7 +362,7 @@ class OpenloadIE(InfoExtractor):
}, { }, {
'url': 'https://oload.services/embed/bs1NWj1dCag/', 'url': 'https://oload.services/embed/bs1NWj1dCag/',
'only_matching': True, 'only_matching': True,
}, { }, {
'url': 'https://oload.online/f/W8o2UfN1vNY/', 'url': 'https://oload.online/f/W8o2UfN1vNY/',
'only_matching': True, 'only_matching': True,
}, { }, {