|
|
@ -237,6 +237,10 @@ class ZattooPlatformBaseIE(InfoExtractor):
|
|
|
|
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 @@ class ZattooBaseIE(ZattooPlatformBaseIE):
|
|
|
|
{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)/[^/]+')
|
|
|
|