Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[nytimes] Modernize

Browse Source
This commit is contained in:
Sergey M․ 2015-03-19 21:23:52 +06:00
parent 0ae8bbac2d
commit f3c0c667a6
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
youtube_dl/extractor/nytimes.py
View File

@ -1,9 +1,11 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import parse_iso8601 from ..utils import (
float_or_none,
int_or_none,
parse_iso8601,
)
class NYTimesIE(InfoExtractor): class NYTimesIE(InfoExtractor):
@ -25,15 +27,15 @@ class NYTimesIE(InfoExtractor):
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) video_id = self._match_id(url)
video_id = mobj.group('id')
video_data = self._download_json( video_data = self._download_json(
'http://www.nytimes.com/svc/video/api/v2/video/%s' % video_id, video_id, 'Downloading video JSON') 'http://www.nytimes.com/svc/video/api/v2/video/%s' % video_id,
video_id, 'Downloading video JSON')
title = video_data['headline'] title = video_data['headline']
description = video_data['summary'] description = video_data.get('summary')
duration = video_data['duration'] / 1000.0 duration = float_or_none(video_data.get('duration'), 1000)
uploader = video_data['byline'] uploader = video_data['byline']
timestamp = parse_iso8601(video_data['publication_date'][:-8]) timestamp = parse_iso8601(video_data['publication_date'][:-8])
@ -49,11 +51,11 @@ class NYTimesIE(InfoExtractor):
formats = [ formats = [
{ {
'url': video['url'], 'url': video['url'],
'format_id': video['type'], 'format_id': video.get('type'),
'vcodec': video['video_codec'], 'vcodec': video.get('video_codec'),
'width': video['width'], 'width': int_or_none(video.get('width')),
'height': video['height'], 'height': int_or_none(video.get('height')),
'filesize': get_file_size(video['fileSize']), 'filesize': get_file_size(video.get('fileSize')),
} for video in video_data['renditions'] } for video in video_data['renditions']
] ]
self._sort_formats(formats) self._sort_formats(formats)
@ -61,7 +63,8 @@ class NYTimesIE(InfoExtractor):
thumbnails = [ thumbnails = [
{ {
'url': 'http://www.nytimes.com/%s' % image['url'], 'url': 'http://www.nytimes.com/%s' % image['url'],
'resolution': '%dx%d' % (image['width'], image['height']), 'width': int_or_none(image.get('width')),
'height': int_or_none(image.get('height')),
} for image in video_data['images'] } for image in video_data['images']
] ]