mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-04 08:29:57 +01:00
Merge branch 'kinetoskombi-globo-fix'
This commit is contained in:
commit
439b9a9e9b
@ -70,6 +70,19 @@ class GloboIE(InfoExtractor):
|
|||||||
'like_count': int,
|
'like_count': int,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'url': 'http://globotv.globo.com/canal-brasil/sangue-latino/t/todos-os-videos/v/ator-e-diretor-argentino-ricado-darin-fala-sobre-utopias-e-suas-perdas/3928201/',
|
||||||
|
'md5': 'c1defca721ce25b2354e927d3e4b3dec',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '3928201',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Ator e diretor argentino, Ricado Darín fala sobre utopias e suas perdas',
|
||||||
|
'duration': 1472.906,
|
||||||
|
'uploader': 'Canal Brasil',
|
||||||
|
'uploader_id': 705,
|
||||||
|
'like_count': int,
|
||||||
|
}
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
class MD5():
|
class MD5():
|
||||||
@ -381,10 +394,15 @@ def _real_extract(self, url):
|
|||||||
signed_md5 = self.MD5.b64_md5(received_md5 + compat_str(sign_time) + padding)
|
signed_md5 = self.MD5.b64_md5(received_md5 + compat_str(sign_time) + padding)
|
||||||
signed_hash = hash_code + compat_str(received_time) + received_random + compat_str(sign_time) + padding + signed_md5
|
signed_hash = hash_code + compat_str(received_time) + received_random + compat_str(sign_time) + padding + signed_md5
|
||||||
|
|
||||||
|
resource_url = resource['url']
|
||||||
|
signed_url = '%s?h=%s&k=%s' % (resource_url, signed_hash, 'flash')
|
||||||
|
if resource_id.endswith('m3u8') or resource_url.endswith('.m3u8'):
|
||||||
|
formats.extend(self._extract_m3u8_formats(signed_url, resource_id, 'mp4'))
|
||||||
|
else:
|
||||||
formats.append({
|
formats.append({
|
||||||
'url': '%s?h=%s&k=%s' % (resource['url'], signed_hash, 'flash'),
|
'url': signed_url,
|
||||||
'format_id': resource_id,
|
'format_id': resource_id,
|
||||||
'height': resource['height']
|
'height': resource.get('height'),
|
||||||
})
|
})
|
||||||
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
Loading…
Reference in New Issue
Block a user