mirror of
https://github.com/l1ving/youtube-dl
synced 2024-12-21 22:13:04 +08:00
[kaltura] improve embed partner id extraction(fixes #12041)
This commit is contained in:
parent
b04975733c
commit
37084f6641
@ -27,7 +27,7 @@ class KalturaIE(InfoExtractor):
|
||||
(?:
|
||||
(?:
|
||||
# flash player
|
||||
index\.php/kwidget|
|
||||
index\.php/(?:kwidget|extwidget/preview)|
|
||||
# html5 player
|
||||
html5/html5lib/[^/]+/mwEmbedFrame\.php
|
||||
)
|
||||
@ -94,6 +94,10 @@ class KalturaIE(InfoExtractor):
|
||||
'params': {
|
||||
'skip_download': True,
|
||||
},
|
||||
},
|
||||
{
|
||||
'url': 'https://www.kaltura.com/index.php/extwidget/preview/partner_id/1770401/uiconf_id/37307382/entry_id/0_58u8kme7/embed/iframe?&flashvars[streamerType]=auto',
|
||||
'only_matching': True,
|
||||
}
|
||||
]
|
||||
|
||||
@ -112,7 +116,7 @@ class KalturaIE(InfoExtractor):
|
||||
re.search(
|
||||
r'''(?xs)
|
||||
(?P<q1>["\'])
|
||||
(?:https?:)?//cdnapi(?:sec)?\.kaltura\.com/(?:(?!(?P=q1)).)*(?:p|partner_id)/(?P<partner_id>\d+)(?:(?!(?P=q1)).)*
|
||||
(?:https?:)?//cdnapi(?:sec)?\.kaltura\.com(?:(?!(?P=q1)).)*/(?:p|partner_id)/(?P<partner_id>\d+)(?:(?!(?P=q1)).)*
|
||||
(?P=q1).*?
|
||||
(?:
|
||||
entry_?[Ii]d|
|
||||
@ -209,6 +213,8 @@ class KalturaIE(InfoExtractor):
|
||||
partner_id = params['wid'][0][1:]
|
||||
elif 'p' in params:
|
||||
partner_id = params['p'][0]
|
||||
elif 'partner_id' in params:
|
||||
partner_id = params['partner_id'][0]
|
||||
else:
|
||||
raise ExtractorError('Invalid URL', expected=True)
|
||||
if 'entry_id' in params:
|
||||
|
Loading…
Reference in New Issue
Block a user