artem/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2026-04-26 02:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor logging improvements

Browse Source
This commit is contained in:
coletdjnz 2025-04-20 20:21:21 +12:00
parent eb3680be9e
commit dd92c0df5b
No known key found for this signature in database
GPG Key ID: 91984263BB39894A
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_pot/test_pot_director.py
View File

@ -1237,7 +1237,7 @@ class TestPoTokenRequestDirector:
assert response == EXAMPLE_PO_TOKEN assert response == EXAMPLE_PO_TOKEN
assert provider.request_called_times == 1 assert provider.request_called_times == 1
assert pot_provider.request_called_times == 1 assert pot_provider.request_called_times == 1
assert 'PO Token Provider "unsupported" does not support this request, trying next available provider. Reason: unsupported request' in logger.messages['trace'] assert 'PO Token Provider "unsupported" rejected this request, trying next available provider. Reason: unsupported request' in logger.messages['trace']
def test_unavailable_request_no_fallback(self, ie, logger, pot_cache, pot_request): def test_unavailable_request_no_fallback(self, ie, logger, pot_cache, pot_request):
director = PoTokenRequestDirector(logger=logger, cache=pot_cache) director = PoTokenRequestDirector(logger=logger, cache=pot_cache)

16
yt_dlp/extractor/youtube/_video.py
View File

@ -2869,6 +2869,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
f'Got a GVS PO Token for {client} client, but missing Data Sync ID for account. Formats may not work.' f'Got a GVS PO Token for {client} client, but missing Data Sync ID for account. Formats may not work.'
f'You may need to pass a Data Sync ID with --extractor-args "youtube:data_sync_id=XXX"') f'You may need to pass a Data Sync ID with --extractor-args "youtube:data_sync_id=XXX"')
self.write_debug(f'{video_id}: Retrieved a {context.value} PO Token for {client} client from config')
return config_po_token return config_po_token
# Require GVS WebPO Token if logged in for external fetching # Require GVS WebPO Token if logged in for external fetching
@ -2878,7 +2879,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
f'You may need to pass a Data Sync ID with --extractor-args "youtube:data_sync_id=XXX"') f'You may need to pass a Data Sync ID with --extractor-args "youtube:data_sync_id=XXX"')
return return
return self._fetch_po_token( po_token = self._fetch_po_token(
client=client, client=client,
context=context.value, context=context.value,
ytcfg=ytcfg, ytcfg=ytcfg,
@ -2891,6 +2892,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
**kwargs, **kwargs,
) )
if po_token:
self.write_debug(f'{video_id}: Retrieved a {context.value} PO Token for {client} client')
return po_token
def _fetch_po_token(self, client, **kwargs): def _fetch_po_token(self, client, **kwargs):
context = kwargs.get('context') context = kwargs.get('context')
@ -2937,14 +2942,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
bypass_cache=False, bypass_cache=False,
) )
po_token = self._pot_director.get_po_token(pot_request) return self._pot_director.get_po_token(pot_request)
if not po_token:
self.write_debug(f'{kwargs.get("video_id")}: No {pot_request.context.value} PO Token available for {client} client')
return
self.write_debug(f'{kwargs.get("video_id")}: Retrieved a {pot_request.context.value} PO Token for {client} client')
return po_token
@staticmethod @staticmethod
def _is_agegated(player_response): def _is_agegated(player_response):

2
yt_dlp/extractor/youtube/pot/_director.py
View File

@ -266,7 +266,7 @@ class PoTokenRequestDirector:
response = provider.request_pot(request.copy()) response = provider.request_pot(request.copy())
except PoTokenProviderRejectedRequest as e: except PoTokenProviderRejectedRequest as e:
self.logger.trace( self.logger.trace(
f'PO Token Provider "{provider.PROVIDER_NAME}" does not support this request, trying next available provider. Reason: {e}') f'PO Token Provider "{provider.PROVIDER_NAME}" rejected this request, trying next available provider. Reason: {e}')
continue continue
except PoTokenProviderError as e: except PoTokenProviderError as e:
self.logger.warning( self.logger.warning(