[ie/generic] Add `key_query` extractor-arg

[yt-dlp.git] / yt_dlp / extractor / tver.py

diff --git a/yt_dlp/extractor/tver.py b/yt_dlp/extractor/tver.py
index b04575bd57949b0b142328335c7a03adf9c9359d..8105db41cd707c40f35706c93c1802f16381914f 100644 (file)
--- a/yt_dlp/extractor/tver.py
+++ b/yt_dlp/extractor/tver.py
@@ -21,8 +21,6 @@ class TVerIE(InfoExtractor):
             'episode': '売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！',
             'alt_title': '売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！',
             'channel': 'テレビ朝日',
-            'onair_label': '5月3日(火)放送分',
-            'ext_title': '家事ヤロウ!!! 売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！ テレビ朝日 5月3日(火)放送分',
         },
         'add_ie': ['BrightcoveNew'],
     }, {
@@ -54,9 +52,24 @@ def _real_extract(self, 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_content = traverse_obj(
+            episode_info, ('result', 'episode', 'content')) or {}
+
         video_info = self._download_json(
             f'https://statics.tver.jp/content/episode/{video_id}.json', video_id,
-            query={'v': '5'}, headers={
+            query={
+                'v': str_or_none(episode_content.get('version')) or '5',
+            }, headers={
                 'Origin': 'https://tver.jp',
                 'Referer': 'https://tver.jp/',
             })
@@ -67,25 +80,13 @@ def _real_extract(self, url):
         if not r_id.isdigit():
             r_id = f'ref:{r_id}'
 
-        additional_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'
-            })
-
-        additional_content_info = traverse_obj(
-            additional_info, ('result', 'episode', 'content'), get_all=False) or {}
-        episode = strip_or_none(additional_content_info.get('title'))
-        series = str_or_none(additional_content_info.get('seriesTitle'))
+        episode = strip_or_none(episode_content.get('title'))
+        series = str_or_none(episode_content.get('seriesTitle'))
         title = (
             join_nonempty(series, episode, delim=' ')
             or str_or_none(video_info.get('title')))
-        provider = str_or_none(additional_content_info.get('productionProviderName'))
-        onair_label = str_or_none(additional_content_info.get('broadcastDateLabel'))
+        provider = str_or_none(episode_content.get('productionProviderName'))
+        onair_label = str_or_none(episode_content.get('broadcastDateLabel'))
 
         return {
             '_type': 'url_transparent',