Sirius/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[turner] fix secure m3u8 formats downloading

Browse source
This commit is contained in:
Remita Amine 2016-08-28 17:51:53 +01:00
parent 5bc8a73af6
commit b8079a40bc
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
youtube_dl/extractor/turner.py
View file

@ -11,6 +11,7 @@ from ..utils import (
parse_duration,
xpath_attr,
update_url_query,
compat_urlparse,
)
@ -87,8 +88,18 @@ class TurnerBaseIE(InfoExtractor):
if ext == 'smil':
formats.extend(self._extract_smil_formats(video_url, video_id, fatal=False))
elif ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
video_url, video_id, 'mp4', m3u8_id=format_id, fatal=False))
m3u8_formats = self._extract_m3u8_formats(
video_url, video_id, 'mp4', m3u8_id=format_id, fatal=False)
if m3u8_formats:
# Sometimes final URLs inside m3u8 are unsigned, let's fix this
# ourselves
qs = compat_urlparse.urlparse(video_url).query
if qs:
query = compat_urlparse.parse_qs(qs)
for m3u8_format in m3u8_formats:
m3u8_format['url'] = update_url_query(m3u8_format['url'], query)
m3u8_format['extra_param_to_segment_url'] = qs
formats.extend(m3u8_formats)
elif ext == 'f4m':
formats.extend(self._extract_f4m_formats(
update_url_query(video_url, {'hdcore': '3.7.0'}),