aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/kaltura.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-09-26 22:15:58 +0700
committerSergey M․ <dstftw@gmail.com>2016-09-26 22:15:58 +0700
commitfffb9cff944cfab11f311900ee8138f28f7232d3 (patch)
tree9bc51c3bd3d7d0632d876d6c7b043fed4d9f45db /youtube_dl/extractor/kaltura.py
parentd3c97bad6181e1d3dc0cb4eece041e1cfb0ba6bc (diff)
[kaltura] Speed up embed regexes (#10764)
Diffstat (limited to 'youtube_dl/extractor/kaltura.py')
-rw-r--r--youtube_dl/extractor/kaltura.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py
index 5a8403777..91bc3a0a7 100644
--- a/youtube_dl/extractor/kaltura.py
+++ b/youtube_dl/extractor/kaltura.py
@@ -105,20 +105,20 @@ class KalturaIE(InfoExtractor):
kWidget\.(?:thumb)?[Ee]mbed\(
\{.*?
(?P<q1>['\"])wid(?P=q1)\s*:\s*
- (?P<q2>['\"])_?(?P<partner_id>[^'\"]+)(?P=q2),.*?
+ (?P<q2>['\"])_?(?P<partner_id>(?:(?!(?P=q2)).)+)(?P=q2),.*?
(?P<q3>['\"])entry_?[Ii]d(?P=q3)\s*:\s*
- (?P<q4>['\"])(?P<id>[^'\"]+)(?P=q4),
+ (?P<q4>['\"])(?P<id>(?:(?!(?P=q4)).)+)(?P=q4),
""", webpage) or
re.search(
r'''(?xs)
(?P<q1>["\'])
- (?:https?:)?//cdnapi(?:sec)?\.kaltura\.com/.*?(?:p|partner_id)/(?P<partner_id>\d+).*?
+ (?:https?:)?//cdnapi(?:sec)?\.kaltura\.com/(?:(?!(?P=q1)).)*(?:p|partner_id)/(?P<partner_id>\d+)(?:(?!(?P=q1)).)*
(?P=q1).*?
(?:
entry_?[Ii]d|
(?P<q2>["\'])entry_?[Ii]d(?P=q2)
)\s*:\s*
- (?P<q3>["\'])(?P<id>.+?)(?P=q3)
+ (?P<q3>["\'])(?P<id>(?:(?!(?P=q3)).)+)(?P=q3)
''', webpage))
if mobj:
embed_info = mobj.groupdict()