From 683c166daace08200e7e08daa9d87096b7b36e85 Mon Sep 17 00:00:00 2001 From: MrDemocracy Date: Wed, 20 Nov 2024 17:47:52 +0100 Subject: [PATCH] [disney] Avoid splitting NoneType --- yt_dlp/extractor/disney.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yt_dlp/extractor/disney.py b/yt_dlp/extractor/disney.py index 35dadd3c0..0aa34568c 100644 --- a/yt_dlp/extractor/disney.py +++ b/yt_dlp/extractor/disney.py @@ -5,9 +5,9 @@ determine_ext, int_or_none, join_nonempty, + traverse_obj, unified_strdate, update_url_query, - traverse_obj, ) @@ -105,7 +105,7 @@ def _real_extract(self, url): r'Grill\.burger\s*=\s*({.+})\s*:', webpage, 'grill data')) video_data = next(traverse_obj(s, ('data', 0, 'video')) or traverse_obj(s, ('data', 0)) for s in self._parse_json(grill, - display_id)['stack'] if s.get('type') in ('video', 'flexcontenthero')) + display_id)['stack'] if s.get('type') in ('video', 'flexcontenthero')) else: webpage = self._download_webpage( f'http://{domain}/embed/{video_id}', video_id, headers={'user-agent': self._USER_AGENT}) @@ -128,7 +128,7 @@ def _real_extract(self, url): if '/emea-exit/' in flavor_url: webpage = self._download_webpage(flavor_url, display_id, headers={'user-agent': self._USER_AGENT}, note=False) flavor_url = self._search_regex(r'rel="canonical" href="([^"]+)', - webpage, 'redirect url') + webpage, 'redirect url') if not flavor_url or not re.match(r'https?://', flavor_url) or flavor_format == 'mp4_access': continue tbr = int_or_none(flavor.get('bitrate')) @@ -182,7 +182,7 @@ def _real_extract(self, url): 'description': video_data.get('description') or video_data.get('short_desc'), 'thumbnail': video_data.get('thumb') or video_data.get('thumb_secure'), 'duration': int_or_none(video_data.get('duration_sec')), - 'upload_date': unified_strdate(video_data.get('publish_date')) or re.sub(r'\D', '', video_data.get('content_date').split('T')[0]), + 'upload_date': unified_strdate(video_data.get('publish_date')) or re.sub(r'\D', '', video_data.get('content_date', '').split('T')[0]), 'formats': formats, 'subtitles': subtitles, }