X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcomedycentral.py;h=c81ce5a96f03b539d2f5e98975218fcdd0ed861d;hb=493987fefe5d12697df98b6e0eef106e77ac64aa;hp=ea1675cf6f82a50d33d9b3996254ccf9ab737613;hpb=e55213ce3583aa348b288d51f99f1f46510c3fd4;p=youtube-dl
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index ea1675cf6..c81ce5a96 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -8,20 +8,20 @@ from ..utils import (
compat_str,
compat_urllib_parse,
ExtractorError,
- int_or_none,
+ float_or_none,
unified_strdate,
)
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,13 +41,15 @@ class ComedyCentralShowsIE(InfoExtractor):
_VALID_URL = r'''(?x)^(:(?Ptds|thedailyshow|cr|colbert|colbertnation|colbertreport)
|https?://(:www\.)?
(?Pthedailyshow|thecolbertreport)\.(?:cc\.)?com/
- (full-episodes/(?P.*)|
+ ((?:full-)?episodes/(?:[0-9a-z]{6}/)?(?P.*)|
(?P
- (the-colbert-report-(videos|collections)/(?P[0-9]+)/[^/]*/(?P.*?))
- |(watch/(?P[^/]*)/(?P.*)))|
+ (?:(?:guests/[^/]+|videos|video-playlists|special-editions)/[^/]+/(?P[^/?#]+))
+ |(the-colbert-report-(videos|collections)/(?P[0-9]+)/[^/]*/(?P.*?))
+ |(watch/(?P[^/]*)/(?P.*))
+ )|
(?P
extended-interviews/(?P[0-9a-z]+)/(?:playlist_tds_extended_)?(?P.*?)(/.*?)?)))
- $'''
+ (?:[?#].*|$)'''
_TEST = {
'url': 'http://thedailyshow.cc.com/watch/thu-december-13-2012/kristen-stewart',
'md5': '4e2f5cb088a83cd8cdb7756132f9739d',
@@ -57,7 +59,7 @@ class ComedyCentralShowsIE(InfoExtractor):
'upload_date': '20121213',
'description': 'Kristen Stewart learns to let loose in "On the Road."',
'uploader': 'thedailyshow',
- 'title': 'thedailyshow-kristen-stewart part 1',
+ 'title': 'thedailyshow kristen-stewart part 1',
}
}
@@ -102,7 +104,9 @@ class ComedyCentralShowsIE(InfoExtractor):
assert mobj is not None
if mobj.group('clip'):
- if mobj.group('showname') == 'thedailyshow':
+ if mobj.group('videotitle'):
+ epTitle = mobj.group('videotitle')
+ elif mobj.group('showname') == 'thedailyshow':
epTitle = mobj.group('tdstitle')
else:
epTitle = mobj.group('cntitle')
@@ -126,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('(?: