X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/c512650955de0b16d37e7fa7fb29ea0985e415bb..a6abd8dc822fb70852437ab5a77ced5f633739f8:/youtube_dl/extractor/spike.py diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py index a3adf54..e529bb5 100644 --- a/youtube_dl/extractor/spike.py +++ b/youtube_dl/extractor/spike.py @@ -1,14 +1,12 @@ from __future__ import unicode_literals -import re - from .mtv import MTVServicesInfoExtractor class SpikeIE(MTVServicesInfoExtractor): _VALID_URL = r'''(?x)https?:// - (www\.spike\.com/(video-clips|episodes)/.+| - m\.spike\.com/videos/video.rbml\?id=(?P[^&]+)) + (?:www\.spike\.com/(?:video-clips|(?:full-)?episodes)/.+| + m\.spike\.com/videos/video\.rbml\?id=(?P[^&]+)) ''' _TEST = { 'url': 'http://www.spike.com/video-clips/lhtu8m/auction-hunters-can-allen-ride-a-hundred-year-old-motorcycle', @@ -25,8 +23,7 @@ class SpikeIE(MTVServicesInfoExtractor): _MOBILE_TEMPLATE = 'http://m.spike.com/videos/video.rbml?id=%s' def _real_extract(self, url): - mobj = re.search(self._VALID_URL, url) - mobile_id = mobj.group('mobile_id') - if mobile_id is not None: + mobile_id = self._match_id(url) + if mobile_id: url = 'http://www.spike.com/video-clips/%s' % mobile_id return super(SpikeIE, self)._real_extract(url)