[noco] Modernize

This commit is contained in:
Sergey M․ 2015-05-05 02:38:13 +06:00
parent 6568382d6f
commit 815ac0293e
1 changed files with 15 additions and 12 deletions

View File

@ -14,6 +14,9 @@ from ..compat import (
from ..utils import ( from ..utils import (
clean_html, clean_html,
ExtractorError, ExtractorError,
int_or_none,
float_or_none,
parse_iso8601,
unified_strdate, unified_strdate,
) )
@ -151,22 +154,22 @@ class NocoIE(InfoExtractor):
formats.append({ formats.append({
'url': file_url, 'url': file_url,
'format_id': format_id_extended, 'format_id': format_id_extended,
'width': fmt['res_width'], 'width': int_or_none(fmt.get('res_width')),
'height': fmt['res_lines'], 'height': int_or_none(fmt.get('res_lines')),
'abr': fmt['audiobitrate'], 'abr': int_or_none(fmt.get('audiobitrate')),
'vbr': fmt['videobitrate'], 'vbr': int_or_none(fmt.get('videobitrate')),
'filesize': fmt['filesize'], 'filesize': int_or_none(fmt.get('filesize')),
'format_note': qualities[format_id]['quality_name'], 'format_note': qualities[format_id].get('quality_name'),
'quality': qualities[format_id]['priority'], 'quality': qualities[format_id].get('priority'),
'preference': preference, 'preference': preference,
}) })
self._sort_formats(formats) self._sort_formats(formats)
upload_date = unified_strdate(show['online_date_start_utc']) timestamp = parse_iso8601(show.get('online_date_start_utc'), ' ')
uploader = show['partner_name'] uploader = show.get('partner_name')
uploader_id = show['partner_key'] uploader_id = show.get('partner_key')
duration = show['duration_ms'] / 1000.0 duration = float_or_none(show.get('duration_ms'), 1000)
thumbnails = [] thumbnails = []
for thumbnail_key, thumbnail_url in show.items(): for thumbnail_key, thumbnail_url in show.items():
@ -198,7 +201,7 @@ class NocoIE(InfoExtractor):
'title': title, 'title': title,
'description': description, 'description': description,
'thumbnails': thumbnails, 'thumbnails': thumbnails,
'upload_date': upload_date, 'timestamp': timestamp,
'uploader': uploader, 'uploader': uploader,
'uploader_id': uploader_id, 'uploader_id': uploader_id,
'duration': duration, 'duration': duration,