diff options
| author | zhangeric-15 <71106422+zhangeric-15@users.noreply.github.com> | 2023-02-02 12:26:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 17:26:31 +0000 |
| commit | 6d829d811932b24be4d3cc8b6c1e0d46c2b1566c (patch) | |
| tree | de70baf1f593edad8e4dc90f8fd1949a7f93dd77 /youtube_dl/extractor | |
| parent | 98b0cf1cd05c493eae0f37aaa599d25d2848c0b0 (diff) | |
| download | youtube-dl-6d829d811932b24be4d3cc8b6c1e0d46c2b1566c.tar.xz | |
[YouTube] Fix not finding videos listed under a channel's "shorts" subpage. (#31409)
Resolves #31336
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: dirkf <fieldhouse@gmx.net>
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 3d12e2e4a..28fdb086a 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -315,7 +315,8 @@ class YoutubeBaseInfoExtractor(InfoExtractor): title = try_get( renderer, (lambda x: x['title']['runs'][0]['text'], - lambda x: x['title']['simpleText']), compat_str) + lambda x: x['title']['simpleText'], + lambda x: x['headline']['simpleText']), compat_str) description = try_get( renderer, lambda x: x['descriptionSnippet']['runs'][0]['text'], compat_str) @@ -2207,6 +2208,24 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor): IE_NAME = 'youtube:tab' _TESTS = [{ + # Shorts + 'url': 'https://www.youtube.com/@SuperCooperShorts/shorts', + 'playlist_mincount': 5, + 'info_dict': { + 'description': 'Short clips from Super Cooper Sundays!', + 'id': 'UCKMA8kHZ8bPYpnMNaUSxfEQ', + 'title': 'Super Cooper Shorts - Shorts', + } + }, { + # Channel that does not have a Shorts tab. Test should just download videos on Home tab instead + 'url': 'https://www.youtube.com/@emergencyawesome/shorts', + 'info_dict': { + 'description': 'md5:592c080c06fef4de3c902c4a8eecd850', + 'id': 'UCDiFRMQWpcp8_KD4vwIVicw', + 'title': 'Emergency Awesome - Home', + }, + 'playlist_mincount': 5, + }, { # playlists, multipage 'url': 'https://www.youtube.com/c/ИгорьКлейнер/playlists?view=1&flow=grid', 'playlist_mincount': 94, @@ -2680,7 +2699,11 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor): def _rich_grid_entries(self, contents): for content in contents: - video_renderer = try_get(content, lambda x: x['richItemRenderer']['content']['videoRenderer'], dict) + video_renderer = try_get( + content, + (lambda x: x['richItemRenderer']['content']['videoRenderer'], + lambda x: x['richItemRenderer']['content']['reelItemRenderer']), + dict) if video_renderer: entry = self._video_entry(video_renderer) if entry: |