diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-30 19:43:46 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-30 19:43:46 +0100 |
| commit | 91755ee384ddee314ba40748a44ad1289df8b86c (patch) | |
| tree | 1a675a931b899f66a699099c06605637d4a57a68 | |
| parent | 0692ef86ef85da69074b00b5525c13bfde9159de (diff) | |
| download | youtube-dl-91755ee384ddee314ba40748a44ad1289df8b86c.tar.xz | |
[comedycentral:shows] Generate better IDs and add a test for that
| -rw-r--r-- | youtube_dl/extractor/comedycentral.py | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index 15ca361f0..f9256dcf4 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -49,7 +49,9 @@ class ComedyCentralShowsIE(MTVServicesInfoExtractor): |(watch/(?P<date>[^/]*)/(?P<tdstitle>.*)) )| (?P<interview> - extended-interviews/(?P<interID>[0-9a-z]+)/(?:playlist_tds_extended_)?(?P<interview_title>.*?)(/.*?)?))) + extended-interviews/(?P<interID>[0-9a-z]+)/ + (?:playlist_tds_extended_)?(?P<interview_title>[^/?#]*?) + (?:/[^/?#]?|[?#]|$)))) ''' _TESTS = [{ 'url': 'http://thedailyshow.cc.com/watch/thu-december-13-2012/kristen-stewart', @@ -63,6 +65,35 @@ class ComedyCentralShowsIE(MTVServicesInfoExtractor): 'title': 'thedailyshow kristen-stewart part 1', } }, { + 'url': 'http://thedailyshow.cc.com/extended-interviews/b6364d/sarah-chayes-extended-interview', + 'info_dict': { + 'id': 'sarah-chayes-extended-interview', + 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."', + 'title': 'thedailyshow Sarah Chayes Extended Interview', + }, + 'playlist': [{ + 'info_dict': { + 'id': '0baad492-cbec-4ec1-9e50-ad91c291127f', + 'ext': 'mp4', + 'upload_date': '20150129', + 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."', + 'uploader': 'thedailyshow', + 'title': 'thedailyshow sarah-chayes-extended-interview part 1', + } + }, { + 'info_dict': { + 'id': '1e4fb91b-8ce7-4277-bd7c-98c9f1bbd283', + 'ext': 'mp4', + 'upload_date': '20150129', + 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."', + 'uploader': 'thedailyshow', + 'title': 'thedailyshow sarah-chayes-extended-interview part 2', + } + }], + 'params': { + 'skip_download': True, + }, + }, { 'url': 'http://thedailyshow.cc.com/extended-interviews/xm3fnq/andrew-napolitano-extended-interview', 'only_matching': True, }, { @@ -230,6 +261,7 @@ class ComedyCentralShowsIE(MTVServicesInfoExtractor): return { '_type': 'playlist', + 'id': epTitle, 'entries': entries, 'title': show_name + ' ' + title, 'description': description, |