X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fspike.py;h=182f286dfefc4023483c422fbf6c6a73203b86ff;hb=3f724339dbe61fe84dd8e66e9c3b74ba6a9c6ddf;hp=a3adf54e3097a5f91a5617c24f286cae5e374e24;hpb=9e55e37a2e0e3a4e7d3fac2efd4ea13efe689b0e;p=youtube-dl.git diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py index a3adf54e3..182f286df 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|playlists)|(?: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)