From 32918652df080ff426fca62cb455dc8cb0e6cecb Mon Sep 17 00:00:00 2001 From: Ganden Schaffner Date: Fri, 9 Aug 2019 22:20:59 -0700 Subject: [PATCH] [redbulltv] Remove RedBullTVRrnContentIE extractor The test cases either are dead links or redirect to a URL that RedBullTVIE handles. AFAIK, the only usage of rrn in URLs is now for indicating playlists (rrn:content:collections:...), whose current video is already handled by RedBullTVIE. Playlist support is not currently implemented for this domain, and RedBullTVRrnContentIE is never used with current redbulltv URLs. --- youtube_dl/extractor/extractors.py | 5 +---- youtube_dl/extractor/redbulltv.py | 22 ---------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py index 06de556b7..211eed6b7 100644 --- a/youtube_dl/extractor/extractors.py +++ b/youtube_dl/extractor/extractors.py @@ -926,10 +926,7 @@ from .raywenderlich import ( ) from .rbmaradio import RBMARadioIE from .rds import RDSIE -from .redbulltv import ( - RedBullTVIE, - RedBullTVRrnContentIE, -) +from .redbulltv import RedBullTVIE from .reddit import ( RedditIE, RedditRIE, diff --git a/youtube_dl/extractor/redbulltv.py b/youtube_dl/extractor/redbulltv.py index aa4013952..bd98fda1d 100644 --- a/youtube_dl/extractor/redbulltv.py +++ b/youtube_dl/extractor/redbulltv.py @@ -113,25 +113,3 @@ class RedBullTVIE(InfoExtractor): 'description': long_description or short_description, 'formats': formats, } - - -class RedBullTVRrnContentIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?redbull(?:\.tv|\.com(?:/[^/]+)?(?:/tv)?)/(?:video|live)/rrn:content:[^:]+:(?P[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})' - _TESTS = [{ - 'url': 'https://www.redbull.com/int-en/tv/video/rrn:content:live-videos:e3e6feb4-e95f-50b7-962a-c70f8fd13c73/mens-dh-finals-fort-william', - 'only_matching': True, - }, { - 'url': 'https://www.redbull.com/int-en/tv/video/rrn:content:videos:a36a0f36-ff1b-5db8-a69d-ee11a14bf48b/tn-ts-style?playlist=rrn:content:event-profiles:83f05926-5de8-5389-b5e4-9bb312d715e8:extras', - 'only_matching': True, - }] - - def _real_extract(self, url): - display_id = self._match_id(url) - - webpage = self._download_webpage(url, display_id) - - video_url = self._og_search_url(webpage) - - return self.url_result( - video_url, ie=RedBullTVIE.ie_key(), - video_id=RedBullTVIE._match_id(video_url))