dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[globo] fix format extraction(closes #20319)

This commit is contained in:
Remita Amine 2019-10-09 11:07:46 +01:00
parent 560d3b7d7c
commit d4bb825b83
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/globo.py
View File

@ -96,6 +96,8 @@ class GloboIE(InfoExtractor):
video = self._download_json( video = self._download_json(
'http://api.globovideos.com/videos/%s/playlist' % video_id, 'http://api.globovideos.com/videos/%s/playlist' % video_id,
video_id)['videos'][0] video_id)['videos'][0]
if video.get('encrypted') is True:
raise ExtractorError('This video is DRM protected.', expected=True)
title = video['title'] title = video['title']
@ -109,8 +111,8 @@ class GloboIE(InfoExtractor):
security = self._download_json( security = self._download_json(
'http://security.video.globo.com/videos/%s/hash' % video_id, 'http://security.video.globo.com/videos/%s/hash' % video_id,
video_id, 'Downloading security hash for %s' % resource_id, query={ video_id, 'Downloading security hash for %s' % resource_id, query={
'player': 'flash', 'player': 'desktop',
'version': '17.0.0.132', 'version': '5.19.1',
'resource_id': resource_id, 'resource_id': resource_id,
}) })
@ -122,19 +124,18 @@ class GloboIE(InfoExtractor):
'%s returned error: %s' % (self.IE_NAME, message), expected=True) '%s returned error: %s' % (self.IE_NAME, message), expected=True)
continue continue
hash_code = security_hash[:2] assert security_hash[:2] in ('04', '14')
received_time = security_hash[2:12] received_time = security_hash[3:13]
received_random = security_hash[12:22] received_md5 = security_hash[24:]
received_md5 = security_hash[22:]
sign_time = compat_str(int(received_time) + 86400) sign_time = compat_str(int(received_time) + 86400)
padding = '%010d' % random.randint(1, 10000000000) padding = '%010d' % random.randint(1, 10000000000)
md5_data = (received_md5 + sign_time + padding + '0xFF01DD').encode() md5_data = (received_md5 + sign_time + padding + '0xAC10FD').encode()
signed_md5 = base64.urlsafe_b64encode(hashlib.md5(md5_data).digest()).decode().strip('=') signed_md5 = base64.urlsafe_b64encode(hashlib.md5(md5_data).digest()).decode().strip('=')
signed_hash = hash_code + received_time + received_random + sign_time + padding + signed_md5 signed_hash = security_hash[:23] + sign_time + padding + signed_md5
signed_url = '%s?h=%s&k=%s' % (resource_url, signed_hash, 'flash') signed_url = '%s?h=%s&k=html5&a=%s&u=%s' % (resource_url, signed_hash, 'F' if video.get('subscriber_only') else 'A', security.get('user') or '')
if resource_id.endswith('m3u8') or resource_url.endswith('.m3u8'): if resource_id.endswith('m3u8') or resource_url.endswith('.m3u8'):
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
signed_url, resource_id, 'mp4', entry_protocol='m3u8_native', signed_url, resource_id, 'mp4', entry_protocol='m3u8_native',