projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b049757
)
[kaltura] improve embed partner id extraction(fixes #12041)
author
Remita Amine
<remitamine@gmail.com>
Thu, 9 Feb 2017 15:24:54 +0000
(16:24 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Thu, 9 Feb 2017 15:24:54 +0000
(16:24 +0100)
youtube_dl/extractor/kaltura.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/kaltura.py
b/youtube_dl/extractor/kaltura.py
index 5ef382f9f730091c079ab5083e0ab87f4677c407..c6483bcf02216e3c3ee86d10bbec82d0a6449692 100644
(file)
--- a/
youtube_dl/extractor/kaltura.py
+++ b/
youtube_dl/extractor/kaltura.py
@@
-27,7
+27,7
@@
class KalturaIE(InfoExtractor):
(?:
(?:
# flash player
(?:
(?:
# flash player
- index\.php/
kwidget
|
+ index\.php/
(?:kwidget|extwidget/preview)
|
# html5 player
html5/html5lib/[^/]+/mwEmbedFrame\.php
)
# html5 player
html5/html5lib/[^/]+/mwEmbedFrame\.php
)
@@
-94,6
+94,10
@@
class KalturaIE(InfoExtractor):
'params': {
'skip_download': True,
},
'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>["\'])
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|
(?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]
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:
else:
raise ExtractorError('Invalid URL', expected=True)
if 'entry_id' in params: