diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-05-05 02:38:13 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-05-05 02:38:13 +0600 |
| commit | 815ac0293ee9d7f3771499cd71d833c83575bec9 (patch) | |
| tree | bde0fca5d9c88a3e9550cd26cf4d8b5104499177 /youtube_dl | |
| parent | 6568382d6f3a986a773aa4d92b6bcbd367ccb794 (diff) | |
[noco] Modernize
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/noco.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/youtube_dl/extractor/noco.py b/youtube_dl/extractor/noco.py index e44ece5a2..098c564bd 100644 --- a/youtube_dl/extractor/noco.py +++ b/youtube_dl/extractor/noco.py @@ -14,6 +14,9 @@ from ..compat import ( from ..utils import ( clean_html, ExtractorError, + int_or_none, + float_or_none, + parse_iso8601, unified_strdate, ) @@ -151,22 +154,22 @@ class NocoIE(InfoExtractor): formats.append({ 'url': file_url, 'format_id': format_id_extended, - 'width': fmt['res_width'], - 'height': fmt['res_lines'], - 'abr': fmt['audiobitrate'], - 'vbr': fmt['videobitrate'], - 'filesize': fmt['filesize'], - 'format_note': qualities[format_id]['quality_name'], - 'quality': qualities[format_id]['priority'], + 'width': int_or_none(fmt.get('res_width')), + 'height': int_or_none(fmt.get('res_lines')), + 'abr': int_or_none(fmt.get('audiobitrate')), + 'vbr': int_or_none(fmt.get('videobitrate')), + 'filesize': int_or_none(fmt.get('filesize')), + 'format_note': qualities[format_id].get('quality_name'), + 'quality': qualities[format_id].get('priority'), 'preference': preference, }) self._sort_formats(formats) - upload_date = unified_strdate(show['online_date_start_utc']) - uploader = show['partner_name'] - uploader_id = show['partner_key'] - duration = show['duration_ms'] / 1000.0 + timestamp = parse_iso8601(show.get('online_date_start_utc'), ' ') + uploader = show.get('partner_name') + uploader_id = show.get('partner_key') + duration = float_or_none(show.get('duration_ms'), 1000) thumbnails = [] for thumbnail_key, thumbnail_url in show.items(): @@ -198,7 +201,7 @@ class NocoIE(InfoExtractor): 'title': title, 'description': description, 'thumbnails': thumbnails, - 'upload_date': upload_date, + 'timestamp': timestamp, 'uploader': uploader, 'uploader_id': uploader_id, 'duration': duration, |