0
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-10 00:25:06 +00:00

[extractor/zattoo] Fix resellers

Fixes #4630
This commit is contained in:
pukkandan 2022-08-12 12:50:43 +05:30
parent 96623ab5c6
commit 1155ecef29
No known key found for this signature in database
GPG key ID: 7EEE9E1E817D0A39

View file

@ -237,6 +237,10 @@ def _extract_ondemand(self, ondemand_id):
ondemand_termtoken=ondemand_termtoken, ondemand_type=ondemand_type) ondemand_termtoken=ondemand_termtoken, ondemand_type=ondemand_type)
return info_dict 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): def _make_valid_url(host):
return rf'https?://(?:www\.)?{re.escape(host)}/watch/[^/]+?/(?P<id>[0-9]+)[^/]+(?:/(?P<recid>[0-9]+))?' return rf'https?://(?:www\.)?{re.escape(host)}/watch/[^/]+?/(?P<id>[0-9]+)[^/]+(?:/(?P<recid>[0-9]+))?'
@ -254,10 +258,6 @@ def _create_valid_url(match, qs, base_re=None):
{match_base} {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): class ZattooIE(ZattooBaseIE):
_VALID_URL = ZattooBaseIE._create_valid_url(r'\d+', 'program', '(?:program|watch)/[^/]+') _VALID_URL = ZattooBaseIE._create_valid_url(r'\d+', 'program', '(?:program|watch)/[^/]+')