R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[5min] improve rendition url creation

Browse Source
This commit is contained in:
remitamine 2015-10-14 11:19:07 +01:00
parent 1b06a1786e
commit 2f723697bb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/fivemin.py
View File

@ -6,10 +6,12 @@ from ..compat import (
compat_urllib_parse, compat_urllib_parse,
compat_parse_qs, compat_parse_qs,
compat_urllib_parse_urlparse, compat_urllib_parse_urlparse,
compat_urlparse,
) )
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
parse_duration, parse_duration,
replace_extension,
) )
@ -115,17 +117,14 @@ class FiveMinIE(InfoExtractor):
formats = [] formats = []
video_url = compat_parse_qs(compat_urllib_parse_urlparse(info['EmbededURL']).query)['videoUrl'][0] video_url = compat_parse_qs(compat_urllib_parse_urlparse(info['EmbededURL']).query)['videoUrl'][0]
qs = compat_urllib_parse_urlparse(video_url).query
if qs:
qs = '?' + qs
for rendition in info['Renditions']: for rendition in info['Renditions']:
if rendition['RenditionType'] == 'm3u8': if rendition['RenditionType'] == 'm3u8':
formats.extend(self._extract_m3u8_formats(rendition['Url'], video_id, m3u8_id='hls')) formats.extend(self._extract_m3u8_formats(rendition['Url'], video_id, m3u8_id='hls'))
elif rendition['RenditionType'] == 'aac': elif rendition['RenditionType'] == 'aac':
continue continue
else: else:
rendition_url = video_url[:10] + video_url[10:].replace('//', '/%s/' % rendition['ID']) parsed_video_url = compat_urllib_parse_urlparse(video_url)
rendition_url = rendition_url[:rendition_url.rindex('.')] + '.' + rendition['RenditionType'] + qs rendition_url = compat_urlparse.urlunparse(parsed_video_url._replace(path=replace_extension(parsed_video_url.path.replace('//', '/%s/' % rendition['ID']), rendition['RenditionType'])))
quality = self._QUALITIES.get(rendition['ID'], {}) quality = self._QUALITIES.get(rendition['ID'], {})
formats.append({ formats.append({
'format_id': '%s-%d' % (rendition['RenditionType'], rendition['ID']), 'format_id': '%s-%d' % (rendition['RenditionType'], rendition['ID']),