MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 23:26:53 +01:00
Code Issues Projects Releases Wiki Activity

[ie/youtube] Return empty playlist when channel/tab has no videos

Browse Source 
Closes #8634
This commit is contained in:
pukkandan 2023-12-06 03:31:45 +05:30
parent 993edd3f6e
commit 044886c220
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yt_dlp/extractor/youtube.py
View File

@ -6469,6 +6469,9 @@ def _extract_tab_id_and_name(self, tab, base_url='https://www.youtube.com'):
def _has_tab(self, tabs, tab_id): def _has_tab(self, tabs, tab_id):
return any(self._extract_tab_id_and_name(tab)[0] == tab_id for tab in tabs) return any(self._extract_tab_id_and_name(tab)[0] == tab_id for tab in tabs)
def _empty_playlist(self, item_id, data):
return self.playlist_result([], item_id, **self._extract_metadata_from_tabs(item_id, data))
@YoutubeTabBaseInfoExtractor.passthrough_smuggled_data @YoutubeTabBaseInfoExtractor.passthrough_smuggled_data
def _real_extract(self, url, smuggled_data): def _real_extract(self, url, smuggled_data):
item_id = self._match_id(url) item_id = self._match_id(url)
@ -6534,6 +6537,10 @@ def _real_extract(self, url, smuggled_data):
selected_tab_id, selected_tab_name = self._extract_tab_id_and_name(selected_tab, url) # NB: Name may be translated selected_tab_id, selected_tab_name = self._extract_tab_id_and_name(selected_tab, url) # NB: Name may be translated
self.write_debug(f'Selected tab: {selected_tab_id!r} ({selected_tab_name}), Requested tab: {original_tab_id!r}') self.write_debug(f'Selected tab: {selected_tab_id!r} ({selected_tab_name}), Requested tab: {original_tab_id!r}')
# /about is no longer a tab
if original_tab_id == 'about':
return self._empty_playlist(item_id, data)
if not original_tab_id and selected_tab_name: if not original_tab_id and selected_tab_name:
self.to_screen('Downloading all uploads of the channel. ' self.to_screen('Downloading all uploads of the channel. '
'To download only the videos in a specific tab, pass the tab\'s URL') 'To download only the videos in a specific tab, pass the tab\'s URL')
@ -6546,7 +6553,7 @@ def _real_extract(self, url, smuggled_data):
if not extra_tabs and selected_tab_id != 'videos': if not extra_tabs and selected_tab_id != 'videos':
# Channel does not have streams, shorts or videos tabs # Channel does not have streams, shorts or videos tabs
if item_id[:2] != 'UC': if item_id[:2] != 'UC':
raise ExtractorError('This channel has no uploads', expected=True) return self._empty_playlist(item_id, data)
# Topic channels don't have /videos. Use the equivalent playlist instead # Topic channels don't have /videos. Use the equivalent playlist instead
pl_id = f'UU{item_id[2:]}' pl_id = f'UU{item_id[2:]}'
@ -6554,7 +6561,7 @@ def _real_extract(self, url, smuggled_data):
try: try:
data, ytcfg = self._extract_data(pl_url, pl_id, ytcfg=ytcfg, fatal=True, webpage_fatal=True) data, ytcfg = self._extract_data(pl_url, pl_id, ytcfg=ytcfg, fatal=True, webpage_fatal=True)
except ExtractorError: except ExtractorError:
raise ExtractorError('This channel has no uploads', expected=True) return self._empty_playlist(item_id, data)
else: else:
item_id, url = pl_id, pl_url item_id, url = pl_id, pl_url
self.to_screen( self.to_screen(