mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-08-21 23:02:11 +02:00
[adultswim] fix extraction(closes #18025)
This commit is contained in:
parent
69e6efac16
commit
afb7496416
@ -1,13 +1,19 @@
|
|||||||
# coding: utf-8
|
# coding: utf-8
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import json
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .turner import TurnerBaseIE
|
from .turner import TurnerBaseIE
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
determine_ext,
|
||||||
|
float_or_none,
|
||||||
int_or_none,
|
int_or_none,
|
||||||
|
mimetype2ext,
|
||||||
|
parse_age_limit,
|
||||||
|
parse_iso8601,
|
||||||
strip_or_none,
|
strip_or_none,
|
||||||
url_or_none,
|
try_get,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -21,8 +27,8 @@ class AdultSwimIE(TurnerBaseIE):
|
|||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Rick and Morty - Pilot',
|
'title': 'Rick and Morty - Pilot',
|
||||||
'description': 'Rick moves in with his daughter\'s family and establishes himself as a bad influence on his grandson, Morty.',
|
'description': 'Rick moves in with his daughter\'s family and establishes himself as a bad influence on his grandson, Morty.',
|
||||||
'timestamp': 1493267400,
|
'timestamp': 1543294800,
|
||||||
'upload_date': '20170427',
|
'upload_date': '20181127',
|
||||||
},
|
},
|
||||||
'params': {
|
'params': {
|
||||||
# m3u8 download
|
# m3u8 download
|
||||||
@ -43,6 +49,7 @@ class AdultSwimIE(TurnerBaseIE):
|
|||||||
# m3u8 download
|
# m3u8 download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
|
'skip': '404 Not Found',
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://www.adultswim.com/videos/decker/inside-decker-a-new-hero/',
|
'url': 'http://www.adultswim.com/videos/decker/inside-decker-a-new-hero/',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -61,9 +68,9 @@ class AdultSwimIE(TurnerBaseIE):
|
|||||||
}, {
|
}, {
|
||||||
'url': 'http://www.adultswim.com/videos/attack-on-titan',
|
'url': 'http://www.adultswim.com/videos/attack-on-titan',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'b7A69dzfRzuaXIECdxW8XQ',
|
'id': 'attack-on-titan',
|
||||||
'title': 'Attack on Titan',
|
'title': 'Attack on Titan',
|
||||||
'description': 'md5:6c8e003ea0777b47013e894767f5e114',
|
'description': 'md5:41caa9416906d90711e31dc00cb7db7e',
|
||||||
},
|
},
|
||||||
'playlist_mincount': 12,
|
'playlist_mincount': 12,
|
||||||
}, {
|
}, {
|
||||||
@ -78,83 +85,118 @@ class AdultSwimIE(TurnerBaseIE):
|
|||||||
# m3u8 download
|
# m3u8 download
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
|
'skip': '404 Not Found',
|
||||||
}]
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
show_path, episode_path = re.match(self._VALID_URL, url).groups()
|
show_path, episode_path = re.match(self._VALID_URL, url).groups()
|
||||||
display_id = episode_path or show_path
|
display_id = episode_path or show_path
|
||||||
webpage = self._download_webpage(url, display_id)
|
query = '''query {
|
||||||
initial_data = self._parse_json(self._search_regex(
|
getShowBySlug(slug:"%s") {
|
||||||
r'AS_INITIAL_DATA(?:__)?\s*=\s*({.+?});',
|
%%s
|
||||||
webpage, 'initial data'), display_id)
|
}
|
||||||
|
}''' % show_path
|
||||||
is_stream = show_path == 'streams'
|
if episode_path:
|
||||||
if is_stream:
|
query = query % '''title
|
||||||
if not episode_path:
|
getVideoBySlug(slug:"%s") {
|
||||||
episode_path = 'live-stream'
|
_id
|
||||||
|
auth
|
||||||
video_data = next(stream for stream_path, stream in initial_data['streams'].items() if stream_path == episode_path)
|
description
|
||||||
video_id = video_data.get('stream')
|
duration
|
||||||
|
episodeNumber
|
||||||
if not video_id:
|
launchDate
|
||||||
entries = []
|
mediaID
|
||||||
for episode in video_data.get('archiveEpisodes', []):
|
seasonNumber
|
||||||
episode_url = url_or_none(episode.get('url'))
|
poster
|
||||||
if not episode_url:
|
title
|
||||||
continue
|
tvRating
|
||||||
entries.append(self.url_result(
|
}''' % episode_path
|
||||||
episode_url, 'AdultSwim', episode.get('id')))
|
['getVideoBySlug']
|
||||||
return self.playlist_result(
|
|
||||||
entries, video_data.get('id'), video_data.get('title'),
|
|
||||||
strip_or_none(video_data.get('description')))
|
|
||||||
else:
|
else:
|
||||||
show_data = initial_data['show']
|
query = query % '''metaDescription
|
||||||
|
title
|
||||||
|
videos(first:1000,sort:["episode_number"]) {
|
||||||
|
edges {
|
||||||
|
node {
|
||||||
|
_id
|
||||||
|
slug
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}'''
|
||||||
|
show_data = self._download_json(
|
||||||
|
'https://www.adultswim.com/api/search', display_id,
|
||||||
|
data=json.dumps({'query': query}).encode(),
|
||||||
|
headers={'Content-Type': 'application/json'})['data']['getShowBySlug']
|
||||||
|
if episode_path:
|
||||||
|
video_data = show_data['getVideoBySlug']
|
||||||
|
video_id = video_data['_id']
|
||||||
|
episode_title = title = video_data['title']
|
||||||
|
series = show_data.get('title')
|
||||||
|
if series:
|
||||||
|
title = '%s - %s' % (series, title)
|
||||||
|
info = {
|
||||||
|
'id': video_id,
|
||||||
|
'title': title,
|
||||||
|
'description': strip_or_none(video_data.get('description')),
|
||||||
|
'duration': float_or_none(video_data.get('duration')),
|
||||||
|
'formats': [],
|
||||||
|
'subtitles': {},
|
||||||
|
'age_limit': parse_age_limit(video_data.get('tvRating')),
|
||||||
|
'thumbnail': video_data.get('poster'),
|
||||||
|
'timestamp': parse_iso8601(video_data.get('launchDate')),
|
||||||
|
'series': series,
|
||||||
|
'season_number': int_or_none(video_data.get('seasonNumber')),
|
||||||
|
'episode': episode_title,
|
||||||
|
'episode_number': int_or_none(video_data.get('episodeNumber')),
|
||||||
|
}
|
||||||
|
|
||||||
if not episode_path:
|
auth = video_data.get('auth')
|
||||||
entries = []
|
media_id = video_data.get('mediaID')
|
||||||
for video in show_data.get('videos', []):
|
if media_id:
|
||||||
slug = video.get('slug')
|
info.update(self._extract_ngtv_info(media_id, {
|
||||||
if not slug:
|
# CDN_TOKEN_APP_ID from:
|
||||||
|
# https://d2gg02c3xr550i.cloudfront.net/assets/asvp.e9c8bef24322d060ef87.bundle.js
|
||||||
|
'appId': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcHBJZCI6ImFzLXR2ZS1kZXNrdG9wLXB0enQ2bSIsInByb2R1Y3QiOiJ0dmUiLCJuZXR3b3JrIjoiYXMiLCJwbGF0Zm9ybSI6ImRlc2t0b3AiLCJpYXQiOjE1MzI3MDIyNzl9.BzSCk-WYOZ2GMCIaeVb8zWnzhlgnXuJTCu0jGp_VaZE',
|
||||||
|
}, {
|
||||||
|
'url': url,
|
||||||
|
'site_name': 'AdultSwim',
|
||||||
|
'auth_required': auth,
|
||||||
|
}))
|
||||||
|
|
||||||
|
if not auth:
|
||||||
|
extract_data = self._download_json(
|
||||||
|
'https://www.adultswim.com/api/shows/v1/videos/' + video_id,
|
||||||
|
video_id, query={'fields': 'stream'}, fatal=False) or {}
|
||||||
|
assets = try_get(extract_data, lambda x: x['data']['video']['stream']['assets'], list) or []
|
||||||
|
for asset in assets:
|
||||||
|
asset_url = asset.get('url')
|
||||||
|
if not asset_url:
|
||||||
continue
|
continue
|
||||||
entries.append(self.url_result(
|
ext = determine_ext(asset_url, mimetype2ext(asset.get('mime_type')))
|
||||||
'http://adultswim.com/videos/%s/%s' % (show_path, slug),
|
if ext == 'm3u8':
|
||||||
'AdultSwim', video.get('id')))
|
info['formats'].extend(self._extract_m3u8_formats(
|
||||||
return self.playlist_result(
|
asset_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
|
||||||
entries, show_data.get('id'), show_data.get('title'),
|
elif ext == 'f4m':
|
||||||
strip_or_none(show_data.get('metadata', {}).get('description')))
|
continue
|
||||||
|
# info['formats'].extend(self._extract_f4m_formats(
|
||||||
|
# asset_url, video_id, f4m_id='hds', fatal=False))
|
||||||
|
elif ext in ('scc', 'ttml', 'vtt'):
|
||||||
|
info['subtitles'].setdefault('en', []).append({
|
||||||
|
'url': asset_url,
|
||||||
|
})
|
||||||
|
self._sort_formats(info['formats'])
|
||||||
|
|
||||||
video_data = show_data['sluggedVideo']
|
return info
|
||||||
video_id = video_data['id']
|
else:
|
||||||
|
entries = []
|
||||||
info = self._extract_cvp_info(
|
for edge in show_data.get('videos', {}).get('edges', []):
|
||||||
'http://www.adultswim.com/videos/api/v0/assets?platform=desktop&id=' + video_id,
|
video = edge.get('node') or {}
|
||||||
video_id, {
|
slug = video.get('slug')
|
||||||
'secure': {
|
if not slug:
|
||||||
'media_src': 'http://androidhls-secure.cdn.turner.com/adultswim/big',
|
continue
|
||||||
'tokenizer_src': 'http://www.adultswim.com/astv/mvpd/processors/services/token_ipadAdobe.do',
|
entries.append(self.url_result(
|
||||||
},
|
'http://adultswim.com/videos/%s/%s' % (show_path, slug),
|
||||||
}, {
|
'AdultSwim', video.get('_id')))
|
||||||
'url': url,
|
return self.playlist_result(
|
||||||
'site_name': 'AdultSwim',
|
entries, show_path, show_data.get('title'),
|
||||||
'auth_required': video_data.get('auth'),
|
strip_or_none(show_data.get('metaDescription')))
|
||||||
})
|
|
||||||
|
|
||||||
info.update({
|
|
||||||
'id': video_id,
|
|
||||||
'display_id': display_id,
|
|
||||||
'description': info.get('description') or strip_or_none(video_data.get('description')),
|
|
||||||
})
|
|
||||||
if not is_stream:
|
|
||||||
info.update({
|
|
||||||
'duration': info.get('duration') or int_or_none(video_data.get('duration')),
|
|
||||||
'timestamp': info.get('timestamp') or int_or_none(video_data.get('launch_date')),
|
|
||||||
'season_number': info.get('season_number') or int_or_none(video_data.get('season_number')),
|
|
||||||
'episode': info['title'],
|
|
||||||
'episode_number': info.get('episode_number') or int_or_none(video_data.get('episode_number')),
|
|
||||||
})
|
|
||||||
|
|
||||||
info['series'] = video_data.get('collection_title') or info.get('series')
|
|
||||||
if info['series'] and info['series'] != info['title']:
|
|
||||||
info['title'] = '%s - %s' % (info['series'], info['title'])
|
|
||||||
|
|
||||||
return info
|
|
||||||
|
Loading…
Reference in New Issue
Block a user