diff --git a/yt_dlp/extractor/svt.py b/yt_dlp/extractor/svt.py index 18da87534f..573147a455 100644 --- a/yt_dlp/extractor/svt.py +++ b/yt_dlp/extractor/svt.py @@ -7,8 +7,6 @@ from ..utils import ( determine_ext, dict_get, int_or_none, - str_or_none, - strip_or_none, traverse_obj, try_get, unified_timestamp, @@ -388,15 +386,55 @@ class SVTSeriesIE(SVTPlayBaseIE): dict_get(series, ('longDescription', 'shortDescription'))) -class SVTPageIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?svt\.se/(?P(?:[^/]+/)*(?P[^/?&#]+))' +class SVTPageIE(SVTBaseIE): + _VALID_URL = r'https?://(?:www\.)?svt\.se/(?:[^/?#]+/)*(?P[^/?&#]+)' _TESTS = [{ + 'url': 'https://www.svt.se/nyheter/lokalt/skane/viktor-18-forlorade-armar-och-ben-i-sepsis-vill-ateruppta-karaten-och-bli-svetsare', + 'info_dict': { + 'title': 'Viktor, 18, förlorade armar och ben i sepsis – vill återuppta karaten och bli svetsare', + 'id': 'viktor-18-forlorade-armar-och-ben-i-sepsis-vill-ateruppta-karaten-och-bli-svetsare', + }, + 'playlist_count': 2, + }, { + 'url': 'https://www.svt.se/nyheter/lokalt/skane/forsvarsmakten-om-trafikkaoset-pa-e22-kunde-inte-varit-dar-snabbare', + 'info_dict': { + 'id': 'jXvk42E', + 'title': 'Försvarsmakten om trafikkaoset på E22: Kunde inte varit där snabbare', + 'ext': 'mp4', + "duration": 80, + 'age_limit': 0, + 'timestamp': 1704370009, + 'episode': 'Försvarsmakten om trafikkaoset på E22: Kunde inte varit där snabbare', + 'series': 'Lokala Nyheter Skåne', + 'upload_date': '20240104' + }, + 'params': { + 'skip_download': True, + } + }, { + 'url': 'https://www.svt.se/nyheter/svtforum/2023-tungt-ar-for-svensk-media', + 'info_dict': { + 'title': '2023 tungt år för svensk media', + 'id': 'ewqAZv4', + 'ext': 'mp4', + "duration": 3074, + 'age_limit': 0, + 'series': '', + 'timestamp': 1702980479, + 'upload_date': '20231219', + 'episode': 'Mediestudier' + }, + 'params': { + 'skip_download': True, + } + }, { 'url': 'https://www.svt.se/sport/ishockey/bakom-masken-lehners-kamp-mot-mental-ohalsa', 'info_dict': { 'id': '25298267', 'title': 'Bakom masken – Lehners kamp mot mental ohälsa', }, 'playlist_count': 4, + 'skip': 'Video is gone' }, { 'url': 'https://www.svt.se/nyheter/utrikes/svenska-andrea-ar-en-mil-fran-branderna-i-kalifornien', 'info_dict': { @@ -404,6 +442,7 @@ class SVTPageIE(InfoExtractor): 'title': 'Svenska Andrea redo att fly sitt hem i Kalifornien', }, 'playlist_count': 2, + 'skip': 'Video is gone' }, { # only programTitle 'url': 'http://www.svt.se/sport/ishockey/jagr-tacklar-giroux-under-intervjun', @@ -414,6 +453,7 @@ class SVTPageIE(InfoExtractor): 'duration': 27, 'age_limit': 0, }, + 'skip': 'Video is gone' }, { 'url': 'https://www.svt.se/nyheter/lokalt/vast/svt-testar-tar-nagon-upp-skrapet-1', 'only_matching': True, @@ -427,26 +467,23 @@ class SVTPageIE(InfoExtractor): return False if SVTIE.suitable(url) or SVTPlayIE.suitable(url) else super(SVTPageIE, cls).suitable(url) def _real_extract(self, url): - path, display_id = self._match_valid_url(url).groups() + display_id = self._match_id(url) - article = self._download_json( - 'https://api.svt.se/nss-api/page/' + path, display_id, - query={'q': 'articles'})['articles']['content'][0] + webpage = self._download_webpage(url, display_id) + title = self._og_search_title(webpage) - entries = [] + urql_state = self._search_json( + r'window\.svt\.nyh\.urqlState\s*=', webpage, 'json data', display_id) - def _process_content(content): - if content.get('_type') in ('VIDEOCLIP', 'VIDEOEPISODE'): - video_id = compat_str(content['image']['svtId']) - entries.append(self.url_result( - 'svt:' + video_id, SVTPlayIE.ie_key(), video_id)) + data = traverse_obj(urql_state, (..., 'data', {str}, {json.loads}), get_all=False) or {} - for media in article.get('media', []): - _process_content(media) + def entries(): + for video_id in set(traverse_obj(data, ( + 'page', (('topMedia', 'svtId'), ('body', ..., 'video', 'svtId')), {str} + ))): + info = self._extract_video( + self._download_json(f'https://api.svt.se/video/{video_id}', video_id), video_id) + info['title'] = title + yield info - for obj in article.get('structuredBody', []): - _process_content(obj.get('content') or {}) - - return self.playlist_result( - entries, str_or_none(article.get('id')), - strip_or_none(article.get('title'))) + return self.playlist_result(entries(), display_id, title)