mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 02:07:07 -05:00 
			
		
		
		
	[nytimes] Modernize
This commit is contained in:
		@@ -1,9 +1,11 @@
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
import re
 | 
			
		||||
 | 
			
		||||
from .common import InfoExtractor
 | 
			
		||||
from ..utils import parse_iso8601
 | 
			
		||||
from ..utils import (
 | 
			
		||||
    float_or_none,
 | 
			
		||||
    int_or_none,
 | 
			
		||||
    parse_iso8601,
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class NYTimesIE(InfoExtractor):
 | 
			
		||||
@@ -25,15 +27,15 @@ class NYTimesIE(InfoExtractor):
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    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(
 | 
			
		||||
            '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']
 | 
			
		||||
        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])
 | 
			
		||||
@@ -49,11 +51,11 @@ class NYTimesIE(InfoExtractor):
 | 
			
		||||
        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)
 | 
			
		||||
@@ -61,7 +63,8 @@ class NYTimesIE(InfoExtractor):
 | 
			
		||||
        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']
 | 
			
		||||
        ]
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user