Skip to content

Commit

Permalink
[ie/youtube] Return empty playlist when channel/tab has no videos
Browse files Browse the repository at this point in the history
  • Loading branch information
pukkandan committed Dec 5, 2023
1 parent 993edd3 commit 044886c
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions yt_dlp/extractor/youtube.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
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
def _real_extract(self, url, smuggled_data):
item_id = self._match_id(url)
Expand Down Expand Up @@ -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
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:
self.to_screen('Downloading all uploads of the channel. '
'To download only the videos in a specific tab, pass the tab\'s URL')
Expand All @@ -6546,15 +6553,15 @@ def _real_extract(self, url, smuggled_data):
if not extra_tabs and selected_tab_id != 'videos':
# Channel does not have streams, shorts or videos tabs
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
pl_id = f'UU{item_id[2:]}'
pl_url = f'https://www.youtube.com/playlist?list={pl_id}'
try:
data, ytcfg = self._extract_data(pl_url, pl_id, ytcfg=ytcfg, fatal=True, webpage_fatal=True)
except ExtractorError:
raise ExtractorError('This channel has no uploads', expected=True)
return self._empty_playlist(item_id, data)
else:
item_id, url = pl_id, pl_url
self.to_screen(
Expand Down

0 comments on commit 044886c

Please sign in to comment.