diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-04-09 11:43:13 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-04-09 11:43:15 +0200 |
| commit | 29e3e682afd3a8a6bde0c5e8d7e3d0df75f17380 (patch) | |
| tree | 711c7976195baea61bab5a84bc87018aa90e321d | |
| parent | f983c4419941adfeaa42164d06d2e5e80c31f921 (diff) | |
[comedycentral] Match more URLs
Looks like they only offer clips instead of full episodes now. We'll need to add new parsing code as well.
| -rw-r--r-- | test/test_all_urls.py | 9 | ||||
| -rw-r--r-- | youtube_dl/extractor/comedycentral.py | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py index 577f6ac32..479d21b05 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -156,6 +156,15 @@ class TestAllURLsMatching(unittest.TestCase): self.assertMatch( 'http://thedailyshow.cc.com/guests/michael-lewis/3efna8/exclusive---michael-lewis-extended-interview-pt--3', ['ComedyCentralShows']) + self.assertMatch( + 'http://thedailyshow.cc.com/episodes/sy7yv0/april-8--2014---denis-leary', + ['ComedyCentralShows']) + self.assertMatch( + 'http://thecolbertreport.cc.com/episodes/8ase07/april-8--2014---jane-goodall', + ['ComedyCentralShows']) + self.assertMatch( + 'http://thedailyshow.cc.com/video-playlists/npde3s/the-daily-show-19088-highlights', + ['ComedyCentralShows']) def test_yahoo_https(self): # https://github.com/rg3/youtube-dl/issues/2701 diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index 0c99887a2..c5203a273 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -41,9 +41,9 @@ class ComedyCentralShowsIE(InfoExtractor): _VALID_URL = r'''(?x)^(:(?P<shortname>tds|thedailyshow|cr|colbert|colbertnation|colbertreport) |https?://(:www\.)? (?P<showname>thedailyshow|thecolbertreport)\.(?:cc\.)?com/ - (full-episodes/(?:[0-9a-z]{6}/)?(?P<episode>.*)| + ((?:full-)?episodes/(?:[0-9a-z]{6}/)?(?P<episode>.*)| (?P<clip> - (?:(?:guests/[^/]+|videos)/[^/]+/(?P<videotitle>[^/?#]+)) + (?:(?:guests/[^/]+|videos|video-playlists)/[^/]+/(?P<videotitle>[^/?#]+)) |(the-colbert-report-(videos|collections)/(?P<clipID>[0-9]+)/[^/]*/(?P<cntitle>.*?)) |(watch/(?P<date>[^/]*)/(?P<tdstitle>.*)) )| |