projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ae8bba
)
[nytimes] Modernize
author
Sergey M․
<dstftw@gmail.com>
Thu, 19 Mar 2015 15:23:52 +0000
(21:23 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 19 Mar 2015 15:23:52 +0000
(21:23 +0600)
youtube_dl/extractor/nytimes.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/nytimes.py
b/youtube_dl/extractor/nytimes.py
index 5b57e95b6c33acea61edef4a794e9657266b5bb5..d1cf8f4f357ca94ddcfbce36064c99c12e28896c 100644
(file)
--- a/
youtube_dl/extractor/nytimes.py
+++ b/
youtube_dl/extractor/nytimes.py
@@
-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 = mobj.group('id')
+ video_id = self._match_id(url)
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']
- duration =
video_data['duration'] / 1000.0
+ description = video_data
.get('summary')
+ duration =
float_or_none(video_data.get('duration'), 1000)
uploader = video_data['byline']
timestamp = parse_iso8601(video_data['publication_date'][:-8])
uploader = video_data['byline']
timestamp = parse_iso8601(video_data['publication_date'][:-8])
@@
-49,11
+51,11
@@
class NYTimesIE(InfoExtractor):
formats = [
{
'url': video['url'],
formats = [
{
'url': video['url'],
- 'format_id': video
['type']
,
- 'vcodec': video
['video_codec']
,
- 'width':
video['width']
,
- 'height':
video['height']
,
- 'filesize': get_file_size(video
['fileSize']
),
+ 'format_id': video
.get('type')
,
+ 'vcodec': video
.get('video_codec')
,
+ 'width':
int_or_none(video.get('width'))
,
+ 'height':
int_or_none(video.get('height'))
,
+ 'filesize': get_file_size(video
.get('fileSize')
),
} for video in video_data['renditions']
]
self._sort_formats(formats)
} for video in video_data['renditions']
]
self._sort_formats(formats)
@@
-61,7
+63,8
@@
class NYTimesIE(InfoExtractor):
thumbnails = [
{
'url': 'http://www.nytimes.com/%s' % image['url'],
thumbnails = [
{
'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']
]