-# coding: utf-8
-from __future__ import unicode_literals
-
import base64
import binascii
import json
import os
import random
+import time
from .common import InfoExtractor
-from ..aes import aes_cbc_decrypt
-from ..compat import (
- compat_HTTPError,
- compat_b64decode,
- compat_ord,
-)
+from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
+from ..compat import compat_b64decode
+from ..networking.exceptions import HTTPError
from ..utils import (
+ ass_subtitles_timecode,
bytes_to_intlist,
bytes_to_long,
ExtractorError,
int_or_none,
intlist_to_bytes,
long_to_bytes,
+ parse_iso8601,
pkcs1pad,
strip_or_none,
+ str_or_none,
try_get,
unified_strdate,
urlencode_postdata,
)
+from ..utils.traversal import traverse_obj
-class ADNIE(InfoExtractor):
- IE_DESC = 'Anime Digital Network'
- _VALID_URL = r'https?://(?:www\.)?animedigitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
- _TEST = {
- 'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
- 'md5': '0319c99885ff5547565cacb4f3f9348d',
- 'info_dict': {
- 'id': '7778',
- 'ext': 'mp4',
- 'title': 'Blue Exorcist - Kyôto Saga - Episode 1',
- 'description': 'md5:2f7b5aa76edbc1a7a92cedcda8a528d5',
- 'series': 'Blue Exorcist - Kyôto Saga',
- 'duration': 1467,
- 'release_date': '20170106',
- 'comment_count': int,
- 'average_rating': float,
- 'season_number': 2,
- 'episode': 'Début des hostilités',
- 'episode_number': 1,
- }
- }
-
- _NETRC_MACHINE = 'animedigitalnetwork'
- _BASE_URL = 'http://animedigitalnetwork.fr'
- _API_BASE_URL = 'https://gw.api.animedigitalnetwork.fr/'
- _PLAYER_BASE_URL = _API_BASE_URL + 'player/'
+class ADNBaseIE(InfoExtractor):
+ IE_DESC = 'Animation Digital Network'
+ _NETRC_MACHINE = 'animationdigitalnetwork'
+ _BASE = 'animationdigitalnetwork.fr'
+ _API_BASE_URL = f'https://gw.api.{_BASE}/'
+ _PLAYER_BASE_URL = f'{_API_BASE_URL}player/'
_HEADERS = {}
_LOGIN_ERR_MESSAGE = 'Unable to log in'
_RSA_KEY = (0x9B42B08905199A5CCE2026274399CA560ECB209EE9878A708B1C0812E1BB8CB5D1FB7441861147C1A1F2F3A0476DD63A9CAC20D3E983613346850AA6CB38F16DC7D720FD7D86FC6E5B3D5BBC72E14CD0BF9E869F2CEA2CCAD648F1DCE38F1FF916CEFB2D339B64AA0264372344BC775E265E8A852F88144AB0BD9AA06C1A4ABB, 65537)
'end': 4,
}
- @staticmethod
- def _ass_subtitles_timecode(seconds):
- return '%01d:%02d:%02d.%02d' % (seconds / 3600, (seconds % 3600) / 60, seconds % 60, (seconds % 1) * 100)
+
+class ADNIE(ADNBaseIE):
+ _VALID_URL = r'https?://(?:www\.)?(?:animation|anime)digitalnetwork\.(?P<lang>fr|de)/video/[^/?#]+/(?P<id>\d+)'
+ _TESTS = [{
+ 'url': 'https://animationdigitalnetwork.fr/video/fruits-basket/9841-episode-1-a-ce-soir',
+ 'md5': '1c9ef066ceb302c86f80c2b371615261',
+ 'info_dict': {
+ 'id': '9841',
+ 'ext': 'mp4',
+ 'title': 'Fruits Basket - Episode 1',
+ 'description': 'md5:14be2f72c3c96809b0ca424b0097d336',
+ 'series': 'Fruits Basket',
+ 'duration': 1437,
+ 'release_date': '20190405',
+ 'comment_count': int,
+ 'average_rating': float,
+ 'season_number': 1,
+ 'episode': 'À ce soir !',
+ 'episode_number': 1,
+ 'thumbnail': str,
+ 'season': 'Season 1',
+ },
+ 'skip': 'Only available in French and German speaking Europe',
+ }, {
+ 'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
+ 'only_matching': True,
+ }, {
+ 'url': 'https://animationdigitalnetwork.de/video/the-eminence-in-shadow/23550-folge-1',
+ 'md5': '5c5651bf5791fa6fcd7906012b9d94e8',
+ 'info_dict': {
+ 'id': '23550',
+ 'ext': 'mp4',
+ 'episode_number': 1,
+ 'duration': 1417,
+ 'release_date': '20231004',
+ 'series': 'The Eminence in Shadow',
+ 'season_number': 2,
+ 'episode': str,
+ 'title': str,
+ 'thumbnail': str,
+ 'season': 'Season 2',
+ 'comment_count': int,
+ 'average_rating': float,
+ 'description': str,
+ },
+ # 'skip': 'Only available in French and German speaking Europe',
+ }]
def _get_subtitles(self, sub_url, video_id):
if not sub_url:
if subtitle_location:
enc_subtitles = self._download_webpage(
subtitle_location, video_id, 'Downloading subtitles data',
- fatal=False, headers={'Origin': 'https://animedigitalnetwork.fr'})
+ fatal=False, headers={'Origin': 'https://' + self._BASE})
if not enc_subtitles:
return None
- # http://animedigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
- dec_subtitles = intlist_to_bytes(aes_cbc_decrypt(
- bytes_to_intlist(compat_b64decode(enc_subtitles[24:])),
- bytes_to_intlist(binascii.unhexlify(self._K + 'ab9f52f5baae7c72')),
- bytes_to_intlist(compat_b64decode(enc_subtitles[:24]))
- ))
- subtitles_json = self._parse_json(
- dec_subtitles[:-compat_ord(dec_subtitles[-1])].decode(),
- None, fatal=False)
+ # http://animationdigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
+ dec_subtitles = unpad_pkcs7(aes_cbc_decrypt_bytes(
+ compat_b64decode(enc_subtitles[24:]),
+ binascii.unhexlify(self._K + '7fac1178830cfe0c'),
+ compat_b64decode(enc_subtitles[:24])))
+ subtitles_json = self._parse_json(dec_subtitles.decode(), None, fatal=False)
if not subtitles_json:
return None
continue
alignment = self._POS_ALIGN_MAP.get(position_align, 2) + self._LINE_ALIGN_MAP.get(line_align, 0)
ssa += os.linesep + 'Dialogue: Marked=0,%s,%s,Default,,0,0,0,,%s%s' % (
- self._ass_subtitles_timecode(start),
- self._ass_subtitles_timecode(end),
+ ass_subtitles_timecode(start),
+ ass_subtitles_timecode(end),
'{\\a%d}' % alignment if alignment != 2 else '',
text.replace('\n', '\\N').replace('<i>', '{\\i1}').replace('</i>', '{\\i0}'))
if sub_lang == 'vostf':
sub_lang = 'fr'
+ elif sub_lang == 'vostde':
+ sub_lang = 'de'
subtitles.setdefault(sub_lang, []).extend([{
'ext': 'json',
'data': json.dumps(sub),
}])
return subtitles
- def _real_initialize(self):
- username, password = self._get_login_info()
- if not username:
- return
+ def _perform_login(self, username, password):
try:
access_token = (self._download_json(
self._API_BASE_URL + 'authentication/login', None,
self._HEADERS = {'authorization': 'Bearer ' + access_token}
except ExtractorError as e:
message = None
- if isinstance(e.cause, compat_HTTPError) and e.cause.code == 401:
+ if isinstance(e.cause, HTTPError) and e.cause.status == 401:
resp = self._parse_json(
- e.cause.read().decode(), None, fatal=False) or {}
+ e.cause.response.read().decode(), None, fatal=False) or {}
message = resp.get('message') or resp.get('code')
self.report_warning(message or self._LOGIN_ERR_MESSAGE)
def _real_extract(self, url):
- video_id = self._match_id(url)
+ lang, video_id = self._match_valid_url(url).group('lang', 'id')
video_base_url = self._PLAYER_BASE_URL + 'video/%s/' % video_id
player = self._download_json(
video_base_url + 'configuration', video_id,
user = options['user']
if not user.get('hasAccess'):
- self.raise_login_required()
+ start_date = traverse_obj(options, ('video', 'startDate', {str}))
+ if (parse_iso8601(start_date) or 0) > time.time():
+ raise ExtractorError(f'This video is not available yet. Release date: {start_date}', expected=True)
+ self.raise_login_required('This video requires a subscription', method='password')
token = self._download_json(
user.get('refreshTokenUrl') or (self._PLAYER_BASE_URL + 'refresh/token'),
video_id, 'Downloading access token', headers={
- 'x-player-refresh-token': user['refreshToken']
+ 'X-Player-Refresh-Token': user['refreshToken'],
}, data=b'')['token']
links_url = try_get(options, lambda x: x['video']['url']) or (video_base_url + 'link')
- self._K = ''.join([random.choice('0123456789abcdef') for _ in range(16)])
+ self._K = ''.join(random.choices('0123456789abcdef', k=16))
message = bytes_to_intlist(json.dumps({
'k': self._K,
't': token,
try:
links_data = self._download_json(
links_url, video_id, 'Downloading links JSON metadata', headers={
- 'X-Player-Token': authorization
+ 'X-Player-Token': authorization,
+ 'X-Target-Distribution': lang,
+ **self._HEADERS
}, query={
'freeWithAds': 'true',
'adaptive': 'false',
})
break
except ExtractorError as e:
- if not isinstance(e.cause, compat_HTTPError):
+ if not isinstance(e.cause, HTTPError):
raise e
- if e.cause.code == 401:
+ if e.cause.status == 401:
# This usually goes away with a different random pkcs1pad, so retry
continue
- error = self._parse_json(e.cause.read(), video_id)
+ error = self._parse_json(e.cause.response.read(), video_id)
message = error.get('message')
if e.cause.code == 403 and error.get('code') == 'player-bad-geolocation-country':
self.raise_geo_restricted(msg=message)
if format_id == 'vf':
for f in m3u8_formats:
f['language'] = 'fr'
+ elif format_id == 'vde':
+ for f in m3u8_formats:
+ f['language'] = 'de'
formats.extend(m3u8_formats)
- self._sort_formats(formats)
+
+ if not formats:
+ self.raise_login_required('This video requires a subscription', method='password')
video = (self._download_json(
self._API_BASE_URL + 'video/%s' % video_id, video_id,
'average_rating': float_or_none(video.get('rating') or metas.get('rating')),
'comment_count': int_or_none(video.get('commentsCount')),
}
+
+
+class ADNSeasonIE(ADNBaseIE):
+ _VALID_URL = r'https?://(?:www\.)?(?:animation|anime)digitalnetwork\.(?P<lang>fr|de)/video/(?P<id>[^/?#]+)/?(?:$|[#?])'
+ _TESTS = [{
+ 'url': 'https://animationdigitalnetwork.fr/video/tokyo-mew-mew-new',
+ 'playlist_count': 12,
+ 'info_dict': {
+ 'id': '911',
+ 'title': 'Tokyo Mew Mew New',
+ },
+ # 'skip': 'Only available in French end German speaking Europe',
+ }]
+
+ def _real_extract(self, url):
+ lang, video_show_slug = self._match_valid_url(url).group('lang', 'id')
+ show = self._download_json(
+ f'{self._API_BASE_URL}show/{video_show_slug}/', video_show_slug,
+ 'Downloading show JSON metadata', headers=self._HEADERS)['show']
+ show_id = str(show['id'])
+ episodes = self._download_json(
+ f'{self._API_BASE_URL}video/show/{show_id}', video_show_slug,
+ 'Downloading episode list', headers={
+ 'X-Target-Distribution': lang,
+ **self._HEADERS
+ }, query={
+ 'order': 'asc',
+ 'limit': '-1',
+ })
+
+ def entries():
+ for episode_id in traverse_obj(episodes, ('videos', ..., 'id', {str_or_none})):
+ yield self.url_result(
+ f'https://animationdigitalnetwork.{lang}/video/{video_show_slug}/{episode_id}',
+ ADNIE, episode_id)
+
+ return self.playlist_result(entries(), show_id, show.get('title'))
projects / yt-dlp.git / blobdiff