diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-02-10 01:24:14 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-02-10 01:24:14 +0700 |
| commit | ff24261ba0359d51dfa54fe4c84a9db157e3b76c (patch) | |
| tree | 17545b2dc60cad7d60c11e7fc91c115d26b96d72 | |
| parent | fbc6dc525e525565544b377a1d16cd915cb11a7c (diff) | |
| download | youtube-dl-ff24261ba0359d51dfa54fe4c84a9db157e3b76c.tar.gz youtube-dl-ff24261ba0359d51dfa54fe4c84a9db157e3b76c.tar.xz youtube-dl-ff24261ba0359d51dfa54fe4c84a9db157e3b76c.zip | |
[kaltura] Add explicit port to regexes
They should not match e.g. cdnapi.kaltura.computernetworks.com/...
| -rw-r--r-- | youtube_dl/extractor/kaltura.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py index c6483bcf0..54374ea76 100644 --- a/youtube_dl/extractor/kaltura.py +++ b/youtube_dl/extractor/kaltura.py @@ -23,7 +23,7 @@ class KalturaIE(InfoExtractor): (?: kaltura:(?P<partner_id>\d+):(?P<id>[0-9a-z_]+)| https?:// - (:?(?:www|cdnapi(?:sec)?)\.)?kaltura\.com/ + (:?(?:www|cdnapi(?:sec)?)\.)?kaltura\.com(?::\d+)?/ (?: (?: # flash player @@ -98,6 +98,10 @@ class KalturaIE(InfoExtractor): { 'url': 'https://www.kaltura.com/index.php/extwidget/preview/partner_id/1770401/uiconf_id/37307382/entry_id/0_58u8kme7/embed/iframe?&flashvars[streamerType]=auto', 'only_matching': True, + }, + { + 'url': 'https://www.kaltura.com:443/index.php/extwidget/preview/partner_id/1770401/uiconf_id/37307382/entry_id/0_58u8kme7/embed/iframe?&flashvars[streamerType]=auto', + 'only_matching': True, } ] @@ -116,7 +120,7 @@ class KalturaIE(InfoExtractor): re.search( r'''(?xs) (?P<q1>["\']) - (?:https?:)?//cdnapi(?:sec)?\.kaltura\.com(?:(?!(?P=q1)).)*/(?:p|partner_id)/(?P<partner_id>\d+)(?:(?!(?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| |