]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[youtube] Improve age-gated videos extraction in 429 error conditions (refs #24283)
authorSergey M․ <dstftw@gmail.com>
Sat, 7 Mar 2020 22:37:47 +0000 (05:37 +0700)
committerSergey M․ <dstftw@gmail.com>
Sat, 7 Mar 2020 22:41:04 +0000 (05:41 +0700)
youtube_dl/extractor/youtube.py

index 9cbdc7ac54e2dfa119bc0f93b991612680fe0f08..906988e6f0974443cb2552746befe4aa238aff3b 100644 (file)
@@ -1726,6 +1726,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
         embed_webpage = None
         if re.search(r'player-age-gate-content">', video_webpage) is not None:
             age_gate = True
+            video_info = None
             # We simulate the access to the video from www.youtube.com/v/{video_id}
             # this can be viewed without login into Youtube
             url = proto + '://www.youtube.com/embed/%s' % video_id
@@ -1737,15 +1738,19 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                     r'"sts"\s*:\s*(\d+)', embed_webpage, 'sts', default=''),
             })
             video_info_url = proto + '://www.youtube.com/get_video_info?' + data
-            video_info_webpage = self._download_webpage(
-                video_info_url, video_id,
-                note='Refetching age-gated info webpage',
-                errnote='unable to download video info webpage')
-            video_info = compat_parse_qs(video_info_webpage)
-            pl_response = video_info.get('player_response', [None])[0]
-            player_response = extract_player_response(pl_response, video_id)
-            add_dash_mpd(video_info)
-            view_count = extract_view_count(video_info)
+            try:
+                video_info_webpage = self._download_webpage(
+                    video_info_url, video_id,
+                    note='Refetching age-gated info webpage',
+                    errnote='unable to download video info webpage')
+            except ExtractorError:
+                video_info_webpage = None
+            if video_info_webpage:
+                video_info = compat_parse_qs(video_info_webpage)
+                pl_response = video_info.get('player_response', [None])[0]
+                player_response = extract_player_response(pl_response, video_id)
+                add_dash_mpd(video_info)
+                view_count = extract_view_count(video_info)
         else:
             age_gate = False
             video_info = None