aboutsummaryrefslogtreecommitdiff
path: root/yt_dlp/extractor/yahoo.py
diff options
context:
space:
mode:
authorbashonly <88596187+bashonly@users.noreply.github.com>2024-07-01 17:51:27 -0500
committerGitHub <noreply@github.com>2024-07-01 22:51:27 +0000
commit6aaf96a3d6e7d0d426e97e11a2fcf52fda00e733 (patch)
tree69672ff4be314bd55650fac1e9a97280cecd61e0 /yt_dlp/extractor/yahoo.py
parentd4b99a233314bf31f9c842035ea9884673d5313a (diff)
[cleanup] Misc (#10075)
Closes #10303 Authored by: bashonly, seproDev, jucor, c-basalt Co-authored-by: sepro <4618135+seproDev@users.noreply.github.com> Co-authored-by: Julien Cornebise <julien@cornebise.com> Co-authored-by: c-basalt <117849907+c-basalt@users.noreply.github.com>
Diffstat (limited to 'yt_dlp/extractor/yahoo.py')
-rw-r--r--yt_dlp/extractor/yahoo.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/yt_dlp/extractor/yahoo.py b/yt_dlp/extractor/yahoo.py
index f0ba83038..35e71209c 100644
--- a/yt_dlp/extractor/yahoo.py
+++ b/yt_dlp/extractor/yahoo.py
@@ -8,6 +8,7 @@ from ..utils import (
ExtractorError,
clean_html,
int_or_none,
+ join_nonempty,
mimetype2ext,
parse_iso8601,
traverse_obj,
@@ -213,7 +214,7 @@ class YahooIE(InfoExtractor):
tbr = int_or_none(s.get('bitrate'))
formats.append({
'url': s_url,
- 'format_id': fmt + (f'-{tbr}' if tbr else ''),
+ 'format_id': join_nonempty(fmt, tbr),
'width': int_or_none(s.get('width')),
'height': int_or_none(s.get('height')),
'tbr': tbr,
@@ -371,12 +372,13 @@ class YahooJapanNewsIE(InfoExtractor):
url, content_id, 'mp4', 'm3u8_native',
m3u8_id='hls', fatal=False))
else:
+ bitrate = int_or_none(vid.get('bitrate'))
formats.append({
'url': url,
- 'format_id': f'http-{vid.get("bitrate")}',
+ 'format_id': join_nonempty('http', bitrate),
'height': int_or_none(vid.get('height')),
'width': int_or_none(vid.get('width')),
- 'tbr': int_or_none(vid.get('bitrate')),
+ 'tbr': bitrate,
})
self._remove_duplicate_formats(formats)