aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2016-11-30 11:52:19 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2016-11-30 11:52:19 +0100
commitf882554815c42381e84af98860434b040b2d127c (patch)
tree3d429acfa7e6035cdac8cc794cc5f93d472f115e /youtube_dl/extractor
parentdb75f14d8a6eb998f08d2774f5d609a02ef13646 (diff)
[comedcycentral] Give /shows/.+/full-episodes URLs to the COmedyCentralFullEpisodesIE
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/comedycentral.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index 528ff7fa3..0239dfd84 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -6,7 +6,7 @@ from .common import InfoExtractor
class ComedyCentralIE(MTVServicesInfoExtractor):
_VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
- (video-clips|episodes|cc-studios|video-collections|shows)
+ (video-clips|episodes|cc-studios|video-collections|shows(?=/[^/]+/(?!full-episodes)))
/(?P<title>.*)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
@@ -29,7 +29,7 @@ class ComedyCentralIE(MTVServicesInfoExtractor):
class ComedyCentralFullEpisodesIE(MTVServicesInfoExtractor):
_VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
- (?:full-episodes)
+ (?:full-episodes|shows(?=/[^/]+/full-episodes))
/(?P<id>[^?]+)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
@@ -40,6 +40,9 @@ class ComedyCentralFullEpisodesIE(MTVServicesInfoExtractor):
'title': 'November 28, 2016 - Ryan Speedo Green',
},
'playlist_count': 4,
+ }, {
+ 'url': 'http://www.cc.com/shows/the-daily-show-with-trevor-noah/full-episodes',
+ 'only_matching': True,
}]
def _real_extract(self, url):