diff options
| -rw-r--r-- | youtube_dl/extractor/spike.py | 27 | 
1 files changed, 15 insertions, 12 deletions
diff --git a/youtube_dl/extractor/spike.py b/youtube_dl/extractor/spike.py index 182f286df..63ea7718b 100644 --- a/youtube_dl/extractor/spike.py +++ b/youtube_dl/extractor/spike.py @@ -4,11 +4,8 @@ from .mtv import MTVServicesInfoExtractor  class SpikeIE(MTVServicesInfoExtractor): -    _VALID_URL = r'''(?x)https?:// -        (?:www\.spike\.com/(?:video-(?:clips|playlists)|(?:full-)?episodes)/.+| -         m\.spike\.com/videos/video\.rbml\?id=(?P<id>[^&]+)) -        ''' -    _TEST = { +    _VALID_URL = r'https?://(?:[^/]+\.)?spike\.com/[^/]+/[\da-z]{6}(?:[/?#&]|$)' +    _TESTS = [{          'url': 'http://www.spike.com/video-clips/lhtu8m/auction-hunters-can-allen-ride-a-hundred-year-old-motorcycle',          'md5': '1a9265f32b0c375793d6c4ce45255256',          'info_dict': { @@ -17,13 +14,19 @@ class SpikeIE(MTVServicesInfoExtractor):              'title': 'Auction Hunters|Can Allen Ride A Hundred Year-Old Motorcycle?',              'description': 'md5:fbed7e82ed5fad493615b3094a9499cb',          }, -    } +    }, { +        'url': 'http://www.spike.com/video-clips/lhtu8m/', +        'only_matching': True, +    }, { +        'url': 'http://www.spike.com/video-clips/lhtu8m', +        'only_matching': True, +    }, { +        'url': 'http://bellator.spike.com/fight/atwr7k/bellator-158-michael-page-vs-evangelista-cyborg', +        'only_matching': True, +    }, { +        'url': 'http://bellator.spike.com/video-clips/bw6k7n/bellator-158-foundations-michael-venom-page', +        'only_matching': True, +    }]      _FEED_URL = 'http://www.spike.com/feeds/mrss/'      _MOBILE_TEMPLATE = 'http://m.spike.com/videos/video.rbml?id=%s' - -    def _real_extract(self, url): -        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)  | 
