From: Philipp Hagemeister Date: Wed, 30 Nov 2016 10:52:19 +0000 (+0100) Subject: [comedcycentral] Give /shows/.+/full-episodes URLs to the COmedyCentralFullEpisodesIE X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=youtube-dl.git;a=commitdiff_plain;h=f882554815c42381e84af98860434b040b2d127c [comedcycentral] Give /shows/.+/full-episodes URLs to the COmedyCentralFullEpisodesIE --- 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.*)''' _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):