|
@ -918,6 +918,19 @@ class GenericIE(InfoExtractor): |
|
|
'uploader_id': 'echojecka', |
|
|
'uploader_id': 'echojecka', |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
|
|
|
# Kaltura embed with single quotes |
|
|
|
|
|
{ |
|
|
|
|
|
'url': 'http://fod.infobase.com/p_ViewPlaylist.aspx?AssignmentID=NUN8ZY', |
|
|
|
|
|
'info_dict': { |
|
|
|
|
|
'id': '0_izeg5utt', |
|
|
|
|
|
'ext': 'mp4', |
|
|
|
|
|
'title': '35871', |
|
|
|
|
|
'timestamp': 1355743100, |
|
|
|
|
|
'upload_date': '20121217', |
|
|
|
|
|
'uploader_id': 'batchUser', |
|
|
|
|
|
}, |
|
|
|
|
|
'add_ie': ['Kaltura'], |
|
|
|
|
|
}, |
|
|
# Eagle.Platform embed (generic URL) |
|
|
# Eagle.Platform embed (generic URL) |
|
|
{ |
|
|
{ |
|
|
'url': 'http://lenta.ru/news/2015/03/06/navalny/', |
|
|
'url': 'http://lenta.ru/news/2015/03/06/navalny/', |
|
@ -1903,7 +1916,7 @@ class GenericIE(InfoExtractor): |
|
|
return self.url_result(mobj.group('url'), 'Zapiks') |
|
|
return self.url_result(mobj.group('url'), 'Zapiks') |
|
|
|
|
|
|
|
|
# Look for Kaltura embeds |
|
|
# Look for Kaltura embeds |
|
|
mobj = (re.search(r"(?s)kWidget\.(?:thumb)?[Ee]mbed\(\{.*?'wid'\s*:\s*'_?(?P<partner_id>[^']+)',.*?'entry_?[Ii]d'\s*:\s*'(?P<id>[^']+)',", webpage) or |
|
|
|
|
|
|
|
|
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).*?entry_?[Ii]d\s*:\s*(?P<q2>["\'])(?P<id>.+?)(?P=q2)', webpage)) |
|
|
re.search(r'(?s)(?P<q1>["\'])(?:https?:)?//cdnapi(?:sec)?\.kaltura\.com/.*?(?:p|partner_id)/(?P<partner_id>\d+).*?(?P=q1).*?entry_?[Ii]d\s*:\s*(?P<q2>["\'])(?P<id>.+?)(?P=q2)', webpage)) |
|
|
if mobj is not None: |
|
|
if mobj is not None: |
|
|
return self.url_result(smuggle_url( |
|
|
return self.url_result(smuggle_url( |
|
|