From 37a3bb66a7401455c4758201089b288970532b49 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Sat, 29 May 2021 14:22:44 +0530 Subject: [PATCH] [extractor] Allow `note=False` when extracting manifests --- yt_dlp/extractor/common.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py index dacd9b3d1..8123e14f4 100644 --- a/yt_dlp/extractor/common.py +++ b/yt_dlp/extractor/common.py @@ -1909,8 +1909,8 @@ def _extract_m3u8_formats_and_subtitles( res = self._download_webpage_handle( m3u8_url, video_id, - note=note or 'Downloading m3u8 information', - errnote=errnote or 'Failed to download m3u8 information', + note='Downloading m3u8 information' if note is None else note, + errnote='Failed to download m3u8 information' if errnote is None else errnote, fatal=fatal, data=data, headers=headers, query=query) if res is False: @@ -2059,7 +2059,7 @@ def extract_media(x_media_line): # sub_info['ext'] = 'vtt' sub_info['protocol'] = 'm3u8_native' - lang = media.get('LANGUAGE') or 'unknown' + lang = media.get('LANGUAGE') or 'und' subtitles.setdefault(lang, []).append(sub_info) if media_type not in ('VIDEO', 'AUDIO'): return @@ -2465,8 +2465,8 @@ def _extract_mpd_formats_and_subtitles( fatal=True, data=None, headers={}, query={}): res = self._download_xml_handle( mpd_url, video_id, - note=note or 'Downloading MPD manifest', - errnote=errnote or 'Failed to download MPD manifest', + note='Downloading MPD manifest' if note is None else note, + errnote='Failed to download MPD manifest' if errnote is None else errnote, fatal=fatal, data=data, headers=headers, query=query) if res is False: return [], {} @@ -2795,8 +2795,8 @@ def _extract_ism_formats(self, *args, **kwargs): def _extract_ism_formats_and_subtitles(self, ism_url, video_id, ism_id=None, note=None, errnote=None, fatal=True, data=None, headers={}, query={}): res = self._download_xml_handle( ism_url, video_id, - note=note or 'Downloading ISM manifest', - errnote=errnote or 'Failed to download ISM manifest', + note='Downloading ISM manifest' if note is None else note, + errnote='Failed to download ISM manifest' if errnote is None else errnote, fatal=fatal, data=data, headers=headers, query=query) if res is False: return [], {}