X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fcomedycentral.py;h=c81ce5a96f03b539d2f5e98975218fcdd0ed861d;hb=7fa547ab027f52f2570fd3a6022c10830424227e;hp=0c99887a2e4ef7f3d1b2a75f605553119da16b3b;hpb=b21e25702f05018b64064b4aec9007e6e383b476;p=youtube-dl
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index 0c99887a2..c81ce5a96 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -14,14 +14,14 @@ from ..utils import (
class ComedyCentralIE(MTVServicesInfoExtractor):
- _VALID_URL = r'''(?x)https?://(?:www\.)?(comedycentral|cc)\.com/
- (video-clips|episodes|cc-studios|video-collections)
+ _VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
+ (video-clips|episodes|cc-studios|video-collections|full-episodes)
/(?P
.*)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
_TEST = {
- 'url': 'http://www.comedycentral.com/video-clips/kllhuv/stand-up-greg-fitzsimmons--uncensored---too-good-of-a-mother',
- 'md5': '4167875aae411f903b751a21f357f1ee',
+ 'url': 'http://www.cc.com/video-clips/kllhuv/stand-up-greg-fitzsimmons--uncensored---too-good-of-a-mother',
+ 'md5': 'c4f48e9eda1b16dd10add0744344b6d8',
'info_dict': {
'id': 'cef0cbb3-e776-4bc9-b62e-8016deccb354',
'ext': 'mp4',
@@ -41,9 +41,9 @@ class ComedyCentralShowsIE(InfoExtractor):
_VALID_URL = r'''(?x)^(:(?Ptds|thedailyshow|cr|colbert|colbertnation|colbertreport)
|https?://(:www\.)?
(?Pthedailyshow|thecolbertreport)\.(?:cc\.)?com/
- (full-episodes/(?:[0-9a-z]{6}/)?(?P.*)|
+ ((?:full-)?episodes/(?:[0-9a-z]{6}/)?(?P.*)|
(?P
- (?:(?:guests/[^/]+|videos)/[^/]+/(?P[^/?#]+))
+ (?:(?:guests/[^/]+|videos|video-playlists|special-editions)/[^/]+/(?P[^/?#]+))
|(the-colbert-report-(videos|collections)/(?P[0-9]+)/[^/]*/(?P.*?))
|(watch/(?P[^/]*)/(?P.*))
)|
@@ -130,7 +130,7 @@ class ComedyCentralShowsIE(InfoExtractor):
raise ExtractorError('Invalid redirected URL: ' + url)
if mobj.group('episode') == '':
raise ExtractorError('Redirected URL is still not specific: ' + url)
- epTitle = mobj.group('episode').rpartition('/')[-1]
+ epTitle = (mobj.group('episode') or mobj.group('videotitle')).rpartition('/')[-1]
mMovieParams = re.findall('(?: