projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'r4mos/played'
[youtube-dl]
/
youtube_dl
/
extractor
/
spike.py
diff --git
a/youtube_dl/extractor/spike.py
b/youtube_dl/extractor/spike.py
index dbae9e15db4d695820176d9ae2148aaa70c10480..a3adf54e3097a5f91a5617c24f286cae5e374e24 100644
(file)
--- a/
youtube_dl/extractor/spike.py
+++ b/
youtube_dl/extractor/spike.py
@@
-1,10
+1,15
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
+import re
+
from .mtv import MTVServicesInfoExtractor
class SpikeIE(MTVServicesInfoExtractor):
from .mtv import MTVServicesInfoExtractor
class SpikeIE(MTVServicesInfoExtractor):
- _VALID_URL = r'https?://www\.spike\.com/(video-clips|episodes)/.+'
+ _VALID_URL = r'''(?x)https?://
+ (www\.spike\.com/(video-clips|episodes)/.+|
+ m\.spike\.com/videos/video.rbml\?id=(?P<mobile_id>[^&]+))
+ '''
_TEST = {
'url': 'http://www.spike.com/video-clips/lhtu8m/auction-hunters-can-allen-ride-a-hundred-year-old-motorcycle',
'md5': '1a9265f32b0c375793d6c4ce45255256',
_TEST = {
'url': 'http://www.spike.com/video-clips/lhtu8m/auction-hunters-can-allen-ride-a-hundred-year-old-motorcycle',
'md5': '1a9265f32b0c375793d6c4ce45255256',
@@
-18,3
+23,10
@@
class SpikeIE(MTVServicesInfoExtractor):
_FEED_URL = 'http://www.spike.com/feeds/mrss/'
_MOBILE_TEMPLATE = 'http://m.spike.com/videos/video.rbml?id=%s'
_FEED_URL = 'http://www.spike.com/feeds/mrss/'
_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:
+ url = 'http://www.spike.com/video-clips/%s' % mobile_id
+ return super(SpikeIE, self)._real_extract(url)