From: Sergey M․ Date: Mon, 9 Nov 2015 14:49:06 +0000 (+0600) Subject: [generic] Improve kaltura embed detection (Closes #7409) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1c31a5b0e029ae47415f7df7bea30e2b2b5df64f;p=youtube-dl [generic] Improve kaltura embed detection (Closes #7409) --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index ee5419f51..5f61ab26f 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -1673,7 +1673,7 @@ class GenericIE(InfoExtractor): # Look for Kaltura embeds mobj = (re.search(r"(?s)kWidget\.(?:thumb)?[Ee]mbed\(\{.*?'wid'\s*:\s*'_?(?P[^']+)',.*?'entry_id'\s*:\s*'(?P[^']+)',", webpage) or - re.search(r'(?s)(["\'])(?:https?:)?//cdnapisec\.kaltura\.com/.*?(?:p|partner_id)/(?P\d+).*?\1.*?entry_id\s*:\s*(["\'])(?P[^\2]+?)\2', webpage)) + 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')