[gfycat] Simplify (Closes #5439, Closes #5394)

pull/8/head
Sergey M․ 10 years ago
parent ca75235d3d
commit f52e66505a

@ -1,115 +1,90 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import datetime
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import (
int_or_none,
float_or_none,
qualities,
)
class GfycatIE(InfoExtractor): class GfycatIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?gfycat\.com/(?P<id>[^/?#]+)' _VALID_URL = r'https?://(?:www\.)?gfycat\.com/(?P<id>[^/?#]+)'
_TESTS = [ _TEST = {
{ 'url': 'http://gfycat.com/DeadlyDecisiveGermanpinscher',
'url': 'http://gfycat.com/DeadlyDecisiveGermanpinscher', 'info_dict': {
'info_dict': { 'id': 'DeadlyDecisiveGermanpinscher',
'id': 'DeadlyDecisiveGermanpinscher', 'ext': 'mp4',
'title': 'Ghost in the Shell', 'title': 'Ghost in the Shell',
'ext': 'mp4', 'timestamp': 1410656006,
'upload_date': '20140913' 'upload_date': '20140914',
} 'uploader': 'anonymous',
},{ 'duration': 10.4,
'url': 'http://gfycat.com/pleasinghilariouskusimanse', 'view_count': int,
'info_dict': { 'like_count': int,
'id': 'pleasinghilariouskusimanse', 'dislike_count': int,
'title': 'PleasingHilariousKusimanse', 'categories': list,
'ext': 'webm', 'age_limit': 0,
'upload_date': '20150412' }
}, }
'params': {
'format': 'webm',
},
},{
'url': 'http://gfycat.com/requiredunkemptbuzzard',
'info_dict': {
'id': 'requiredunkemptbuzzard',
'title': 'Headshot!',
'ext': 'gif',
'upload_date': '20150129'
},
'params': {
'format': 'gif',
},
},
]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
json = self._download_json("http://gfycat.com/cajax/get/" + video_id, video_id, 'Downloading video info')['gfyItem']
gfy = self._download_json(
# Title 'http://gfycat.com/cajax/get/%s' % video_id,
# Use user title first, else fallback to url formated name video_id, 'Downloading video info')['gfyItem']
if json['title']:
video_title = json['title'] title = gfy.get('title') or gfy['gfyName']
else: description = gfy.get('description')
video_title = json['gfyName'] timestamp = int_or_none(gfy.get('createDate'))
uploader = gfy.get('userName')
# Formats view_count = int_or_none(gfy.get('views'))
# Pref: mp4, webm, gif like_count = int_or_none(gfy.get('likes'))
formats = [{ dislike_count = int_or_none(gfy.get('dislikes'))
'format_id': 'mp4', age_limit = 18 if gfy.get('nsfw') == '1' else 0
'ext': 'mp4',
'url': json['mp4Url'], width = int_or_none(gfy.get('width'))
'width': json['width'], height = int_or_none(gfy.get('height'))
'height': json['height'], fps = int_or_none(gfy.get('frameRate'))
'fps': json['frameRate'], num_frames = int_or_none(gfy.get('numFrames'))
'filesize': json['mp4Size'],
'preference': 2 duration = float_or_none(num_frames, fps) if num_frames and fps else None
}, {
'format_id': 'webm', categories = gfy.get('tags') or gfy.get('extraLemmas') or []
'ext': 'webm',
'url': json['webmUrl'], FORMATS = ('gif', 'webm', 'mp4')
'width': json['width'], quality = qualities(FORMATS)
'height': json['height'],
'fps': json['frameRate'], formats = []
'filesize': json['webmSize'], for format_id in FORMATS:
'preference': 1 video_url = gfy.get('%sUrl' % format_id)
}, { if not video_url:
'format_id': 'gif', continue
'ext': 'gif', filesize = gfy.get('%sSize' % format_id)
'url': json['gifUrl'], formats.append({
'width': json['width'], 'url': video_url,
'height': json['height'], 'format_id': format_id,
'fps': json['frameRate'], 'width': width,
'filesize': json['gifSize'], 'height': height,
'preference': 0 'fps': fps,
}] 'filesize': filesize,
'quality': quality(format_id),
})
self._sort_formats(formats) self._sort_formats(formats)
# Date
date = datetime.datetime.fromtimestamp(
int(json['createDate'])
).strftime('%Y%m%d')
# Length
duration = json['numFrames'] / json['frameRate']
# Age limit
# 1 = nsfw / 0 = sfw
if json['nsfw'] == 1:
age_limit = 18
else:
age_limit = 0
return { return {
'id': video_id, 'id': video_id,
'title': video_title, 'title': title,
'formats': formats, 'description': description,
'creator': json['userName'], 'timestamp': timestamp,
'description': json['description'], 'uploader': uploader,
'upload_date': date, 'duration': duration,
'categories': json['tags'], 'view_count': view_count,
'age_limit': age_limit, 'like_count': like_count,
'duration': duration, 'dislike_count': dislike_count,
'view_count': json['views'] 'categories': categories,
'age_limit': age_limit,
'formats': formats,
} }

Loading…
Cancel
Save