projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b004d9b
)
[nexx] extract new azure urls(closes #16223)
author
Remita Amine
<remitamine@gmail.com>
Thu, 19 Apr 2018 14:48:03 +0000
(15:48 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Thu, 19 Apr 2018 14:48:03 +0000
(15:48 +0100)
youtube_dl/extractor/nexx.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/nexx.py
b/youtube_dl/extractor/nexx.py
index c7029d29ebc0f4f9b28ee4474a1cfa04600d3650..5e46a75c0a783bca430c2fdfc8bd062528759704 100644
(file)
--- a/
youtube_dl/extractor/nexx.py
+++ b/
youtube_dl/extractor/nexx.py
@@
-230,15
+230,18
@@
class NexxIE(InfoExtractor):
azure_locator = stream_data['azureLocator']
azure_locator = stream_data['azureLocator']
- AZURE_URL = 'http://nx%s%02d.akamaized.net/'
-
- def get_cdn_shield_base(shield_type='', prefix='-p'):
+ def get_cdn_shield_base(shield_type='', static=False):
for secure in ('', 's'):
cdn_shield = stream_data.get('cdnShield%sHTTP%s' % (shield_type, secure.upper()))
if cdn_shield:
return 'http%s://%s' % (secure, cdn_shield)
else:
for secure in ('', 's'):
cdn_shield = stream_data.get('cdnShield%sHTTP%s' % (shield_type, secure.upper()))
if cdn_shield:
return 'http%s://%s' % (secure, cdn_shield)
else:
- return AZURE_URL % (prefix, int(stream_data['azureAccount'].replace('nexxplayplus', '')))
+ if 'fb' in stream_data['azureAccount']:
+ prefix = 'df' if static else 'f'
+ else:
+ prefix = 'd' if static else 'p'
+ account = int(stream_data['azureAccount'].replace('nexxplayplus', '').replace('nexxplayfb', ''))
+ return 'http://nx-%s%02d.akamaized.net/' % (prefix, account)
azure_stream_base = get_cdn_shield_base()
is_ml = ',' in language
azure_stream_base = get_cdn_shield_base()
is_ml = ',' in language
@@
-260,7
+263,7
@@
class NexxIE(InfoExtractor):
formats.extend(self._extract_ism_formats(
azure_manifest_url % '', video_id, ism_id='%s-mss' % cdn, fatal=False))
formats.extend(self._extract_ism_formats(
azure_manifest_url % '', video_id, ism_id='%s-mss' % cdn, fatal=False))
- azure_progressive_base = get_cdn_shield_base('Prog',
'-d'
)
+ azure_progressive_base = get_cdn_shield_base('Prog',
True
)
azure_file_distribution = stream_data.get('azureFileDistribution')
if azure_file_distribution:
fds = azure_file_distribution.split(',')
azure_file_distribution = stream_data.get('azureFileDistribution')
if azure_file_distribution:
fds = azure_file_distribution.split(',')