projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a01825a
)
[kaltura] Cleanup regexes from redundant escaping
author
Sergey M․
<dstftw@gmail.com>
Sat, 8 Apr 2017 09:48:27 +0000
(16:48 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 8 Apr 2017 09:48:27 +0000
(16:48 +0700)
youtube_dl/extractor/kaltura.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/kaltura.py
b/youtube_dl/extractor/kaltura.py
index c6efdea933bcf1f894cf159d2911f86dde41220a..41c1f3d96be288957cbaba2c21e3477a2969b24d 100644
(file)
--- a/
youtube_dl/extractor/kaltura.py
+++ b/
youtube_dl/extractor/kaltura.py
@@
-108,34
+108,34
@@
class KalturaIE(InfoExtractor):
@staticmethod
def _extract_url(webpage):
@staticmethod
def _extract_url(webpage):
+ # Embed codes: https://knowledge.kaltura.com/embedding-kaltura-media-players-your-site
mobj = (
mobj = (
- # Embed codes: https://knowledge.kaltura.com/embedding-kaltura-media-players-your-site
re.search(
r"""(?xs)
kWidget\.(?:thumb)?[Ee]mbed\(
\{.*?
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)
""", 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|
(?: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*
)\s*:\s*
- (?P<q3>["
\
'])(?P<id>(?:(?!(?P=q3)).)+)(?P=q3)
+ (?P<q3>["'])(?P<id>(?:(?!(?P=q3)).)+)(?P=q3)
''', webpage) or
re.search(
r'''(?xs)
''', 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)).)*
(?:(?!(?P=q1)).)*
- [
\
?&]entry_id=(?P<id>(?:(?!(?P=q1))[^&])+)
+ [?&]entry_id=(?P<id>(?:(?!(?P=q1))[^&])+)
(?P=q1)
''', webpage)
)
(?P=q1)
''', webpage)
)