]> jfr.im git - yt-dlp.git/commitdiff
[ie/adn] Improve auth error handling (#9068)
authorChristopher Schreiner <redacted>
Sun, 28 Jan 2024 16:03:19 +0000 (17:03 +0100)
committerGitHub <redacted>
Sun, 28 Jan 2024 16:03:19 +0000 (16:03 +0000)
Closes #9067
Authored by: infanf

yt_dlp/extractor/adn.py

index ed23226a35225d81b2514b3a6a379c3590e8e908..898d372980901ab048d8f0705df45fd2482fe4db 100644 (file)
@@ -3,6 +3,7 @@
 import json
 import os
 import random
+import time
 
 from .common import InfoExtractor
 from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
@@ -17,6 +18,7 @@
     int_or_none,
     intlist_to_bytes,
     long_to_bytes,
+    parse_iso8601,
     pkcs1pad,
     strip_or_none,
     str_or_none,
@@ -185,7 +187,10 @@ def _real_extract(self, url):
 
         user = options['user']
         if not user.get('hasAccess'):
-            self.raise_login_required()
+            start_date = traverse_obj(options, ('video', 'startDate', {str}))
+            if (parse_iso8601(start_date) or 0) > time.time():
+                raise ExtractorError(f'This video is not available yet. Release date: {start_date}', expected=True)
+            self.raise_login_required('This video requires a subscription', method='password')
 
         token = self._download_json(
             user.get('refreshTokenUrl') or (self._PLAYER_BASE_URL + 'refresh/token'),
@@ -267,6 +272,9 @@ def _real_extract(self, url):
                         f['language'] = 'de'
                 formats.extend(m3u8_formats)
 
+        if not formats:
+            self.raise_login_required('This video requires a subscription', method='password')
+
         video = (self._download_json(
             self._API_BASE_URL + 'video/%s' % video_id, video_id,
             'Downloading additional video metadata', fatal=False) or {}).get('video') or {}