youtube_dl/extractor/adn.py

@@ -10,7 +10,6 @@ import random
 from .common import InfoExtractor
 from ..aes import aes_cbc_decrypt
 from ..compat import (
-    compat_HTTPError,
     compat_b64decode,
     compat_ord,
 )
@@ -19,13 +18,11 @@ from ..utils import (
     bytes_to_long,
     ExtractorError,
     float_or_none,
-    int_or_none,
     intlist_to_bytes,
     long_to_bytes,
     pkcs1pad,
     strip_or_none,
-    try_get,
+    urljoin,
-    unified_strdate,
 )
 
 
@@ -34,27 +31,16 @@ class ADNIE(InfoExtractor):
     _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',
+        'md5': 'e497370d847fd79d9d4c74be55575c7a',
         'info_dict': {
             'id': '7778',
             'ext': 'mp4',
-            'title': 'Blue Exorcist - Kyôto Saga - Episode 1',
+            'title': 'Blue Exorcist - Kyôto Saga - Épisode 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,
         }
     }
-
     _BASE_URL = 'http://animedigitalnetwork.fr'
-    _API_BASE_URL = 'https://gw.api.animedigitalnetwork.fr/'
+    _RSA_KEY = (0xc35ae1e4356b65a73b551493da94b8cb443491c0aa092a357a5aee57ffc14dda85326f42d716e539a34542a0d3f363adf16c5ec222d713d5997194030ee2e4f0d1fb328c01a81cf6868c090d50de8e169c6b13d1675b9eeed1cbc51e1fffca9b38af07f37abd790924cd3bee59d0257cfda4fe5f3f0534877e21ce5821447d1b, 65537)
-    _PLAYER_BASE_URL = _API_BASE_URL + 'player/'
-    _RSA_KEY = (0x9B42B08905199A5CCE2026274399CA560ECB209EE9878A708B1C0812E1BB8CB5D1FB7441861147C1A1F2F3A0476DD63A9CAC20D3E983613346850AA6CB38F16DC7D720FD7D86FC6E5B3D5BBC72E14CD0BF9E869F2CEA2CCAD648F1DCE38F1FF916CEFB2D339B64AA0264372344BC775E265E8A852F88144AB0BD9AA06C1A4ABB, 65537)
     _POS_ALIGN_MAP = {
         'start': 1,
         'end': 3,
@@ -68,24 +54,26 @@ class ADNIE(InfoExtractor):
     def _ass_subtitles_timecode(seconds):
         return '%01d:%02d:%02d.%02d' % (seconds / 3600, (seconds % 3600) / 60, seconds % 60, (seconds % 1) * 100)
 
-    def _get_subtitles(self, sub_url, video_id):
+    def _get_subtitles(self, sub_path, video_id):
-        if not sub_url:
+        if not sub_path:
             return None
 
         enc_subtitles = self._download_webpage(
-            sub_url, video_id, 'Downloading subtitles location', fatal=False) or '{}'
+            urljoin(self._BASE_URL, sub_path),
+            video_id, 'Downloading subtitles location', fatal=False) or '{}'
         subtitle_location = (self._parse_json(enc_subtitles, video_id, fatal=False) or {}).get('location')
         if subtitle_location:
             enc_subtitles = self._download_webpage(
-                subtitle_location, video_id, 'Downloading subtitles data',
+                urljoin(self._BASE_URL, subtitle_location),
-                fatal=False, headers={'Origin': 'https://animedigitalnetwork.fr'})
+                video_id, 'Downloading subtitles data', fatal=False,
+                headers={'Origin': 'https://animedigitalnetwork.fr'})
         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(binascii.unhexlify(self._K + '4b8ef13ec1872730')),
             bytes_to_intlist(compat_b64decode(enc_subtitles[:24]))
         ))
         subtitles_json = self._parse_json(
@@ -131,76 +119,59 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_base_url = self._PLAYER_BASE_URL + 'video/%s/' % video_id
+        webpage = self._download_webpage(url, video_id)
-        player = self._download_json(
+        player_config = self._parse_json(self._search_regex(
-            video_base_url + 'configuration', video_id,
+            r'playerConfig\s*=\s*({.+});', webpage,
-            'Downloading player config JSON metadata')['player']
+            'player config', default='{}'), video_id, fatal=False)
-        options = player['options']
+        if not player_config:
+            config_url = urljoin(self._BASE_URL, self._search_regex(
+                r'(?:id="player"|class="[^"]*adn-player-container[^"]*")[^>]+data-url="([^"]+)"',
+                webpage, 'config url'))
+            player_config = self._download_json(
+                config_url, video_id,
+                'Downloading player config JSON metadata')['player']
 
-        user = options['user']
+        video_info = {}
-        if not user.get('hasAccess'):
+        video_info_str = self._search_regex(
-            raise ExtractorError(
+            r'videoInfo\s*=\s*({.+});', webpage,
-                'This video is only available for paying users', expected=True)
+            'video info', fatal=False)
-            # self.raise_login_required() # FIXME: Login is not implemented
+        if video_info_str:
+            video_info = self._parse_json(
+                video_info_str, video_id, fatal=False) or {}
 
-        token = self._download_json(
+        options = player_config.get('options') or {}
-            user.get('refreshTokenUrl') or (self._PLAYER_BASE_URL + 'refresh/token'),
+        metas = options.get('metas') or {}
-            video_id, 'Downloading access token', headers={
+        links = player_config.get('links') or {}
-                'x-player-refresh-token': user['refreshToken']
+        sub_path = player_config.get('subtitles')
-            }, data=b'')['token']
+        error = None
-
+        if not links:
-        links_url = try_get(options, lambda x: x['video']['url']) or (video_base_url + 'link')
+            links_url = player_config.get('linksurl') or options['videoUrl']
-        self._K = ''.join([random.choice('0123456789abcdef') for _ in range(16)])
+            token = options['token']
-        message = bytes_to_intlist(json.dumps({
+            self._K = ''.join([random.choice('0123456789abcdef') for _ in range(16)])
-            'k': self._K,
+            message = bytes_to_intlist(json.dumps({
-            't': token,
+                'k': self._K,
-        }))
+                'e': 60,
-
+                't': token,
-        # Sometimes authentication fails for no good reason, retry with
+            }))
-        # a different random padding
-        links_data = None
-        for _ in range(3):
             padded_message = intlist_to_bytes(pkcs1pad(message, 128))
             n, e = self._RSA_KEY
             encrypted_message = long_to_bytes(pow(bytes_to_long(padded_message), e, n))
             authorization = base64.b64encode(encrypted_message).decode()
-
+            links_data = self._download_json(
-            try:
+                urljoin(self._BASE_URL, links_url), video_id,
-                links_data = self._download_json(
+                'Downloading links JSON metadata', headers={
-                    links_url, video_id, 'Downloading links JSON metadata', headers={
+                    'Authorization': 'Bearer ' + authorization,
-                        'X-Player-Token': authorization
+                })
-                    }, query={
+            links = links_data.get('links') or {}
-                        'freeWithAds': 'true',
+            metas = metas or links_data.get('meta') or {}
-                        'adaptive': 'false',
+            sub_path = sub_path or links_data.get('subtitles') or \
-                        'withMetadata': 'true',
+                'index.php?option=com_vodapi&task=subtitles.getJSON&format=json&id=' + video_id
-                        'source': 'Web'
+            sub_path += '&token=' + token
-                    })
+            error = links_data.get('error')
-                break
+        title = metas.get('title') or video_info['title']
-            except ExtractorError as e:
-                if not isinstance(e.cause, compat_HTTPError):
-                    raise e
-
-                if e.cause.code == 401:
-                    # This usually goes away with a different random pkcs1pad, so retry
-                    continue
-
-                error = self._parse_json(e.cause.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)
-                else:
-                    raise ExtractorError(message)
-        else:
-            raise ExtractorError('Giving up retrying')
-
-        links = links_data.get('links') or {}
-        metas = links_data.get('metadata') or {}
-        sub_url = (links.get('subtitles') or {}).get('all')
-        video_info = links_data.get('video') or {}
-        title = metas['title']
 
         formats = []
-        for format_id, qualities in (links.get('streaming') or {}).items():
+        for format_id, qualities in links.items():
             if not isinstance(qualities, dict):
                 continue
             for quality, load_balancer_url in qualities.items():
@@ -218,26 +189,19 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
                     for f in m3u8_formats:
                         f['language'] = 'fr'
                 formats.extend(m3u8_formats)
+        if not error:
+            error = options.get('error')
+        if not formats and error:
+            raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
         self._sort_formats(formats)
 
-        video = (self._download_json(
-            self._API_BASE_URL + 'video/%s' % video_id, video_id,
-            'Downloading additional video metadata', fatal=False) or {}).get('video') or {}
-        show = video.get('show') or {}
-
         return {
             'id': video_id,
             'title': title,
-            'description': strip_or_none(metas.get('summary') or video.get('summary')),
+            'description': strip_or_none(metas.get('summary') or video_info.get('resume')),
-            'thumbnail': video_info.get('image') or player.get('image'),
+            'thumbnail': video_info.get('image'),
             'formats': formats,
-            'subtitles': self.extract_subtitles(sub_url, video_id),
+            'subtitles': self.extract_subtitles(sub_path, video_id),
-            'episode': metas.get('subtitle') or video.get('name'),
+            'episode': metas.get('subtitle') or video_info.get('videoTitle'),
-            'episode_number': int_or_none(video.get('shortNumber')),
+            'series': video_info.get('playlistTitle'),
-            'series': show.get('title'),
-            'season_number': int_or_none(video.get('season')),
-            'duration': int_or_none(video_info.get('duration') or video.get('duration')),
-            'release_date': unified_strdate(video.get('releaseDate')),
-            'average_rating': float_or_none(video.get('rating') or metas.get('rating')),
-            'comment_count': int_or_none(video.get('commentsCount')),
         }