[extractor] Deprecate `_sort_formats`

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

diff --git a/yt_dlp/extractor/fujitv.py b/yt_dlp/extractor/fujitv.py
index f3cb9a6f405e16e134c62196b9022139a7061ce9..668bb2743c742f317f6bbb7be1279cba59cd80d0 100644 (file)
--- a/yt_dlp/extractor/fujitv.py
+++ b/yt_dlp/extractor/fujitv.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-from __future__ import unicode_literals
 from ..utils import HEADRequest
 from .common import InfoExtractor
 
@@ -7,18 +5,36 @@
 class FujiTVFODPlus7IE(InfoExtractor):
     _VALID_URL = r'https?://fod\.fujitv\.co\.jp/title/(?P<sid>[0-9a-z]{4})/(?P<id>[0-9a-z]+)'
     _BASE_URL = 'https://i.fod.fujitv.co.jp/'
+    _BITRATE_MAP = {
+        300: (320, 180),
+        800: (640, 360),
+        1200: (1280, 720),
+        2000: (1280, 720),
+        4000: (1920, 1080),
+    }
 
     _TESTS = [{
         'url': 'https://fod.fujitv.co.jp/title/5d40/5d40110076',
         'info_dict': {
             'id': '5d40110076',
-            'ext': 'mp4',
+            'ext': 'ts',
             'title': '#1318 『まる子、まぼろしの洋館を見る』の巻',
             'series': 'ちびまる子ちゃん',
             'series_id': '5d40',
             'description': 'md5:b3f51dbfdda162ac4f789e0ff4d65750',
             'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40110076_a.jpg',
         },
+    }, {
+        'url': 'https://fod.fujitv.co.jp/title/5d40/5d40810083',
+        'info_dict': {
+            'id': '5d40810083',
+            'ext': 'ts',
+            'title': '#1324 『まる子とオニの子』の巻／『結成！2月をムダにしない会』の巻',
+            'description': 'md5:3972d900b896adc8ab1849e310507efa',
+            'series': 'ちびまる子ちゃん',
+            'series_id': '5d40',
+            'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40810083_a.jpg'},
+        'skip': 'Video available only in one week'
     }]
 
     def _real_extract(self, url):
@@ -29,16 +45,18 @@ def _real_extract(self, url):
         if token:
             json_info = self._download_json('https://fod-sp.fujitv.co.jp/apps/api/episode/detail/?ep_id=%s&is_premium=false' % video_id, video_id, headers={'x-authorization': f'Bearer {token.value}'}, fatal=False)
         else:
-            self.report_warning(f'The token cookie is needed to extract video metadata. {self._LOGIN_HINTS["cookies"]}')
+            self.report_warning(f'The token cookie is needed to extract video metadata. {self._login_hint("cookies")}')
         formats, subtitles = [], {}
         src_json = self._download_json(f'{self._BASE_URL}abrjson_v2/tv_android/{video_id}', video_id)
         for src in src_json['video_selector']:
             if not src.get('url'):
                 continue
-            fmt, subs = self._extract_m3u8_formats_and_subtitles(src['url'], video_id, 'mp4')
+            fmt, subs = self._extract_m3u8_formats_and_subtitles(src['url'], video_id, 'ts')
+            for f in fmt:
+                f.update(dict(zip(('height', 'width'),
+                                  self._BITRATE_MAP.get(f.get('tbr'), ()))))
             formats.extend(fmt)
             subtitles = self._merge_subtitles(subtitles, subs)
-        self._sort_formats(formats, ['tbr'])
 
         return {
             'id': video_id,
@@ -49,4 +67,5 @@ def _real_extract(self, url):
             'formats': formats,
             'subtitles': subtitles,
             'thumbnail': f'{self._BASE_URL}img/program/{series_id}/episode/{video_id}_a.jpg',
+            '_format_sort_fields': ('tbr', )
         }