summaryrefslogtreecommitdiffstats
path: root/yt_dlp/extractor/dailymail.py
diff options
context:
space:
mode:
Diffstat (limited to 'yt_dlp/extractor/dailymail.py')
-rw-r--r--yt_dlp/extractor/dailymail.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/yt_dlp/extractor/dailymail.py b/yt_dlp/extractor/dailymail.py
index 4c25bea..540676a 100644
--- a/yt_dlp/extractor/dailymail.py
+++ b/yt_dlp/extractor/dailymail.py
@@ -1,8 +1,8 @@
from .common import InfoExtractor
-from ..compat import compat_str
from ..utils import (
determine_protocol,
int_or_none,
+ join_nonempty,
try_get,
unescapeHTML,
)
@@ -19,7 +19,7 @@ class DailyMailIE(InfoExtractor):
'ext': 'mp4',
'title': 'The Mountain appears in sparkling water ad for \'Heavy Bubbles\'',
'description': 'md5:a93d74b6da172dd5dc4d973e0b766a84',
- }
+ },
}, {
'url': 'http://www.dailymail.co.uk/embed/video/1295863.html',
'only_matching': True,
@@ -35,8 +35,8 @@ class DailyMailIE(InfoExtractor):
sources_url = (try_get(
video_data,
(lambda x: x['plugins']['sources']['url'],
- lambda x: x['sources']['url']), compat_str)
- or 'http://www.dailymail.co.uk/api/player/%s/video-sources.json' % video_id)
+ lambda x: x['sources']['url']), str)
+ or f'http://www.dailymail.co.uk/api/player/{video_id}/video-sources.json')
video_sources = self._download_json(sources_url, video_id)
body = video_sources.get('body')
@@ -53,7 +53,7 @@ class DailyMailIE(InfoExtractor):
is_hls = container == 'M2TS'
protocol = 'm3u8_native' if is_hls else determine_protocol({'url': rendition_url})
formats.append({
- 'format_id': ('hls' if is_hls else protocol) + ('-%d' % tbr if tbr else ''),
+ 'format_id': join_nonempty('hls' if is_hls else protocol, tbr),
'url': rendition_url,
'width': int_or_none(rendition.get('frameWidth')),
'height': int_or_none(rendition.get('frameHeight')),