Upgrade yt_dlp and download script

plugins/youtube_download/yt_dlp/extractor/tver.py

@@ -1,86 +1,161 @@
-from .common import InfoExtractor
+from .streaks import StreaksBaseIE
 from ..utils import (
     ExtractorError,
+    int_or_none,
     join_nonempty,
+    make_archive_id,
     smuggle_url,
     str_or_none,
     strip_or_none,
-    traverse_obj,
+    update_url_query,
 )
+from ..utils.traversal import require, traverse_obj
 
 
-class TVerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?tver\.jp/(?:(?P<type>lp|corner|series|episodes?|feature|tokyo2020/video)/)+(?P<id>[a-zA-Z0-9]+)'
+class TVerIE(StreaksBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?tver\.jp/(?:(?P<type>lp|corner|series|episodes?|feature)/)+(?P<id>[a-zA-Z0-9]+)'
+    _GEO_COUNTRIES = ['JP']
+    _GEO_BYPASS = False
     _TESTS = [{
-        'skip': 'videos are only available for 7 days',
-        'url': 'https://tver.jp/episodes/ep83nf3w4p',
+        # via Streaks backend
+        'url': 'https://tver.jp/episodes/epc1hdugbk',
         'info_dict': {
-            'title': '家事ヤロウ!!! 売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！',
-            'description': 'md5:dc2c06b6acc23f1e7c730c513737719b',
-            'series': '家事ヤロウ!!!',
-            'episode': '売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！',
-            'alt_title': '売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！',
-            'channel': 'テレビ朝日',
-            'onair_label': '5月3日(火)放送分',
-            'ext_title': '家事ヤロウ!!! 売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！ テレビ朝日 5月3日(火)放送分',
+            'id': 'epc1hdugbk',
+            'ext': 'mp4',
+            'display_id': 'ref:baeebeac-a2a6-4dbf-9eb3-c40d59b40068',
+            'title': '神回だけ見せます！ #2 壮烈！車大騎馬戦（木曜スペシャル）',
+            'alt_title': '神回だけ見せます！ #2 壮烈！車大騎馬戦（木曜スペシャル） 日テレ',
+            'description': 'md5:2726f742d5e3886edeaf72fb6d740fef',
+            'uploader_id': 'tver-ntv',
+            'channel': '日テレ',
+            'duration': 1158.024,
+            'thumbnail': 'https://statics.tver.jp/images/content/thumbnail/episode/xlarge/epc1hdugbk.jpg?v=16',
+            'series': '神回だけ見せます！',
+            'episode': '#2 壮烈！車大騎馬戦（木曜スペシャル）',
+            'episode_number': 2,
+            'timestamp': 1736486036,
+            'upload_date': '20250110',
+            'modified_timestamp': 1736870264,
+            'modified_date': '20250114',
+            'live_status': 'not_live',
+            'release_timestamp': 1651453200,
+            'release_date': '20220502',
+            '_old_archive_ids': ['brightcovenew ref:baeebeac-a2a6-4dbf-9eb3-c40d59b40068'],
         },
-        'add_ie': ['BrightcoveNew'],
+    }, {
+        # via Brightcove backend (deprecated)
+        'url': 'https://tver.jp/episodes/epc1hdugbk',
+        'info_dict': {
+            'id': 'ref:baeebeac-a2a6-4dbf-9eb3-c40d59b40068',
+            'ext': 'mp4',
+            'title': '神回だけ見せます！ #2 壮烈！車大騎馬戦（木曜スペシャル）',
+            'alt_title': '神回だけ見せます！ #2 壮烈！車大騎馬戦（木曜スペシャル） 日テレ',
+            'description': 'md5:2726f742d5e3886edeaf72fb6d740fef',
+            'uploader_id': '4394098882001',
+            'channel': '日テレ',
+            'duration': 1158.101,
+            'thumbnail': 'https://statics.tver.jp/images/content/thumbnail/episode/xlarge/epc1hdugbk.jpg?v=16',
+            'tags': [],
+            'series': '神回だけ見せます！',
+            'episode': '#2 壮烈！車大騎馬戦（木曜スペシャル）',
+            'episode_number': 2,
+            'timestamp': 1651388531,
+            'upload_date': '20220501',
+            'release_timestamp': 1651453200,
+            'release_date': '20220502',
+        },
+        'params': {'extractor_args': {'tver': {'backend': ['brightcove']}}},
     }, {
         'url': 'https://tver.jp/corner/f0103888',
         'only_matching': True,
     }, {
         'url': 'https://tver.jp/lp/f0033031',
         'only_matching': True,
+    }, {
+        'url': 'https://tver.jp/series/srtxft431v',
+        'info_dict': {
+            'id': 'srtxft431v',
+            'title': '名探偵コナン',
+        },
+        'playlist_mincount': 21,
+    }, {
+        'url': 'https://tver.jp/series/sru35hwdd2',
+        'info_dict': {
+            'id': 'sru35hwdd2',
+            'title': '神回だけ見せます！',
+        },
+        'playlist_count': 11,
+    }, {
+        'url': 'https://tver.jp/series/srkq2shp9d',
+        'only_matching': True,
     }]
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/default_default/index.html?videoId=%s'
-    _PLATFORM_UID = None
-    _PLATFORM_TOKEN = None
+    _HEADERS = {
+        'x-tver-platform-type': 'web',
+        'Origin': 'https://tver.jp',
+        'Referer': 'https://tver.jp/',
+    }
+    _PLATFORM_QUERY = {}
 
     def _real_initialize(self):
-        create_response = self._download_json(
-            'https://platform-api.tver.jp/v2/api/platform_users/browser/create', None,
-            note='Creating session', data=b'device_type=pc', headers={
-                'Origin': 'https://s.tver.jp',
-                'Referer': 'https://s.tver.jp/',
-                'Content-Type': 'application/x-www-form-urlencoded',
+        session_info = self._download_json(
+            'https://platform-api.tver.jp/v2/api/platform_users/browser/create',
+            None, 'Creating session', data=b'device_type=pc')
+        self._PLATFORM_QUERY = traverse_obj(session_info, ('result', {
+            'platform_uid': 'platform_uid',
+            'platform_token': 'platform_token',
+        }))
+
+    def _call_platform_api(self, path, video_id, note=None, fatal=True, query=None):
+        return self._download_json(
+            f'https://platform-api.tver.jp/service/api/{path}', video_id, note,
+            fatal=fatal, headers=self._HEADERS, query={
+                **self._PLATFORM_QUERY,
+                **(query or {}),
             })
-        self._PLATFORM_UID = traverse_obj(create_response, ('result', 'platform_uid'))
-        self._PLATFORM_TOKEN = traverse_obj(create_response, ('result', 'platform_token'))
+
+    def _yield_episode_ids_for_series(self, series_id):
+        seasons_info = self._download_json(
+            f'https://service-api.tver.jp/api/v1/callSeriesSeasons/{series_id}',
+            series_id, 'Downloading seasons info', headers=self._HEADERS)
+        for season_id in traverse_obj(
+                seasons_info, ('result', 'contents', lambda _, v: v['type'] == 'season', 'content', 'id', {str})):
+            episodes_info = self._call_platform_api(
+                f'v1/callSeasonEpisodes/{season_id}', series_id, f'Downloading season {season_id} episodes info')
+            yield from traverse_obj(episodes_info, (
+                'result', 'contents', lambda _, v: v['type'] == 'episode', 'content', 'id', {str}))
 
     def _real_extract(self, url):
         video_id, video_type = self._match_valid_url(url).group('id', 'type')
-        if video_type not in {'series', 'episodes'}:
+        backend = self._configuration_arg('backend', ['streaks'])[0]
+        if backend not in ('brightcove', 'streaks'):
+            raise ExtractorError(f'Invalid backend value: {backend}', expected=True)
+
+        if video_type == 'series':
+            series_info = self._call_platform_api(
+                f'v2/callSeries/{video_id}', video_id, 'Downloading series info')
+            return self.playlist_from_matches(
+                self._yield_episode_ids_for_series(video_id), video_id,
+                traverse_obj(series_info, ('result', 'content', 'content', 'title', {str})),
+                ie=TVerIE, getter=lambda x: f'https://tver.jp/episodes/{x}')
+
+        if video_type != 'episodes':
             webpage = self._download_webpage(url, video_id, note='Resolving to new URL')
             video_id = self._match_id(self._search_regex(
                 (r'canonical"\s*href="(https?://tver\.jp/[^"]+)"', r'&link=(https?://tver\.jp/[^?&]+)[?&]'),
                 webpage, 'url regex'))
 
-        episode_info = self._download_json(
-            f'https://platform-api.tver.jp/service/api/v1/callEpisode/{video_id}?require_data=mylist,later[epefy106ur],good[epefy106ur],resume[epefy106ur]',
-            video_id, fatal=False,
-            query={
-                'platform_uid': self._PLATFORM_UID,
-                'platform_token': self._PLATFORM_TOKEN,
-            }, headers={
-                'x-tver-platform-type': 'web'
+        episode_info = self._call_platform_api(
+            f'v1/callEpisode/{video_id}', video_id, 'Downloading episode info', fatal=False, query={
+                'require_data': 'mylist,later[epefy106ur],good[epefy106ur],resume[epefy106ur]',
             })
         episode_content = traverse_obj(
             episode_info, ('result', 'episode', 'content')) or {}
 
+        version = traverse_obj(episode_content, ('version', {str_or_none}), default='5')
         video_info = self._download_json(
-            f'https://statics.tver.jp/content/episode/{video_id}.json', video_id,
-            query={
-                'v': str_or_none(episode_content.get('version')) or '5',
-            }, headers={
-                'Origin': 'https://tver.jp',
-                'Referer': 'https://tver.jp/',
-            })
-        p_id = video_info['video']['accountID']
-        r_id = traverse_obj(video_info, ('video', ('videoRefID', 'videoID')), get_all=False)
-        if not r_id:
-            raise ExtractorError('Failed to extract reference ID for Brightcove')
-        if not r_id.isdigit():
-            r_id = f'ref:{r_id}'
+            f'https://statics.tver.jp/content/episode/{video_id}.json', video_id, 'Downloading video info',
+            query={'v': version}, headers={'Referer': 'https://tver.jp/'})
 
         episode = strip_or_none(episode_content.get('title'))
         series = str_or_none(episode_content.get('seriesTitle'))
@@ -90,16 +165,70 @@ class TVerIE(InfoExtractor):
         provider = str_or_none(episode_content.get('productionProviderName'))
         onair_label = str_or_none(episode_content.get('broadcastDateLabel'))
 
-        return {
-            '_type': 'url_transparent',
+        thumbnails = [
+            {
+                'id': quality,
+                'url': update_url_query(
+                    f'https://statics.tver.jp/images/content/thumbnail/episode/{quality}/{video_id}.jpg',
+                    {'v': version}),
+                'width': width,
+                'height': height,
+            }
+            for quality, width, height in [
+                ('small', 480, 270),
+                ('medium', 640, 360),
+                ('large', 960, 540),
+                ('xlarge', 1280, 720),
+            ]
+        ]
+
+        metadata = {
             'title': title,
             'series': series,
             'episode': episode,
             # an another title which is considered "full title" for some viewers
             'alt_title': join_nonempty(title, provider, onair_label, delim=' '),
             'channel': provider,
-            'description': str_or_none(video_info.get('description')),
-            'url': smuggle_url(
-                self.BRIGHTCOVE_URL_TEMPLATE % (p_id, r_id), {'geo_countries': ['JP']}),
-            'ie_key': 'BrightcoveNew',
+            'thumbnails': thumbnails,
+            **traverse_obj(video_info, {
+                'description': ('description', {str}),
+                'release_timestamp': ('viewStatus', 'startAt', {int_or_none}),
+                'episode_number': ('no', {int_or_none}),
+            }),
+        }
+
+        brightcove_id = traverse_obj(video_info, ('video', ('videoRefID', 'videoID'), {str}, any))
+        if brightcove_id and not brightcove_id.isdecimal():
+            brightcove_id = f'ref:{brightcove_id}'
+
+        streaks_id = traverse_obj(video_info, ('streaks', 'videoRefID', {str}))
+        if streaks_id and not streaks_id.startswith('ref:'):
+            streaks_id = f'ref:{streaks_id}'
+
+        # Deprecated Brightcove extraction reachable w/extractor-arg or fallback; errors are expected
+        if backend == 'brightcove' or not streaks_id:
+            if backend != 'brightcove':
+                self.report_warning(
+                    'No STREAKS ID found; falling back to Brightcove extraction', video_id=video_id)
+            if not brightcove_id:
+                raise ExtractorError('Unable to extract brightcove reference ID', expected=True)
+            account_id = traverse_obj(video_info, (
+                'video', 'accountID', {str}, {require('brightcove account ID', expected=True)}))
+            return {
+                **metadata,
+                '_type': 'url_transparent',
+                'url': smuggle_url(
+                    self.BRIGHTCOVE_URL_TEMPLATE % (account_id, brightcove_id),
+                    {'geo_countries': ['JP']}),
+                'ie_key': 'BrightcoveNew',
+            }
+
+        return {
+            **self._extract_from_streaks_api(video_info['streaks']['projectID'], streaks_id, {
+                'Origin': 'https://tver.jp',
+                'Referer': 'https://tver.jp/',
+            }),
+            **metadata,
+            'id': video_id,
+            '_old_archive_ids': [make_archive_id('BrightcoveNew', brightcove_id)] if brightcove_id else None,
         }