mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-22 18:22:21 +00:00
[ninegag] improve extraction
This commit is contained in:
Remita Amine
parent
1dd12708c2
commit
54856480d7
1 changed files with 83 additions and 106 deletions
|
|
@ -1,148 +1,125 @@
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
determine_ext,
|
determine_ext,
|
||||||
url_or_none,
|
ExtractorError,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
float_or_none,
|
try_get,
|
||||||
ExtractorError
|
url_or_none,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class NineGagIE(InfoExtractor):
|
class NineGagIE(InfoExtractor):
|
||||||
IE_NAME = '9gag'
|
IE_NAME = '9gag'
|
||||||
_VALID_URL = r'https?://(?:www\.)?9gag\.com/gag/(?P<id>[a-zA-Z0-9]+)'
|
_VALID_URL = r'https?://(?:www\.)?9gag\.com/gag/(?P<id>[^/?&#]+)'
|
||||||
|
|
||||||
_TESTS = [{
|
_TEST = {
|
||||||
'url': 'https://9gag.com/gag/an5Qz5b',
|
|
||||||
'info_dict': {
|
|
||||||
'id': 'an5Qz5b',
|
|
||||||
'ext': 'webm',
|
|
||||||
'title': 'Dogs playing tetherball',
|
|
||||||
'upload_date': '20191108',
|
|
||||||
'timestamp': 1573243994,
|
|
||||||
'age_limit': 0,
|
|
||||||
'categories': [
|
|
||||||
'Wholesome'
|
|
||||||
],
|
|
||||||
'tags': [
|
|
||||||
'Dog'
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
'url': 'https://9gag.com/gag/ae5Ag7B',
|
'url': 'https://9gag.com/gag/ae5Ag7B',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'ae5Ag7B',
|
'id': 'ae5Ag7B',
|
||||||
'ext': 'webm',
|
'ext': 'mp4',
|
||||||
'title': 'Capybara Agility Training',
|
'title': 'Capybara Agility Training',
|
||||||
'upload_date': '20191108',
|
'upload_date': '20191108',
|
||||||
'timestamp': 1573237208,
|
'timestamp': 1573237208,
|
||||||
'age_limit': 0,
|
'categories': ['Awesome'],
|
||||||
'categories': [
|
'tags': ['Weimaraner', 'American Pit Bull Terrier'],
|
||||||
'Awesome'
|
'duration': 44,
|
||||||
],
|
'like_count': int,
|
||||||
'tags': [
|
'dislike_count': int,
|
||||||
'Weimaraner',
|
'comment_count': int,
|
||||||
'American Pit Bull Terrier'
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}]
|
|
||||||
|
|
||||||
_EXTERNAL_VIDEO_PROVIDERS = {
|
|
||||||
'Youtube': 'https://youtube.com/watch?v=%s'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
post_id = self._match_id(url)
|
||||||
webpage = self._download_webpage(url, video_id)
|
post = self._download_json(
|
||||||
rawJsonData = self._search_regex(
|
'https://9gag.com/v1/post', post_id, query={
|
||||||
r'window._config\s*=\s*JSON.parse\(["\']({.+?})["\']\);',
|
'id': post_id
|
||||||
webpage,
|
})['data']['post']
|
||||||
'data')
|
|
||||||
rawJsonData = rawJsonData.replace('\\"', '"').replace('\\\\/', '/')
|
|
||||||
data = self._parse_json(rawJsonData, video_id)['data']['post']
|
|
||||||
|
|
||||||
if data['type'] == 'Video':
|
if post.get('type') != 'Animated':
|
||||||
vid = data['video']['id']
|
|
||||||
ie_key = data['video']['source'].capitalize()
|
|
||||||
return {
|
|
||||||
'_type': 'url_transparent',
|
|
||||||
'url': self._EXTERNAL_VIDEO_PROVIDERS[ie_key] % vid,
|
|
||||||
'ie_key': ie_key,
|
|
||||||
'id': vid,
|
|
||||||
'duration': data['video'].get('duration'),
|
|
||||||
'start_time': data['video'].get('startTs')
|
|
||||||
}
|
|
||||||
|
|
||||||
if data['type'] == 'EmbedVideo':
|
|
||||||
vid = data['video']['id']
|
|
||||||
ie_key = data['video']['source'].capitalize()
|
|
||||||
return {
|
|
||||||
'_type': 'url_transparent',
|
|
||||||
'url': data['video']['embedUrl'],
|
|
||||||
#'ie_key': vid,
|
|
||||||
'start_time': data['video'].get('startTs')
|
|
||||||
}
|
|
||||||
|
|
||||||
if data['type'] != 'Animated':
|
|
||||||
raise ExtractorError(
|
raise ExtractorError(
|
||||||
'The given url does not contain a video',
|
'The given url does not contain a video',
|
||||||
expected=True)
|
expected=True)
|
||||||
|
|
||||||
|
title = post['title']
|
||||||
|
|
||||||
duration = None
|
duration = None
|
||||||
formats = []
|
formats = []
|
||||||
thumbnails = []
|
thumbnails = []
|
||||||
for key in data['images']:
|
for key, image in (post.get('images') or {}).items():
|
||||||
image = data['images'][key]
|
image_url = url_or_none(image.get('url'))
|
||||||
if 'duration' in image and duration is None:
|
if not image_url:
|
||||||
duration = int_or_none(image['duration'])
|
|
||||||
url = url_or_none(image.get('url'))
|
|
||||||
if url == None:
|
|
||||||
continue
|
continue
|
||||||
ext = determine_ext(url)
|
ext = determine_ext(image_url)
|
||||||
if ext == 'jpg' or ext == 'png':
|
image_id = key.strip('image')
|
||||||
thumbnail = {
|
common = {
|
||||||
'url': url,
|
'url': image_url,
|
||||||
'width': float_or_none(image.get('width')),
|
'width': int_or_none(image.get('width')),
|
||||||
'height': float_or_none(image.get('height'))
|
'height': int_or_none(image.get('height')),
|
||||||
}
|
}
|
||||||
thumbnails.append(thumbnail)
|
if ext in ('jpg', 'png'):
|
||||||
elif ext == 'webm' or ext == 'mp4':
|
webp_url = image.get('webpUrl')
|
||||||
formats.append({
|
if webp_url:
|
||||||
'format_id': re.sub(r'.*_([^\.]+).(.*)', r'\1_\2', url),
|
t = common.copy()
|
||||||
'ext': ext,
|
t.update({
|
||||||
'url': url,
|
'id': image_id + '-webp',
|
||||||
'width': float_or_none(image.get('width')),
|
'url': webp_url,
|
||||||
'height': float_or_none(image.get('height'))
|
|
||||||
})
|
})
|
||||||
section = None
|
thumbnails.append(t)
|
||||||
postSection = data.get('postSection')
|
common.update({
|
||||||
if postSection != None and 'name' in postSection:
|
'id': image_id,
|
||||||
section = re.sub(r'\\[^\\]{5}', '', postSection['name'])
|
'ext': ext,
|
||||||
age_limit = int_or_none(data.get('nsfw'))
|
})
|
||||||
if age_limit != None:
|
thumbnails.append(common)
|
||||||
age_limit = age_limit * 18
|
elif ext in ('webm', 'mp4'):
|
||||||
|
if not duration:
|
||||||
|
duration = int_or_none(image.get('duration'))
|
||||||
|
common['acodec'] = 'none' if image.get('hasAudio') == 0 else None
|
||||||
|
for vcodec in ('vp8', 'vp9', 'h265'):
|
||||||
|
c_url = image.get(vcodec + 'Url')
|
||||||
|
if not c_url:
|
||||||
|
continue
|
||||||
|
c_f = common.copy()
|
||||||
|
c_f.update({
|
||||||
|
'format_id': image_id + '-' + vcodec,
|
||||||
|
'url': c_url,
|
||||||
|
'vcodec': vcodec,
|
||||||
|
})
|
||||||
|
formats.append(c_f)
|
||||||
|
common.update({
|
||||||
|
'ext': ext,
|
||||||
|
'format_id': image_id,
|
||||||
|
})
|
||||||
|
formats.append(common)
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
section = try_get(post, lambda x: x['postSection']['name'])
|
||||||
|
|
||||||
tags = None
|
tags = None
|
||||||
if 'tags' in data:
|
post_tags = post.get('tags')
|
||||||
|
if post_tags:
|
||||||
tags = []
|
tags = []
|
||||||
for tag in data.get('tags') or []:
|
for tag in post_tags:
|
||||||
tags.append(tag.get('key'))
|
tag_key = tag.get('key')
|
||||||
|
if not tag_key:
|
||||||
|
continue
|
||||||
|
tags.append(tag_key)
|
||||||
|
|
||||||
|
get_count = lambda x: int_or_none(post.get(x + 'Count'))
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': post_id,
|
||||||
'title': data['title'],
|
'title': title,
|
||||||
'timestamp': int_or_none(data.get('creationTs')),
|
'timestamp': int_or_none(post.get('creationTs')),
|
||||||
'duration': duration,
|
'duration': duration,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'thumbnails': thumbnails,
|
'thumbnails': thumbnails,
|
||||||
'like_count': int_or_none(data.get('upVoteCount')),
|
'like_count': get_count('upVote'),
|
||||||
'dislike_count': int_or_none(data.get('downVoteCount')),
|
'dislike_count': get_count('downVote'),
|
||||||
'comment_count': int_or_none(data.get('commentsCount')),
|
'comment_count': get_count('comments'),
|
||||||
'age_limit': age_limit,
|
'age_limit': 18 if post.get('nsfw') == 1 else None,
|
||||||
'categories': [section],
|
'categories': [section] if section else None,
|
||||||
'tags': tags,
|
'tags': tags,
|
||||||
'is_live': False
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue