aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-03-27 02:02:18 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-03-27 02:02:18 +0100
commite55213ce3583aa348b288d51f99f1f46510c3fd4 (patch)
treea08df5724ba57541dcb9d825c66ccd10cae87126 /youtube_dl
parent98acdc895bb6795efa1b5890a7af1b6e662051bd (diff)
parent24a2aac445d9149c5e4154e6fb32150a25646987 (diff)
Merge remote-tracking branch 'malept/tds-extended-interviews'
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/comedycentral.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index 483ae5761..ea1675cf6 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -46,7 +46,7 @@ class ComedyCentralShowsIE(InfoExtractor):
(the-colbert-report-(videos|collections)/(?P<clipID>[0-9]+)/[^/]*/(?P<cntitle>.*?))
|(watch/(?P<date>[^/]*)/(?P<tdstitle>.*)))|
(?P<interview>
- extended-interviews/(?P<interID>[0-9]+)/playlist_tds_extended_(?P<interview_title>.*?)/.*?)))
+ 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',
@@ -134,7 +134,7 @@ class ComedyCentralShowsIE(InfoExtractor):
# a URL prefix; so extract the alternate reference
# and then add the URL prefix manually.
- altMovieParams = re.findall('data-mgid="([^"]*(?:episode|video).*?:.*?)"', webpage)
+ altMovieParams = re.findall('data-mgid="([^"]*(?:episode|video|playlist).*?:.*?)"', webpage)
if len(altMovieParams) == 0:
raise ExtractorError('unable to find Flash URL in webpage ' + url)
else: