From 9526b1f179d19f75284eceaa5e0ee381af18cf19 Mon Sep 17 00:00:00 2001 From: Christopher Schreiner Date: Sun, 28 Jan 2024 17:03:19 +0100 Subject: [PATCH] [ie/adn] Improve auth error handling (#9068) Closes #9067 Authored by: infanf --- yt_dlp/extractor/adn.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yt_dlp/extractor/adn.py b/yt_dlp/extractor/adn.py index ed23226a3..898d37298 100644 --- a/yt_dlp/extractor/adn.py +++ b/yt_dlp/extractor/adn.py @@ -3,6 +3,7 @@ import binascii 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 @@ from ..utils import ( int_or_none, intlist_to_bytes, long_to_bytes, + parse_iso8601, pkcs1pad, strip_or_none, str_or_none, @@ -185,7 +187,10 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text''' 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 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text''' 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 {}