restructured manifest and plugins loading; updated plugins

plugins/youtube_download/yt_dlp/extractor/tver.py

@@ -1,12 +1,16 @@
+import datetime as dt
+
 from .streaks import StreaksBaseIE
 from ..utils import (
     ExtractorError,
+    GeoRestrictedError,
     int_or_none,
     join_nonempty,
     make_archive_id,
     smuggle_url,
     str_or_none,
     strip_or_none,
+    time_seconds,
     update_url_query,
 )
 from ..utils.traversal import require, traverse_obj
@@ -41,6 +45,8 @@ class TVerIE(StreaksBaseIE):
             'release_timestamp': 1651453200,
             'release_date': '20220502',
             '_old_archive_ids': ['brightcovenew ref:baeebeac-a2a6-4dbf-9eb3-c40d59b40068'],
+            'series_id': 'sru35hwdd2',
+            'season_id': 'ss2lcn4af6',
         },
     }, {
         # via Brightcove backend (deprecated)
@@ -63,6 +69,8 @@ class TVerIE(StreaksBaseIE):
             'upload_date': '20220501',
             'release_timestamp': 1651453200,
             'release_date': '20220502',
+            'series_id': 'sru35hwdd2',
+            'season_id': 'ss2lcn4af6',
         },
         'params': {'extractor_args': {'tver': {'backend': ['brightcove']}}},
     }, {
@@ -96,6 +104,7 @@ class TVerIE(StreaksBaseIE):
         'Referer': 'https://tver.jp/',
     }
     _PLATFORM_QUERY = {}
+    _STREAKS_API_INFO = {}
 
     def _real_initialize(self):
         session_info = self._download_json(
@@ -105,6 +114,9 @@ class TVerIE(StreaksBaseIE):
             'platform_uid': 'platform_uid',
             'platform_token': 'platform_token',
         }))
+        self._STREAKS_API_INFO = self._download_json(
+            'https://player.tver.jp/player/streaks_info_v2.json', None,
+            'Downloading STREAKS API info', 'Unable to download STREAKS API info')
 
     def _call_platform_api(self, path, video_id, note=None, fatal=True, query=None):
         return self._download_json(
@@ -194,6 +206,8 @@ class TVerIE(StreaksBaseIE):
                 'description': ('description', {str}),
                 'release_timestamp': ('viewStatus', 'startAt', {int_or_none}),
                 'episode_number': ('no', {int_or_none}),
+                'series_id': ('seriesID', {str}),
+                'season_id': ('seasonID', {str}),
             }),
         }
 
@@ -219,15 +233,26 @@ class TVerIE(StreaksBaseIE):
                 '_type': 'url_transparent',
                 'url': smuggle_url(
                     self.BRIGHTCOVE_URL_TEMPLATE % (account_id, brightcove_id),
-                    {'geo_countries': ['JP']}),
+                    {'geo_countries': self._GEO_COUNTRIES}),
                 'ie_key': 'BrightcoveNew',
             }
 
-        return {
-            **self._extract_from_streaks_api(video_info['streaks']['projectID'], streaks_id, {
+        project_id = video_info['streaks']['projectID']
+        key_idx = dt.datetime.fromtimestamp(time_seconds(hours=9), dt.timezone.utc).month % 6 or 6
+
+        try:
+            streaks_info = self._extract_from_streaks_api(project_id, streaks_id, {
                 'Origin': 'https://tver.jp',
                 'Referer': 'https://tver.jp/',
-            }),
+                'X-Streaks-Api-Key': self._STREAKS_API_INFO[project_id]['api_key'][f'key0{key_idx}'],
+            })
+        except GeoRestrictedError as e:
+            # Catch and re-raise with metadata_available to support --ignore-no-formats-error
+            self.raise_geo_restricted(e.orig_msg, countries=self._GEO_COUNTRIES, metadata_available=True)
+            streaks_info = {}
+
+        return {
+            **streaks_info,
             **metadata,
             'id': video_id,
             '_old_archive_ids': [make_archive_id('BrightcoveNew', brightcove_id)] if brightcove_id else None,