X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcomedycentral.py;h=512f072f650038131bc21ee57f893b4f6c1c871f;hb=ec85ded83cbfa652ba94cb080aab52d8b270212a;hp=528ff7fa3c1deedbdbacfc9c604f5872c1014839;hpb=cc61fc3934bb3d130e814e2d2345fe6cda2ad9c3;p=youtube-dl

diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index 528ff7fa3..512f072f6 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):
@@ -76,7 +79,7 @@ class ToshIE(MTVServicesInfoExtractor):
                 'ext': 'mp4',
                 'title': 'Tosh.0|June 9, 2077|2|211|Twitter Users Share Summer Plans',
                 'description': 'Tosh asked fans to share their summer plans.',
-                'thumbnail': 're:^https?://.*\.jpg',
+                'thumbnail': r're:^https?://.*\.jpg',
                 # It's really reported to be published on year 2077
                 'upload_date': '20770610',
                 'timestamp': 3390510600,