Browse Source

[comedycentral] Allow URLs with query parts (fixes #2661)

totalwebcasting
Philipp Hagemeister 11 years ago
parent
commit
651486621d
2 changed files with 6 additions and 2 deletions
  1. +3
    -0
      test/test_all_urls.py
  2. +3
    -2
      youtube_dl/extractor/comedycentral.py

+ 3
- 0
test/test_all_urls.py View File

@ -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()

+ 3
- 2
youtube_dl/extractor/comedycentral.py View File

@ -45,10 +45,11 @@ class ComedyCentralShowsIE(InfoExtractor):
(?P<clip>
(?:videos/[^/]+/(?P<videotitle>[^/?#]+))
|(the-colbert-report-(videos|collections)/(?P<clipID>[0-9]+)/[^/]*/(?P<cntitle>.*?))
|(watch/(?P<date>[^/]*)/(?P<tdstitle>.*)))|
|(watch/(?P<date>[^/]*)/(?P<tdstitle>.*))
)|
(?P<interview>
extended-interviews/(?P<interID>[0-9a-z]+)/(?:playlist_tds_extended_)?(?P<interview_title>.*?)(/.*?)?)))
$'''
(?:[?#].*|$)'''
_TEST = {
'url': 'http://thedailyshow.cc.com/watch/thu-december-13-2012/kristen-stewart',
'md5': '4e2f5cb088a83cd8cdb7756132f9739d',


Loading…
Cancel
Save