Sergey M․
8 years ago
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
3 changed files with
7 additions and
4 deletions
-
youtube_dl/extractor/cmt.py
-
youtube_dl/extractor/mtv.py
-
youtube_dl/extractor/southpark.py
|
|
@ -5,7 +5,7 @@ from .mtv import MTVIE |
|
|
|
|
|
|
|
class CMTIE(MTVIE): |
|
|
|
IE_NAME = 'cmt.com' |
|
|
|
_VALID_URL = r'https?://(?:www\.)?cmt\.com/(?:videos|shows|full-episodes|video-clips)/(?P<id>[^/]+)' |
|
|
|
_VALID_URL = r'https?://(?:www\.)?cmt\.com/(?:videos|shows|(?:full-)?episodes|video-clips)/(?P<id>[^/]+)' |
|
|
|
|
|
|
|
_TESTS = [{ |
|
|
|
'url': 'http://www.cmt.com/videos/garth-brooks/989124/the-call-featuring-trisha-yearwood.jhtml#artist=30061', |
|
|
|
|
|
@ -304,7 +304,7 @@ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor): |
|
|
|
|
|
|
|
class MTVIE(MTVServicesInfoExtractor): |
|
|
|
IE_NAME = 'mtv' |
|
|
|
_VALID_URL = r'https?://(?:www\.)?mtv\.com/(?:video-clips|full-episodes)/(?P<id>[^/?#.]+)' |
|
|
|
_VALID_URL = r'https?://(?:www\.)?mtv\.com/(?:video-clips|(?:full-)?episodes)/(?P<id>[^/?#.]+)' |
|
|
|
_FEED_URL = 'http://www.mtv.com/feeds/mrss/' |
|
|
|
|
|
|
|
_TESTS = [{ |
|
|
@ -321,6 +321,9 @@ class MTVIE(MTVServicesInfoExtractor): |
|
|
|
}, { |
|
|
|
'url': 'http://www.mtv.com/full-episodes/94tujl/unlocking-the-truth-gates-of-hell-season-1-ep-101', |
|
|
|
'only_matching': True, |
|
|
|
}, { |
|
|
|
'url': 'http://www.mtv.com/episodes/g8xu7q/teen-mom-2-breaking-the-wall-season-7-ep-713', |
|
|
|
'only_matching': True, |
|
|
|
}] |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -6,7 +6,7 @@ from .mtv import MTVServicesInfoExtractor |
|
|
|
|
|
|
|
class SouthParkIE(MTVServicesInfoExtractor): |
|
|
|
IE_NAME = 'southpark.cc.com' |
|
|
|
_VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.cc\.com/(?:clips|full-episodes)/(?P<id>.+?)(\?|#|$))' |
|
|
|
_VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.cc\.com/(?:clips|(?:full-)?episodes)/(?P<id>.+?)(\?|#|$))' |
|
|
|
|
|
|
|
_FEED_URL = 'http://www.southparkstudios.com/feeds/video-player/mrss' |
|
|
|
|
|
|
@ -75,7 +75,7 @@ class SouthParkDeIE(SouthParkIE): |
|
|
|
|
|
|
|
class SouthParkNlIE(SouthParkIE): |
|
|
|
IE_NAME = 'southpark.nl' |
|
|
|
_VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.nl/(?:clips|full-episodes)/(?P<id>.+?)(\?|#|$))' |
|
|
|
_VALID_URL = r'https?://(?:www\.)?(?P<url>southpark\.nl/(?:clips|(?:full-)?episodes)/(?P<id>.+?)(\?|#|$))' |
|
|
|
_FEED_URL = 'http://www.southpark.nl/feeds/video-player/mrss/' |
|
|
|
|
|
|
|
_TESTS = [{ |
|
|
|