[generic] Improve kaltura embed detection (Closes #7409)
authorSergey M․ <dstftw@gmail.com>
Mon, 9 Nov 2015 14:49:06 +0000 (20:49 +0600)
committerSergey M․ <dstftw@gmail.com>
Mon, 9 Nov 2015 14:49:06 +0000 (20:49 +0600)
youtube_dl/extractor/generic.py

index ee5419f51017a5f3a5ce01018eaaa65f4ab979ab..5f61ab26fe1a550c84081aec82f7f33d7e98dfa7 100644 (file)
@@ -1673,7 +1673,7 @@ class GenericIE(InfoExtractor):
 
         # Look for Kaltura embeds
         mobj = (re.search(r"(?s)kWidget\.(?:thumb)?[Ee]mbed\(\{.*?'wid'\s*:\s*'_?(?P<partner_id>[^']+)',.*?'entry_id'\s*:\s*'(?P<id>[^']+)',", webpage) or
-                re.search(r'(?s)(["\'])(?:https?:)?//cdnapisec\.kaltura\.com/.*?(?:p|partner_id)/(?P<partner_id>\d+).*?\1.*?entry_id\s*:\s*(["\'])(?P<id>[^\2]+?)\2', 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:
             return self.url_result('kaltura:%(partner_id)s:%(id)s' % mobj.groupdict(), 'Kaltura')