|
|
@ -586,24 +586,26 @@ class BrightcoveNewIE(AdobePassIE):
|
|
|
|
|
|
|
|
|
|
|
|
account_id, player_id, embed, content_type, video_id = re.match(self._VALID_URL, url).groups()
|
|
|
|
account_id, player_id, embed, content_type, video_id = re.match(self._VALID_URL, url).groups()
|
|
|
|
|
|
|
|
|
|
|
|
webpage = self._download_webpage(
|
|
|
|
policy_key_id = '%s_%s' % (account_id, player_id)
|
|
|
|
'http://players.brightcove.net/%s/%s_%s/index.min.js'
|
|
|
|
policy_key = self._downloader.cache.load('brightcove', policy_key_id)
|
|
|
|
% (account_id, player_id, embed), video_id)
|
|
|
|
if not policy_key:
|
|
|
|
|
|
|
|
webpage = self._download_webpage(
|
|
|
|
policy_key = None
|
|
|
|
'http://players.brightcove.net/%s/%s_%s/index.min.js'
|
|
|
|
|
|
|
|
% (account_id, player_id, embed), video_id)
|
|
|
|
|
|
|
|
|
|
|
|
catalog = self._search_regex(
|
|
|
|
catalog = self._search_regex(
|
|
|
|
r'catalog\(({.+?})\);', webpage, 'catalog', default=None)
|
|
|
|
r'catalog\(({.+?})\);', webpage, 'catalog', default=None)
|
|
|
|
if catalog:
|
|
|
|
|
|
|
|
catalog = self._parse_json(
|
|
|
|
|
|
|
|
js_to_json(catalog), video_id, fatal=False)
|
|
|
|
|
|
|
|
if catalog:
|
|
|
|
if catalog:
|
|
|
|
policy_key = catalog.get('policyKey')
|
|
|
|
catalog = self._parse_json(
|
|
|
|
|
|
|
|
js_to_json(catalog), video_id, fatal=False)
|
|
|
|
if not policy_key:
|
|
|
|
if catalog:
|
|
|
|
policy_key = self._search_regex(
|
|
|
|
policy_key = catalog.get('policyKey')
|
|
|
|
r'policyKey\s*:\s*(["\'])(?P<pk>.+?)\1',
|
|
|
|
|
|
|
|
webpage, 'policy key', group='pk')
|
|
|
|
if not policy_key:
|
|
|
|
|
|
|
|
policy_key = self._search_regex(
|
|
|
|
|
|
|
|
r'policyKey\s*:\s*(["\'])(?P<pk>.+?)\1',
|
|
|
|
|
|
|
|
webpage, 'policy key', group='pk')
|
|
|
|
|
|
|
|
self._downloader.cache.store('brightcove', policy_key_id, 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)
|
|
|
|
headers = {
|
|
|
|
headers = {
|
|
|
|