aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-10-09 20:34:03 +0100
committerremitamine <remitamine@gmail.com>2015-10-09 20:34:03 +0100
commit05ad5409b4fd044169ea0f67b9ae92d555564c4e (patch)
tree306a350dde5eff3f240602fe86254d3f6c129216 /youtube_dl/extractor
parent1ef1563649374568870e9334cce7055f7c83a817 (diff)
[srgssr] fix regex for swissinfo.ch
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/srgssr.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/youtube_dl/extractor/srgssr.py b/youtube_dl/extractor/srgssr.py
index addf4d26e..3b5dcc503 100644
--- a/youtube_dl/extractor/srgssr.py
+++ b/youtube_dl/extractor/srgssr.py
@@ -96,7 +96,7 @@ class SRGSSRIE(InfoExtractor):
class SRGSSRPlayIE(InfoExtractor):
- _VALID_URL = r'https?://(?:(?:www|play)\.)?(?P<bu>srf|rts|rsi|rtr|swi)\.ch/play/(?:tv|radio)/[^/]+/(?P<type>video|audio)/[^?]+\?id=(?P<id>[0-9a-f\-]{36}|\d+)'
+ _VALID_URL = r'https?://(?:(?:www|play)\.)?(?P<bu>srf|rts|rsi|rtr|swissinfo)\.ch/play/(?:tv|radio)/[^/]+/(?P<type>video|audio)/[^?]+\?id=(?P<id>[0-9a-f\-]{36}|\d+)'
_TESTS = [{
'url': 'http://www.srf.ch/play/tv/10vor10/video/snowden-beantragt-asyl-in-russland?id=28e1a57d-5b76-4399-8ab3-9097f071e6c5',
@@ -120,11 +120,8 @@ class SRGSSRPlayIE(InfoExtractor):
'description': 'md5:88604432b60d5a38787f152dec89cd56',
'timestamp': 1373493600,
},
- }, {
- 'url': 'http://www.srf.ch/player/tv/10vor10/video/snowden-beantragt-asyl-in-russland?id=28e1a57d-5b76-4399-8ab3-9097f071e6c5',
- 'only_matching': True,
}]
def _real_extract(self, url):
bu, media_type, media_id = re.match(self._VALID_URL, url).groups()
- return self.url_result('urn:%s:%s:%s' % (bu, media_type, media_id), 'SRGSSR')
+ return self.url_result('urn:%s:%s:%s' % (bu[:3], media_type, media_id), 'SRGSSR')