From cf2e2eb1c0b626f2d5f210ffd14642aceb0358e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sun, 22 Mar 2015 08:23:20 +0600 Subject: [PATCH] [comedycentral] Drop thedailyshow podcast extractor Generic extractor is just fine for Libsyn embeds --- youtube_dl/extractor/__init__.py | 2 +- youtube_dl/extractor/comedycentral.py | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 82b75a144..d73826d44 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -84,7 +84,7 @@ from .cnn import ( ) from .collegehumor import CollegeHumorIE from .collegerama import CollegeRamaIE -from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE, TheDailyShowPodcastIE +from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE from .comcarcoff import ComCarCoffIE from .commonmistakes import CommonMistakesIE, UnicodeBOMIE from .condenast import CondeNastIE diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index bd3817b56..648a6f990 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -273,27 +273,3 @@ class ComedyCentralShowsIE(MTVServicesInfoExtractor): 'title': show_name + ' ' + title, 'description': description, } - -class TheDailyShowPodcastIE(InfoExtractor): - _VALID_URL = r'(?Phttps?:)?//thedailyshow\.cc\.com/podcast/(?P[a-z\-]+)' - _TESTS = [{ - "url": "http://thedailyshow.cc.com/podcast/episodetwelve", - 'only_matching': True, - }] - - def _real_extract(self, url): - display_id = self._match_id(url) - webpage = self._download_webpage(url, display_id) - - player_url = self._search_regex(r']+)?\s*src="((?:https?:)?//html5-player\.libsyn\.com/embed/episode/id/[0-9]+)', webpage, 'player URL') - if player_url.startswith('//'): - mobj = re.match(self._VALID_URL, url) - scheme = mobj.group('scheme') - if not scheme: - scheme = 'https:' - player_url = scheme + player_url - - return { - '_type': 'url_transparent', - 'url': player_url, - }