desastre
/
youtube-dl
forked from minhngoc25a/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[uplynk] force downloading using hls native downloader(closes #11496)

This commit is contained in:
Remita Amine 2016-12-20 19:49:45 +01:00
parent e029c43bd4
commit bfa1073e11
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/downloader/hls.py
View File

@ -65,6 +65,9 @@ class HlsFD(FragmentFD):
s = manifest.decode('utf-8', 'ignore') s = manifest.decode('utf-8', 'ignore')
if not self.can_download(s, info_dict): if not self.can_download(s, info_dict):
if info_dict.get('extra_param_to_segment_url'):
self.report_error('pycrypto not found. Please install it.')
return False
self.report_warning( self.report_warning(
'hlsnative has detected features it does not support, ' 'hlsnative has detected features it does not support, '
'extraction will be delegated to ffmpeg') 'extraction will be delegated to ffmpeg')

4
youtube_dl/extractor/uplynk.py
View File

@ -30,7 +30,9 @@ class UplynkIE(InfoExtractor):
def _extract_uplynk_info(self, uplynk_content_url): def _extract_uplynk_info(self, uplynk_content_url):
path, external_id, video_id, session_id = re.match(UplynkIE._VALID_URL, uplynk_content_url).groups() path, external_id, video_id, session_id = re.match(UplynkIE._VALID_URL, uplynk_content_url).groups()
display_id = video_id or external_id display_id = video_id or external_id
formats = self._extract_m3u8_formats('http://content.uplynk.com/%s.m3u8' % path, display_id, 'mp4') formats = self._extract_m3u8_formats(
'http://content.uplynk.com/%s.m3u8' % path,
display_id, 'mp4', 'm3u8_native')
if session_id: if session_id:
for f in formats: for f in formats:
f['extra_param_to_segment_url'] = 'pbs=' + session_id f['extra_param_to_segment_url'] = 'pbs=' + session_id