diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-04-08 16:48:27 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-04-08 16:48:27 +0700 |
| commit | 78280352ca8e4af4e82fc92228200aef3f06ce53 (patch) | |
| tree | 9a0084ca31661ce49febd66396f40fb1c9fa4278 | |
| parent | a01825a5416174de56625a6ef202311e2d6c8cb1 (diff) | |
| download | youtube-dl-78280352ca8e4af4e82fc92228200aef3f06ce53.tar.gz youtube-dl-78280352ca8e4af4e82fc92228200aef3f06ce53.tar.xz youtube-dl-78280352ca8e4af4e82fc92228200aef3f06ce53.zip | |
[kaltura] Cleanup regexes from redundant escaping
| -rw-r--r-- | youtube_dl/extractor/kaltura.py | 22 |
1 files changed, 11 insertions, 11 deletions
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<q1>['\"])wid(?P=q1)\s*:\s* - (?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)(?:,|\s*\}) + (?P<q1>['"])wid(?P=q1)\s*:\s* + (?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)(?:,|\s*\}) """, webpage) or re.search( r'''(?xs) - (?P<q1>["\']) + (?P<q1>["']) (?:https?:)?//cdnapi(?:sec)?\.kaltura\.com(?::\d+)?/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P<partner_id>\d+)(?:(?!(?P=q1)).)* (?P=q1).*? (?: entry_?[Ii]d| - (?P<q2>["\'])entry_?[Ii]d(?P=q2) + (?P<q2>["'])entry_?[Ii]d(?P=q2) )\s*:\s* - (?P<q3>["\'])(?P<id>(?:(?!(?P=q3)).)+)(?P=q3) + (?P<q3>["'])(?P<id>(?:(?!(?P=q3)).)+)(?P=q3) ''', webpage) or re.search( r'''(?xs) - <iframe[^>]+src=(?P<q1>["\']) - (?:https?:)?//(?:www\.)?kaltura\.com/p/(?P<partner_id>\d+)/ + <iframe[^>]+src=(?P<q1>["']) + (?:https?:)?//(?:www\.)?kaltura\.com/(?:(?!(?P=q1)).)*\b(?:p|partner_id)/(?P<partner_id>\d+) (?:(?!(?P=q1)).)* - [\?&]entry_id=(?P<id>(?:(?!(?P=q1))[^&])+) + [?&]entry_id=(?P<id>(?:(?!(?P=q1))[^&])+) (?P=q1) ''', webpage) ) |