From 07fc0104f72cfcf42b53475b561b00948fd604c8 Mon Sep 17 00:00:00 2001 From: AndroKev Date: Tue, 20 Mar 2018 21:22:49 +0100 Subject: [PATCH] regex change and use of suitable --- youtube_dl/extractor/tvnow.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/tvnow.py b/youtube_dl/extractor/tvnow.py index f8dc28f35..99277fdb9 100644 --- a/youtube_dl/extractor/tvnow.py +++ b/youtube_dl/extractor/tvnow.py @@ -195,20 +195,20 @@ class TVNowListIE(TVNowListBaseIE): class TVNowListChannelIE(TVNowListBaseIE): - _VALID_URL = r'(?Phttps?://(?:www\.)?tvnow\.(?:de|at|ch)/(?:rtl(?:2|plus)?|nitro|superrtl|ntv|vox)/(?P[^/]+)$)' + _VALID_URL = r'(?Phttps?://(?:www\.)?tvnow\.(?:de|at|ch)/(?:rtl(?:2|plus)?|nitro|superrtl|ntv|vox)/(?P[^/]+))' _SHOW_FIELDS = ('id', 'title', ) _SEASON_FIELDS = ('id', 'headline', 'seoheadline', ) _TESTS = [{ 'url': 'https://www.tvnow.at/vox/ab-ins-beet', - 'info_dict': { - 'id': 172, - 'title': 'Ab ins Beet!', - }, - 'playlist_mincount': 1, + 'only_matching': 'True', }] + @classmethod + def suitable(cls, url): + return False if TVNowIE.suitable(url) or TVNowListIE.suitable(url) else super(TVNowListChannelIE, cls).suitable(url) + def _real_extract(self, url): base_url, show_id = re.match(self._VALID_URL, url).groups()