From: Philipp Hagemeister Date: Tue, 2 Aug 2016 12:02:31 +0000 (+0200) Subject: [comedycentral] Re-add shortnames X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=6a9b3b61ea145ac03198bc81a67ee322d42a1bc1;p=youtube-dl [comedycentral] Re-add shortnames In cc99d4f826a942b18133fe4221c9de2f9197e860, the shortname feature got deleted by accident. Re-add it as a separate IE. --- diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index c76909e48..88346dde7 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals from .mtv import MTVServicesInfoExtractor +from .common import InfoExtractor class ComedyCentralIE(MTVServicesInfoExtractor): @@ -96,3 +97,22 @@ class ComedyCentralTVIE(MTVServicesInfoExtractor): webpage, 'mrss url', group='url') return self._get_videos_info_from_url(mrss_url, video_id) + + +class ComedyCentralShortnameIE(InfoExtractor): + _VALID_URL = r'^:(?Ptds|thedailyshow)$' + _TESTS = [{ + 'url': ':tds', + 'only_matching': True, + }, { + 'url': ':thedailyshow', + 'only_matching': True, + }] + + def _real_extract(self, url): + video_id = self._match_id(url) + shortcut_map = { + 'tds': 'http://www.cc.com/shows/the-daily-show-with-trevor-noah/full-episodes', + 'thedailyshow': 'http://www.cc.com/shows/the-daily-show-with-trevor-noah/full-episodes', + } + return self.url_result(shortcut_map[video_id]) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 53fab1a31..86c48ff54 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -159,6 +159,7 @@ from .coub import CoubIE from .collegerama import CollegeRamaIE from .comedycentral import ( ComedyCentralIE, + ComedyCentralShortnameIE, ComedyCentralTVIE, ToshIE, )