[streamcloud] Match URLs without fname (Closes #4144)

Also, modernize a bit.
This commit is contained in:
Naglis Jonaitis 2014-11-09 22:00:51 +02:00
parent 1a92e086a7
commit 3c6af203cc

View File

@ -13,7 +13,7 @@ from ..utils import (
class StreamcloudIE(InfoExtractor): class StreamcloudIE(InfoExtractor):
IE_NAME = 'streamcloud.eu' 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 = { _TEST = {
'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html', '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): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) video_id = self._match_id(url)
video_id = mobj.group('id') url = 'http://streamcloud.eu/%s' % video_id
orig_webpage = self._download_webpage(url, video_id) orig_webpage = self._download_webpage(url, video_id)