gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

[funimation] Improve extraction

Browse source
This commit is contained in:
Sergey M․ 2015-12-12 01:02:54 +06:00
parent 0b1bb1ac3a
commit f377f44dae
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
youtube_dl/extractor/funimation.py
View file

@ -8,6 +8,7 @@ from ..utils import (
clean_html, clean_html,
determine_ext, determine_ext,
encode_dict, encode_dict,
int_or_none,
sanitized_Request, sanitized_Request,
ExtractorError, ExtractorError,
urlencode_postdata urlencode_postdata
@ -136,7 +137,7 @@ class FunimationIE(InfoExtractor):
preference = 1 if video.get('languageMode') == 'dub' else 0 preference = 1 if video.get('languageMode') == 'dub' else 0
if not auth_token.startswith('?'): if not auth_token.startswith('?'):
auth_token = '?%s' % auth_token auth_token = '?%s' % auth_token
for quality in ('sd', 'hd', 'hd1080'): for quality, height in (('sd', 480), ('hd', 720), ('hd1080', 1080)):
format_url = video.get('%sUrl' % quality) format_url = video.get('%sUrl' % quality)
if not format_url: if not format_url:
continue continue
@ -146,22 +147,19 @@ class FunimationIE(InfoExtractor):
if determine_ext(format_url) == 'm3u8': if determine_ext(format_url) == 'm3u8':
m3u8_formats = self._extract_m3u8_formats( m3u8_formats = self._extract_m3u8_formats(
format_url + auth_token, display_id, 'mp4', entry_protocol='m3u8_native', format_url + auth_token, display_id, 'mp4', entry_protocol='m3u8_native',
preference=preference, m3u8_id=funimation_id or 'hls', fatal=False) preference=preference, m3u8_id='%s-hls' % funimation_id, fatal=False)
if m3u8_formats: if m3u8_formats:
formats.extend(m3u8_formats) formats.extend(m3u8_formats)
else: else:
f = { tbr = int_or_none(self._search_regex(
r'-(\d+)[Kk]', format_url, 'tbr', default=None))
formats.append({
'url': format_url + auth_token, 'url': format_url + auth_token,
'format_id': funimation_id, 'format_id': '%s-http-%dp' % (funimation_id, height),
'height': height,
'tbr': tbr,
'preference': preference, 'preference': preference,
} })
mobj = re.search(r'(?P<height>\d+)-(?P<tbr>\d+)[Kk]', format_url)
if mobj:
f.update({
'height': int(mobj.group('height')),
'tbr': int(mobj.group('tbr')),
})
formats.append(f)
if not formats and errors: if not formats and errors:
raise ExtractorError( raise ExtractorError(