Skip to content

Commit

Permalink
[ie/adn] Improve auth error handling (#9068)
Browse files Browse the repository at this point in the history
Closes #9067
Authored by: infanf
  • Loading branch information
infanf committed Jan 28, 2024
1 parent 0023af8 commit 9526b1f
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion yt_dlp/extractor/adn.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -17,6 +18,7 @@
int_or_none,
intlist_to_bytes,
long_to_bytes,
parse_iso8601,
pkcs1pad,
strip_or_none,
str_or_none,
Expand Down Expand Up @@ -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'),
Expand Down Expand Up @@ -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 {}
Expand Down

0 comments on commit 9526b1f

Please sign in to comment.