From: Philipp Hagemeister Date: Mon, 31 Mar 2014 22:25:11 +0000 (+0200) Subject: [comedycentral] Allow URLs with query parts (fixes #2661) X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=651486621dd79025a1b0ea08abe786b50a9604ad;p=youtube-dl [comedycentral] Allow URLs with query parts (fixes #2661) --- diff --git a/test/test_all_urls.py b/test/test_all_urls.py index dffe3f958..ed041ffda 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -150,6 +150,9 @@ class TestAllURLsMatching(unittest.TestCase): self.assertMatch( 'http://thecolbertreport.cc.com/videos/29w6fx/-realhumanpraise-for-fox-news', ['ComedyCentralShows']) + self.assertMatch( + 'http://thecolbertreport.cc.com/videos/gh6urb/neil-degrasse-tyson-pt--1?xrs=eml_col_031114', + ['ComedyCentralShows']) if __name__ == '__main__': unittest.main() diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index cbc212065..ed0c6ea2c 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -45,10 +45,11 @@ class ComedyCentralShowsIE(InfoExtractor): (?P (?:videos/[^/]+/(?P[^/?#]+)) |(the-colbert-report-(videos|collections)/(?P[0-9]+)/[^/]*/(?P.*?)) - |(watch/(?P[^/]*)/(?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',