From 1155ecef29187bff975ceb51c755722c660e0387 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Fri, 12 Aug 2022 12:50:43 +0530 Subject: [PATCH] [extractor/zattoo] Fix resellers Fixes #4630 --- yt_dlp/extractor/zattoo.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yt_dlp/extractor/zattoo.py b/yt_dlp/extractor/zattoo.py index 2a7e85472..975cc7125 100644 --- a/yt_dlp/extractor/zattoo.py +++ b/yt_dlp/extractor/zattoo.py @@ -237,6 +237,10 @@ def _extract_ondemand(self, ondemand_id): ondemand_termtoken=ondemand_termtoken, ondemand_type=ondemand_type) return info_dict + def _real_extract(self, url): + vid1, vid2 = self._match_valid_url(url).group('vid1', 'vid2') + return getattr(self, f'_extract_{self._TYPE}')(vid1 or vid2) + def _make_valid_url(host): return rf'https?://(?:www\.)?{re.escape(host)}/watch/[^/]+?/(?P[0-9]+)[^/]+(?:/(?P[0-9]+))?' @@ -254,10 +258,6 @@ def _create_valid_url(match, qs, base_re=None): {match_base} )''' - def _real_extract(self, url): - vid1, vid2 = self._match_valid_url(url).group('vid1', 'vid2') - return getattr(self, f'_extract_{self._TYPE}')(vid1 or vid2) - class ZattooIE(ZattooBaseIE): _VALID_URL = ZattooBaseIE._create_valid_url(r'\d+', 'program', '(?:program|watch)/[^/]+')