Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-07 07:57:23 +08:00
Code Issues Releases Wiki Activity

Ignore potential premium DDL links

Browse Source 
Iterate over server list instead of always using first index
Add a couple fallbacks
This commit is contained in:
BrutuZ 2020-03-14 02:02:10 -03:00
parent 79b0d33f63
commit 3202fbcb8a
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
youtube_dl/extractor/hanime.py
View File

@ -47,34 +47,45 @@ class HanimeIE(InfoExtractor):
video_slug = self._match_id(url) video_slug = self._match_id(url)
page_json = self._html_search_regex(r'<script>.+__NUXT__=(.+?);<\/script>', self._download_webpage(url, video_slug), 'Inline JSON') page_json = self._html_search_regex(r'<script>.+__NUXT__=(.+?);<\/script>', self._download_webpage(url, video_slug), 'Inline JSON')
page_json = try_get(self._parse_json(page_json, video_slug), lambda x: x['state']['data']['video']['hentai_video'], dict) or {} page_json = try_get(self._parse_json(page_json, video_slug), lambda x: x['state']['data']['video']['hentai_video'], dict) or {}
api_json = self._download_json( api_json = try_get(self._download_json(
'https://members.hanime.tv/api/v3/videos_manifests/%s' % video_slug, 'https://members.hanime.tv/api/v3/videos_manifests/%s' % video_slug,
video_slug, video_slug,
'API Call', headers={'X-Directive': 'api'}).get('videos_manifest').get('servers')[0].get('streams') 'API Call', headers={'X-Directive': 'api'}), lambda x: x['videos_manifest']['servers'], list) or []
title = page_json.get('name') or api_json.get[0].get('video_stream_group_id') title = page_json.get('name')
duration = parse_duration('%sms' % page_json.get('duration_in_ms'))
tags = [] tags = []
for t in page_json.get('hentai_tags'): for tag in page_json.get('hentai_tags'):
if t.get('text'): if tag.get('text'):
tags.append(t.get('text')) tags.append(tag.get('text'))
formats = [] formats = []
for f in api_json: video_id = None
item_url = sanitize_url(f.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % f.get('id')) for server in api_json:
width = int_or_none(f.get('width')) for stream in server['streams']:
height = int_or_none(f.get('height')) if stream.get('compatibility') != 'all':
format = { continue
'width': width, item_url = sanitize_url(stream.get('url')) or sanitize_url('https://hanime.tv/api/v1/m3u8s/%s.m3u8' % stream.get('id'))
'height': height, width = int_or_none(stream.get('width'))
'filesize_approx': float_or_none(parse_filesize('%sMb' % f.get('filesize_mbs'))), height = int_or_none(stream.get('height'))
'protocol': 'm3u8', format = {
'format_id': 'mp4-%sp' % f.get('height'), 'width': width,
'ext': 'mp4', 'height': height,
'url': item_url, 'filesize_approx': float_or_none(parse_filesize('%sMb' % stream.get('filesize_mbs'))),
} 'protocol': 'm3u8',
formats.append(format) 'format_id': 'mp4-%sp' % stream.get('height'),
'ext': 'mp4',
'url': item_url,
}
formats.append(format)
if not title:
title = stream.get('video_stream_group_id')
if not duration:
duration = parse_duration(compat_str(stream.get('duration_in_ms')))
if not video_id:
video_id = compat_str(stream.get('id'))
formats.reverse() formats.reverse()
return { return {
'id': compat_str(api_json[0].get('id')), 'id': video_id,
'display_id': video_slug, 'display_id': video_slug,
'title': title, 'title': title,
'description': clean_html(page_json.get('description')), 'description': clean_html(page_json.get('description')),
@ -82,14 +93,14 @@ class HanimeIE(InfoExtractor):
{'preference': 0, 'id': 'Poster', 'url': page_json.get('poster_url')}, {'preference': 0, 'id': 'Poster', 'url': page_json.get('poster_url')},
{'preference': 1, 'id': 'Cover', 'url': page_json.get('cover_url')}, {'preference': 1, 'id': 'Cover', 'url': page_json.get('cover_url')},
], ],
'release_date': unified_strdate(page_json.get('released_at')), 'release_date': unified_strdate(page_json.get('released_at') or compat_str(page_json.get('released_at_unix'))),
'upload_date': unified_strdate(page_json.get('created_at')), 'upload_date': unified_strdate(page_json.get('created_at') or compat_str(page_json.get('created_at_unix'))),
'timestamp': parse_iso8601(page_json.get('created_at')), 'timestamp': int_or_none(page_json.get('created_at_unix') or parse_iso8601(page_json.get('created_at'))),
'creator': str_or_none(page_json.get('brand')), 'creator': str_or_none(page_json.get('brand')),
'view_count': int_or_none(page_json.get('views')), 'view_count': int_or_none(page_json.get('views')),
'like_count': int_or_none(page_json.get('likes')), 'like_count': int_or_none(page_json.get('likes')),
'dislike_count': int_or_none(page_json.get('dislikes')), 'dislike_count': int_or_none(page_json.get('dislikes')),
'duration': float_or_none(parse_duration('%sms' % f.get('duration_in_ms'))), 'duration': float_or_none(duration),
'tags': tags, 'tags': tags,
'formats': formats, 'formats': formats,
} }