diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-02-01 04:36:57 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-02-01 04:36:57 +0600 |
| commit | 439b9a9e9bbaa475fd5257cd0f42403be33e5788 (patch) | |
| tree | 04f3e579b88bd5203b4a0acb1abb15dea357a934 /youtube_dl | |
| parent | e41b1f73854d8a422235a3b92ca4255affbcd39e (diff) | |
| parent | 8c72beb25eaa1f1960a3b50295bcdcfd50c450af (diff) | |
| download | youtube-dl-439b9a9e9bbaa475fd5257cd0f42403be33e5788.tar.xz | |
Merge branch 'kinetoskombi-globo-fix'
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/globo.py | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/youtube_dl/extractor/globo.py b/youtube_dl/extractor/globo.py index 6949a57c7..29638a194 100644 --- a/youtube_dl/extractor/globo.py +++ b/youtube_dl/extractor/globo.py @@ -70,6 +70,19 @@ class GloboIE(InfoExtractor): '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(): @@ -381,11 +394,16 @@ class GloboIE(InfoExtractor): 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 - formats.append({ - 'url': '%s?h=%s&k=%s' % (resource['url'], signed_hash, 'flash'), - 'format_id': resource_id, - 'height': resource['height'] - }) + 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({ + 'url': signed_url, + 'format_id': resource_id, + 'height': resource.get('height'), + }) self._sort_formats(formats) |