projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[common] simplify the use of _extract_m3u8_formats and _extract_f4m_formats
[youtube-dl]
/
youtube_dl
/
extractor
/
spike.py
diff --git
a/youtube_dl/extractor/spike.py
b/youtube_dl/extractor/spike.py
index a3adf54e3097a5f91a5617c24f286cae5e374e24..182f286dfefc4023483c422fbf6c6a73203b86ff 100644
(file)
--- a/
youtube_dl/extractor/spike.py
+++ b/
youtube_dl/extractor/spike.py
@@
-1,14
+1,12
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import re
-
from .mtv import MTVServicesInfoExtractor
class SpikeIE(MTVServicesInfoExtractor):
_VALID_URL = r'''(?x)https?://
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<mobile_
id>[^&]+))
+ (
?:www\.spike\.com/(?:video-(?:clips|playlists)|(?:full-)?
episodes)/.+|
+ m\.spike\.com/videos/video
\.rbml\?id=(?P<
id>[^&]+))
'''
_TEST = {
'url': 'http://www.spike.com/video-clips/lhtu8m/auction-hunters-can-allen-ride-a-hundred-year-old-motorcycle',
'''
_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):
_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)
url = 'http://www.spike.com/video-clips/%s' % mobile_id
return super(SpikeIE, self)._real_extract(url)