diff options
| author | Naglis Jonaitis <njonaitis@gmail.com> | 2014-11-09 22:00:51 +0200 |
|---|---|---|
| committer | Naglis Jonaitis <njonaitis@gmail.com> | 2014-11-09 22:00:51 +0200 |
| commit | 3c6af203cc615f835e8ff95508e04d908950249c (patch) | |
| tree | e18668e767357780b030516e52d809a01dc138c8 | |
| parent | 1a92e086a7cee10c4461cbb92b13fa0df195ada5 (diff) | |
| download | youtube-dl-3c6af203cc615f835e8ff95508e04d908950249c.tar.xz | |
[streamcloud] Match URLs without fname (Closes #4144)
Also, modernize a bit.
| -rw-r--r-- | youtube_dl/extractor/streamcloud.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/streamcloud.py b/youtube_dl/extractor/streamcloud.py index 172def221..c1178f26d 100644 --- a/youtube_dl/extractor/streamcloud.py +++ b/youtube_dl/extractor/streamcloud.py @@ -13,7 +13,7 @@ from ..utils import ( class StreamcloudIE(InfoExtractor): IE_NAME = 'streamcloud.eu' - _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)/(?P<fname>[^#?]*)\.html' + _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)(?:/(?P<fname>[^#?]*)\.html)?' _TEST = { 'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html', @@ -27,8 +27,8 @@ class StreamcloudIE(InfoExtractor): } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') + video_id = self._match_id(url) + url = 'http://streamcloud.eu/%s' % video_id orig_webpage = self._download_webpage(url, video_id) |