Cool_Tools/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-20 05:47:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

restore previous join_nonempty()

Browse Source
This commit is contained in:
ds 2023-08-25 23:20:46 +03:00
parent fcafc42927
commit 46cebee490
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yt_dlp/YoutubeDL.py
View File

@ -1379,11 +1379,13 @@ def _prepare_filename(self, info_dict, *, outtmpl=None, tmpl_type=None):
if not filename: if not filename:
return None return None
trim_file_name = self.params.get('trim_file_name', False) trim_file_name = self.params.get('trim_file_name')
if trim_file_name: if trim_file_name:
# https://github.com/yt-dlp/yt-dlp/issues/5526#issuecomment-1312783517 # https://github.com/yt-dlp/yt-dlp/issues/5526#issuecomment-1312783517
no_ext, *ext = filename.rsplit('.', info_dict.get('ext', '').count('.') + 1) no_ext, *ext = filename.rsplit('.', info_dict.get('ext', '').count('.') + 1)
filename = join_nonempty(no_ext[:trim_file_name], *ext, delim='.') # cut filename and remove trailing spaces and extra dots
name = no_ext[:trim_file_name].strip().rstrip('.')
filename = join_nonempty(name, *ext, delim='.')
if tmpl_type in ('', 'temp'): if tmpl_type in ('', 'temp'):
final_ext, ext = self.params.get('final_ext'), info_dict.get('ext') final_ext, ext = self.params.get('final_ext'), info_dict.get('ext')

2
yt_dlp/utils/_utils.py
View File

@ -4733,7 +4733,7 @@ def number_of_digits(number):
def join_nonempty(*values, delim='-', from_dict=None): def join_nonempty(*values, delim='-', from_dict=None):
if from_dict is not None: if from_dict is not None:
values = (traversal.traverse_obj(from_dict, variadic(v)) for v in values) values = (traversal.traverse_obj(from_dict, variadic(v)) for v in values)
return delim.join(str(v).strip() for v in values if v) return delim.join(map(str, filter(None, values)))
def scale_thumbnails_to_max_format_width(formats, thumbnails, url_width_re): def scale_thumbnails_to_max_format_width(formats, thumbnails, url_width_re):