R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed regex for Colbert Report playlist clips

Browse Source 
Previously the regex would match for playlists but not for individual clips accessed as part of the playlist.
Previously working:
http://thecolbertreport.cc.com/video-playlists/xi35i8/colbert-report-04091
Previously not working:
http://thecolbertreport.cc.com/video-playlists/xi35i8/colbert-report-04091/2uxo91
This commit is contained in:
pishposhmcgee 2014-12-17 17:09:33 -06:00
parent 87c4c21e75
commit d09d117870
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/comedycentral.py
View File

@ -44,13 +44,14 @@ class ComedyCentralShowsIE(MTVServicesInfoExtractor):
(?P<showname>thedailyshow|thecolbertreport)\.(?:cc\.)?com/ (?P<showname>thedailyshow|thecolbertreport)\.(?:cc\.)?com/
((?:full-)?episodes/(?:[0-9a-z]{6}/)?(?P<episode>.*)| ((?:full-)?episodes/(?:[0-9a-z]{6}/)?(?P<episode>.*)|
(?P<clip> (?P<clip>
(?:(?:guests/[^/]+|videos|video-playlists|special-editions|news-team/[^/]+)/[^/]+/(?P<videotitle>[^/?#]+)) (?:(?:guests/[^/]+|videos|special-editions|news-team/[^/]+)/[^/]+/(?P<videotitle>[^/?#]+))
|video-playlists/[^/?#]+/(?P<playlistName>[^/?#]+)(/[^/?#]+)?
|(the-colbert-report-(videos|collections)/(?P<clipID>[0-9]+)/[^/]*/(?P<cntitle>.*?)) |(the-colbert-report-(videos|collections)/(?P<clipID>[0-9]+)/[^/]*/(?P<cntitle>.*?))
|(watch/(?P<date>[^/]*)/(?P<tdstitle>.*)) |(watch/(?P<date>[^/]*)/(?P<tdstitle>.*))
)| )|
(?P<interview> (?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 = [{ _TESTS = [{
'url': 'http://thedailyshow.cc.com/watch/thu-december-13-2012/kristen-stewart', 'url': 'http://thedailyshow.cc.com/watch/thu-december-13-2012/kristen-stewart',
'md5': '4e2f5cb088a83cd8cdb7756132f9739d', 'md5': '4e2f5cb088a83cd8cdb7756132f9739d',
@ -129,6 +130,9 @@ class ComedyCentralShowsIE(MTVServicesInfoExtractor):
epTitle = mobj.group('videotitle') epTitle = mobj.group('videotitle')
elif mobj.group('showname') == 'thedailyshow': elif mobj.group('showname') == 'thedailyshow':
epTitle = mobj.group('tdstitle') epTitle = mobj.group('tdstitle')
elif mobj.group('playlistName'):
epTitle = mobj.group('playlistName')
dlNewest = False
else: else:
epTitle = mobj.group('cntitle') epTitle = mobj.group('cntitle')
dlNewest = False dlNewest = False