From 4c9fe66ad00579af13c9f568e6c7a99abc937458 Mon Sep 17 00:00:00 2001 From: Moritz Barsnick Date: Thu, 29 May 2025 16:01:16 +0200 Subject: [PATCH] [ie/SVTPlay] rework extractor Drop some obsoleted code paths. Authored by: bashonly Signed-off-by: Moritz Barsnick --- yt_dlp/extractor/svt.py | 64 ++++++++++++----------------------------- 1 file changed, 19 insertions(+), 45 deletions(-) diff --git a/yt_dlp/extractor/svt.py b/yt_dlp/extractor/svt.py index 2b84686d20..4443956499 100644 --- a/yt_dlp/extractor/svt.py +++ b/yt_dlp/extractor/svt.py @@ -6,10 +6,13 @@ from ..utils import ( determine_ext, dict_get, int_or_none, - traverse_obj, try_get, unified_timestamp, ) +from ..utils.traversal import ( + require, + traverse_obj, +) class SVTBaseIE(InfoExtractor): @@ -254,58 +257,29 @@ class SVTPlayIE(SVTPlayBaseIE): mobj = self._match_valid_url(url) video_id = mobj.group('id') svt_id = mobj.group('svt_id') or mobj.group('modal_id') - if svt_id: return self._extract_by_video_id(svt_id) webpage = self._download_webpage(url, video_id) - data = self._parse_json( - self._search_regex( - self._SVTPLAY_RE, webpage, 'embedded data', default='{}', - group='json'), - video_id, fatal=False) - - thumbnail = self._og_search_thumbnail(webpage) - - if data: - video_info = try_get( - data, lambda x: x['context']['dispatcher']['stores']['VideoTitlePageStore']['data']['video'], - dict) - if video_info: - info_dict = self._extract_video(video_info, video_id) - info_dict.update({ - 'title': data['context']['dispatcher']['stores']['MetaStore']['title'], - 'thumbnail': thumbnail, - }) - return info_dict - - svt_id = try_get( - data, lambda x: x['statistics']['dataLake']['content']['id'], - str) - + data = traverse_obj(self._search_nextjs_data(webpage, video_id), ( + 'props', 'urqlState', ..., 'data', {json.loads}, + 'detailsPageByPath', {dict}, any, {require('video data')})) + details = traverse_obj(data, ( + 'modules', lambda _, v: v['details']['smartStart']['item']['videos'], + 'details', {dict}, any)) + svt_id = traverse_obj(details, ( + 'smartStart', 'item', 'videos', + # There can be 'AudioDescribed' and 'SignInterpreted' variants; try 'Default' or else get first + (lambda _, v: v['accessibility'] == 'Default', 0), + 'svtId', {str}, any)) if not svt_id: - nextjs_data = self._search_nextjs_data(webpage, video_id, fatal=False) - svt_id = traverse_obj(nextjs_data, ( - 'props', 'urqlState', ..., 'data', {json.loads}, 'detailsPageByPath', - 'video', 'svtId', {str}), get_all=False) - if not svt_id: - details = traverse_obj(nextjs_data, ( - 'props', 'urqlState', ..., 'data', {json.loads}, 'detailsPageByPath', - 'modules', ..., 'details'), get_all=False) - description = details['description'] - svt_id = traverse_obj(details, ( - 'smartStart', 'item', 'videos', ..., 'svtId', {str}), get_all=False) - - if not svt_id: - svt_id = self._search_regex( - (r']+data-video-id=["\']([\da-zA-Z-]+)', - r'<[^>]+\bdata-rt=["\']top-area-play-button["\'][^>]+\bhref=["\'][^"\']*video/[\w-]+/[^"\']*\b(?:modalId|id)=([\w-]+)'), - webpage, 'video id') + svt_id = traverse_obj(data, ('video', 'svtId', {str}, {require('SVT ID')})) info_dict = self._extract_by_video_id(svt_id, webpage) - info_dict['description'] = description - info_dict['thumbnail'] = thumbnail + if not info_dict.get('description'): + info_dict['description'] = traverse_obj(details, ('description', {str})) + info_dict['thumbnail'] = self._og_search_thumbnail(webpage) return info_dict