projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[pornhub:playlist] Improve extraction (closes #11594)
[youtube-dl]
/
youtube_dl
/
extractor
/
comedycentral.py
diff --git
a/youtube_dl/extractor/comedycentral.py
b/youtube_dl/extractor/comedycentral.py
index 528ff7fa3c1deedbdbacfc9c604f5872c1014839..0239dfd84d776d45e8457d0357fceacb5d1d7467 100644
(file)
--- a/
youtube_dl/extractor/comedycentral.py
+++ b/
youtube_dl/extractor/comedycentral.py
@@
-6,7
+6,7
@@
from .common import InfoExtractor
class ComedyCentralIE(MTVServicesInfoExtractor):
_VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
class ComedyCentralIE(MTVServicesInfoExtractor):
_VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
- (video-clips|episodes|cc-studios|video-collections|shows)
+ (video-clips|episodes|cc-studios|video-collections|shows
(?=/[^/]+/(?!full-episodes))
)
/(?P<title>.*)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
/(?P<title>.*)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
@@
-29,7
+29,7
@@
class ComedyCentralIE(MTVServicesInfoExtractor):
class ComedyCentralFullEpisodesIE(MTVServicesInfoExtractor):
_VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
class ComedyCentralFullEpisodesIE(MTVServicesInfoExtractor):
_VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
- (?:full-episodes)
+ (?:full-episodes
|shows(?=/[^/]+/full-episodes)
)
/(?P<id>[^?]+)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
/(?P<id>[^?]+)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
@@
-40,6
+40,9
@@
class ComedyCentralFullEpisodesIE(MTVServicesInfoExtractor):
'title': 'November 28, 2016 - Ryan Speedo Green',
},
'playlist_count': 4,
'title': 'November 28, 2016 - Ryan Speedo Green',
},
'playlist_count': 4,
+ }, {
+ 'url': 'http://www.cc.com/shows/the-daily-show-with-trevor-noah/full-episodes',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):