mirror/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-03-09 12:50:23 -05:00
Code Activity

lazy extractor fix

Browse source
This commit is contained in:
c-basalt 2024-12-11 00:53:13 -05:00
parent 1d77424989
commit 7fc2ab426f
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
yt_dlp/extractor/niconicochannelplus.py
View file

@ -17,13 +17,14 @@
urljoin, urljoin,
) )
_SUITABLE_NICOCHANNEL_PLUS_DOMAINS = set()
class NiconicoChannelPlusBaseIE(InfoExtractor): class NiconicoChannelPlusBaseIE(InfoExtractor):
_SITE_SETTINGS = {} _SITE_SETTINGS = {}
_DOMAIN_SITE_ID = {} _DOMAIN_SITE_ID = {}
_CHANNEL_NAMES = {} _CHANNEL_NAMES = {}
_CHANNEL_AGE_LIMIT = {} _CHANNEL_AGE_LIMIT = {}
_SUITABLE_DOMAINS = set()
def _get_settings(self, url, video_id=None): def _get_settings(self, url, video_id=None):
base_url = urljoin(url, '/') base_url = urljoin(url, '/')
@ -33,7 +34,7 @@ def _get_settings(self, url, video_id=None):
if 'api_base_url' not in site_settings or 'fanclub_site_id' not in site_settings: if 'api_base_url' not in site_settings or 'fanclub_site_id' not in site_settings:
raise ExtractorError('Unable to get site settings') raise ExtractorError('Unable to get site settings')
self._SITE_SETTINGS[base_url] = site_settings self._SITE_SETTINGS[base_url] = site_settings
self._SUITABLE_DOMAINS.add(urllib.parse.urlparse(url).netloc) _SUITABLE_NICOCHANNEL_PLUS_DOMAINS.add(urllib.parse.urlparse(url).netloc)
if self._SITE_SETTINGS[base_url].get('platform_id') not in ['CHPL', 'SHTA', 'JOQR', 'TKFM']: if self._SITE_SETTINGS[base_url].get('platform_id') not in ['CHPL', 'SHTA', 'JOQR', 'TKFM']:
self.report_warning(f'Unknown platform type: {self._SITE_SETTINGS[base_url].get("platform_id")}') self.report_warning(f'Unknown platform type: {self._SITE_SETTINGS[base_url].get("platform_id")}')
@ -174,8 +175,13 @@ def _match_video_id(url):
@classmethod @classmethod
def suitable(cls, url): def suitable(cls, url):
return super().suitable(url) or ( try:
urllib.parse.urlparse(url).netloc in cls._SUITABLE_DOMAINS and cls._match_video_id(url)) return super().suitable(url) or (
urllib.parse.urlparse(url).netloc in _SUITABLE_NICOCHANNEL_PLUS_DOMAINS
and cls._match_video_id(url))
except NameError:
# fallback for lazy extractor
return super().suitable(url)
def _extract_from_webpage(self, url, webpage): def _extract_from_webpage(self, url, webpage):
if self._match_video_id(url) and self._is_channel_plus_webpage(webpage): if self._match_video_id(url) and self._is_channel_plus_webpage(webpage):
@ -307,6 +313,9 @@ def _fetch_paged_channel_video_list(self, site_url, path, query, video_id, page)
note=f'Getting channel info (page {page + 1})', note=f'Getting channel info (page {page + 1})',
errnote=f'Unable to get channel info (page {page + 1})') errnote=f'Unable to get channel info (page {page + 1})')
# ensure that real extractor is instantiated over lazy extractor
self._downloader.get_info_extractor(NiconicoChannelPlusIE.ie_key())
for entry in traverse_obj(response, ('data', 'video_pages', 'list', lambda _, v: v['content_code'])): for entry in traverse_obj(response, ('data', 'video_pages', 'list', lambda _, v: v['content_code'])):
# "video/{content_code}" works for both VOD and live, but "live/{content_code}" doesn't work for VOD # "video/{content_code}" works for both VOD and live, but "live/{content_code}" doesn't work for VOD
yield self.url_result( yield self.url_result(