[brightcove] invalidate policy key cache on failing requests

This commit is contained in:
Remita Amine 2019-12-31 19:48:40 +01:00
parent 0164cd5dac
commit 2d30b92e11

View File

@ -589,6 +589,7 @@ def _real_extract(self, url):
policy_key_id = '%s_%s' % (account_id, player_id) policy_key_id = '%s_%s' % (account_id, player_id)
policy_key = self._downloader.cache.load('brightcove', policy_key_id) policy_key = self._downloader.cache.load('brightcove', policy_key_id)
policy_key_extracted = False policy_key_extracted = False
store_pk = lambda x: self._downloader.cache.store('brightcove', policy_key_id, x)
def extract_policy_key(): def extract_policy_key():
webpage = self._download_webpage( webpage = self._download_webpage(
@ -610,7 +611,7 @@ def extract_policy_key():
r'policyKey\s*:\s*(["\'])(?P<pk>.+?)\1', r'policyKey\s*:\s*(["\'])(?P<pk>.+?)\1',
webpage, 'policy key', group='pk') webpage, 'policy key', group='pk')
self._downloader.cache.store('brightcove', policy_key_id, policy_key) store_pk(policy_key)
return policy_key return policy_key
api_url = 'https://edge.api.brightcove.com/playback/v1/accounts/%s/%ss/%s' % (account_id, content_type, video_id) api_url = 'https://edge.api.brightcove.com/playback/v1/accounts/%s/%ss/%s' % (account_id, content_type, video_id)
@ -638,6 +639,7 @@ def extract_policy_key():
self.raise_geo_restricted(msg=message) self.raise_geo_restricted(msg=message)
elif json_data.get('error_code') == 'INVALID_POLICY_KEY' and not policy_key_extracted: elif json_data.get('error_code') == 'INVALID_POLICY_KEY' and not policy_key_extracted:
policy_key = None policy_key = None
store_pk(None)
continue continue
raise ExtractorError(message, expected=True) raise ExtractorError(message, expected=True)
raise raise