From: Sergey M․ Date: Mon, 9 Nov 2015 14:49:42 +0000 (+0600) Subject: [generic] Improve kaltura embed detection (2) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=6a5d6de1e36f5278b48b7dcc92a8e15adbe541ad;p=youtube-dl [generic] Improve kaltura embed detection (2) --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 5f61ab26f..d0b486d2a 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -1672,7 +1672,7 @@ class GenericIE(InfoExtractor): return self.url_result(mobj.group('url'), 'Zapiks') # Look for Kaltura embeds - mobj = (re.search(r"(?s)kWidget\.(?:thumb)?[Ee]mbed\(\{.*?'wid'\s*:\s*'_?(?P[^']+)',.*?'entry_id'\s*:\s*'(?P[^']+)',", webpage) or + mobj = (re.search(r"(?s)kWidget\.(?:thumb)?[Ee]mbed\(\{.*?'wid'\s*:\s*'_?(?P[^']+)',.*?'entry_?[Ii]d'\s*:\s*'(?P[^']+)',", webpage) or re.search(r'(?s)(?P["\'])(?:https?:)?//cdnapi(?:sec)?\.kaltura\.com/.*?(?:p|partner_id)/(?P\d+).*?(?P=q1).*?entry_?[Ii]d\s*:\s*(?P["\'])(?P.+?)(?P=q2)', webpage)) if mobj is not None: return self.url_result('kaltura:%(partner_id)s:%(id)s' % mobj.groupdict(), 'Kaltura')