[youtube:tab] Reload with unavailable videos for all playlists

[yt-dlp.git] / yt_dlp / extractor / youtube.py

diff --git a/yt_dlp/extractor/youtube.py b/yt_dlp/extractor/youtube.py
index 6d5ef0193c3d12365053f1c834660d00d3bdc03d..4c9da101f5a09739296e41c620a86072b49cb75d 100644 (file)
--- a/yt_dlp/extractor/youtube.py
+++ b/yt_dlp/extractor/youtube.py
@@ -2050,7 +2050,7 @@ def feed_entry(name):
 
         if not formats:
             if not self._downloader.params.get('allow_unplayable_formats') and streaming_data.get('licenseInfos'):
-                raise ExtractorError(
+                self.raise_no_formats(
                     'This video is DRM protected.', expected=True)
             pemr = try_get(
                 playability_status,
@@ -2065,11 +2065,10 @@ def feed_entry(name):
                     if not countries:
                         regions_allowed = search_meta('regionsAllowed')
                         countries = regions_allowed.split(',') if regions_allowed else None
-                    self.raise_geo_restricted(
-                        subreason, countries)
+                    self.raise_geo_restricted(subreason, countries, metadata_available=True)
                 reason += '\n' + subreason
             if reason:
-                raise ExtractorError(reason, expected=True)
+                self.raise_no_formats(reason, expected=True)
 
         self._sort_formats(formats)
 
@@ -2642,6 +2641,16 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
         'expected_warnings': [
             'YouTube said: INFO - Unavailable videos are hidden',
         ]
+    }, {
+        'note': 'Playlist with unavailable videos in a later page',
+        'url': 'https://www.youtube.com/playlist?list=UU8l9frL61Yl5KFOl87nIm2w',
+        'info_dict': {
+            'title': 'Uploads from BlankTV',
+            'id': 'UU8l9frL61Yl5KFOl87nIm2w',
+            'uploader': 'BlankTV',
+            'uploader_id': 'UC8l9frL61Yl5KFOl87nIm2w',
+        },
+        'playlist_mincount': 20000,
     }, {
         # https://github.com/ytdl-org/youtube-dl/issues/21844
         'url': 'https://www.youtube.com/playlist?list=PLzH6n4zXuckpfMu_4Ff8E7Z1behQks5ba',
@@ -3312,7 +3321,10 @@ def _reload_with_unavailable_videos(self, item_id, data, webpage):
         Get playlist with unavailable videos if the 'show unavailable videos' button exists.
         """
         sidebar_renderer = try_get(
-            data, lambda x: x['sidebar']['playlistSidebarRenderer']['items'], list) or []
+            data, lambda x: x['sidebar']['playlistSidebarRenderer']['items'], list)
+        if not sidebar_renderer:
+            return
+        browse_id = params = None
         for item in sidebar_renderer:
             if not isinstance(item, dict):
                 continue
@@ -3331,22 +3343,22 @@ def _reload_with_unavailable_videos(self, item_id, data, webpage):
                     nav_item_renderer, lambda x: x['navigationEndpoint']['browseEndpoint'], dict) or {}
                 browse_id = browse_endpoint.get('browseId')
                 params = browse_endpoint.get('params')
-                if not browse_id or not params:
-                    return
-                ytcfg = self._extract_ytcfg(item_id, webpage)
-                headers = self._generate_api_headers(
-                    ytcfg, account_syncid=self._extract_account_syncid(ytcfg),
-                    identity_token=self._extract_identity_token(webpage, item_id=item_id),
-                    visitor_data=try_get(
-                        self._extract_context(ytcfg), lambda x: x['client']['visitorData'], compat_str))
-                query = {
-                    'params': params,
-                    'browseId': browse_id
-                }
-                return self._extract_response(
-                    item_id=item_id, headers=headers, query=query,
-                    check_get_keys='contents', fatal=False,
-                    note='Downloading API JSON with unavailable videos')
+                break
+
+            ytcfg = self._extract_ytcfg(item_id, webpage)
+            headers = self._generate_api_headers(
+                ytcfg, account_syncid=self._extract_account_syncid(ytcfg),
+                identity_token=self._extract_identity_token(webpage, item_id=item_id),
+                visitor_data=try_get(
+                    self._extract_context(ytcfg), lambda x: x['client']['visitorData'], compat_str))
+            query = {
+                'params': params or 'wgYCCAA=',
+                'browseId': browse_id or 'VL%s' % item_id
+            }
+            return self._extract_response(
+                item_id=item_id, headers=headers, query=query,
+                check_get_keys='contents', fatal=False,
+                note='Downloading API JSON with unavailable videos')
 
     def _extract_response(self, item_id, query, note='Downloading API JSON', headers=None,
                           ytcfg=None, check_get_keys=None, ep='browse', fatal=True):