From: Sergey M․ Date: Sat, 8 Apr 2017 09:48:27 +0000 (+0700) Subject: [kaltura] Cleanup regexes from redundant escaping X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=78280352ca8e4af4e82fc92228200aef3f06ce53;p=youtube-dl [kaltura] Cleanup regexes from redundant escaping --- diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py index c6efdea93..41c1f3d96 100644 --- a/youtube_dl/extractor/kaltura.py +++ b/youtube_dl/extractor/kaltura.py @@ -108,34 +108,34 @@ class KalturaIE(InfoExtractor): @staticmethod def _extract_url(webpage): + # Embed codes: https://knowledge.kaltura.com/embedding-kaltura-media-players-your-site mobj = ( - # Embed codes: https://knowledge.kaltura.com/embedding-kaltura-media-players-your-site re.search( r"""(?xs) kWidget\.(?:thumb)?[Ee]mbed\( \{.*? - (?P['\"])wid(?P=q1)\s*:\s* - (?P['\"])_?(?P(?:(?!(?P=q2)).)+)(?P=q2),.*? - (?P['\"])entry_?[Ii]d(?P=q3)\s*:\s* - (?P['\"])(?P(?:(?!(?P=q4)).)+)(?P=q4)(?:,|\s*\}) + (?P['"])wid(?P=q1)\s*:\s* + (?P['"])_?(?P(?:(?!(?P=q2)).)+)(?P=q2),.*? + (?P['"])entry_?[Ii]d(?P=q3)\s*:\s* + (?P['"])(?P(?:(?!(?P=q4)).)+)(?P=q4)(?:,|\s*\}) """, webpage) or re.search( r'''(?xs) - (?P["\']) + (?P["']) (?:https?:)?//cdnapi(?:sec)?\.kaltura\.com(?::\d+)?/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P\d+)(?:(?!(?P=q1)).)* (?P=q1).*? (?: entry_?[Ii]d| - (?P["\'])entry_?[Ii]d(?P=q2) + (?P["'])entry_?[Ii]d(?P=q2) )\s*:\s* - (?P["\'])(?P(?:(?!(?P=q3)).)+)(?P=q3) + (?P["'])(?P(?:(?!(?P=q3)).)+)(?P=q3) ''', webpage) or re.search( r'''(?xs) - ]+src=(?P["\']) - (?:https?:)?//(?:www\.)?kaltura\.com/p/(?P\d+)/ + ]+src=(?P["']) + (?:https?:)?//(?:www\.)?kaltura\.com/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P\d+) (?:(?!(?P=q1)).)* - [\?&]entry_id=(?P(?:(?!(?P=q1))[^&])+) + [?&]entry_id=(?P(?:(?!(?P=q1))[^&])+) (?P=q1) ''', webpage) )