mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-12-19 14:38:53 +00:00
Code Issues Projects Releases Wiki Activity

fix for --trim-file-names bug (#5526)

Browse Source
This commit is contained in:
ds
2023-08-24 20:40:34 +03:00
parent 7cccab79e7
commit fcafc42927
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yt_dlp/YoutubeDL.py
View File

@@ -1379,6 +1379,12 @@ class YoutubeDL:
if not filename:
return None
trim_file_name = self.params.get('trim_file_name', False)
if trim_file_name:
# https://github.com/yt-dlp/yt-dlp/issues/5526#issuecomment-1312783517
no_ext, *ext = filename.rsplit('.', info_dict.get('ext', '').count('.') + 1)
filename = join_nonempty(no_ext[:trim_file_name], *ext, delim='.')
if tmpl_type in ('', 'temp'):
final_ext, ext = self.params.get('final_ext'), info_dict.get('ext')
if final_ext and ext and final_ext != ext and filename.endswith(f'.{final_ext}'):
@@ -1388,12 +1394,6 @@ class YoutubeDL:
if force_ext:
filename = replace_extension(filename, force_ext, info_dict.get('ext'))
# https://github.com/blackjack4494/youtube-dlc/issues/85
trim_file_name = self.params.get('trim_file_name', False)
if trim_file_name:
no_ext, *ext = filename.rsplit('.', 2)
filename = join_nonempty(no_ext[:trim_file_name], *ext, delim='.')
return filename
except ValueError as err:
self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')