Browse Source
[extractor/generic] Use _extract_url for kaltura embeds (Closes #9922)
master
Sergey M․
8 years ago
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with
4 additions and
6 deletions
-
youtube_dl/extractor/generic.py
|
|
|
@ -64,6 +64,7 @@ from .liveleak import LiveLeakIE |
|
|
|
from .threeqsdn import ThreeQSDNIE |
|
|
|
from .theplatform import ThePlatformIE |
|
|
|
from .vessel import VesselIE |
|
|
|
from .kaltura import KalturaIE |
|
|
|
|
|
|
|
|
|
|
|
class GenericIE(InfoExtractor): |
|
|
|
@ -1926,12 +1927,9 @@ class GenericIE(InfoExtractor): |
|
|
|
return self.url_result(mobj.group('url'), 'Zapiks') |
|
|
|
|
|
|
|
# Look for Kaltura embeds |
|
|
|
mobj = (re.search(r"(?s)kWidget\.(?:thumb)?[Ee]mbed\(\{.*?(?P<q1>['\"])wid(?P=q1)\s*:\s*(?P<q2>['\"])_?(?P<partner_id>[^'\"]+)(?P=q2),.*?(?P<q3>['\"])entry_?[Ii]d(?P=q3)\s*:\s*(?P<q4>['\"])(?P<id>[^'\"]+)(?P=q4),", webpage) or |
|
|
|
re.search(r'(?s)(?P<q1>["\'])(?:https?:)?//cdnapi(?:sec)?\.kaltura\.com/.*?(?:p|partner_id)/(?P<partner_id>\d+).*?(?P=q1).*?(?P<q2>["\'])?entry_?[Ii]d(?P=q2)\s*:\s*(?P<q3>["\'])(?P<id>.+?)(?P=q3)', webpage)) |
|
|
|
if mobj is not None: |
|
|
|
return self.url_result(smuggle_url( |
|
|
|
'kaltura:%(partner_id)s:%(id)s' % mobj.groupdict(), |
|
|
|
{'source_url': url}), 'Kaltura') |
|
|
|
kaltura_url = KalturaIE._extract_url(webpage) |
|
|
|
if kaltura_url: |
|
|
|
return self.url_result(smuggle_url(kaltura_url, {'source_url': url}), KalturaIE.ie_key()) |
|
|
|
|
|
|
|
# Look for Eagle.Platform embeds |
|
|
|
mobj = re.search( |
|
|
|
|
