mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-06-27 08:58:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix #9970: FFmpeg requires ext in filename for FFmpegMetadataPP

Browse Source 
Output templates resulting in filenames with only dots preceding the
extension would be passed to ffmpeg for embeding metadata with .temp
in the extension field because os.path.splitext would not find and
extension field in those filenames.
As a result ffmpeg would fail to determine what the output extension
should be and fail.
To solve this a must_have_ext argument was added to _change_extension
so that where a extension is required the expected extension will be
used in those cases where os.path.splitext returns an empty string for
the extension field.
existing_video_file in YoutubeDL.py was also changed so it won't
overwrite info_dict['ext'] with an empty string if os.path.splitext
returns an empty string for the extension field. This fixes #9970 .
This commit is contained in:
Alexandre Ramos 2025-03-22 16:54:25 +00:00
parent b4488a9e12
commit 8ec164054e
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/test_utils.py
View File

@ -315,6 +315,7 @@ def test_prepend_extension(self):
self.assertEqual(prepend_extension('abc', 'temp'), 'abc.temp') self.assertEqual(prepend_extension('abc', 'temp'), 'abc.temp')
self.assertEqual(prepend_extension('.abc', 'temp'), '.abc.temp') self.assertEqual(prepend_extension('.abc', 'temp'), '.abc.temp')
self.assertEqual(prepend_extension('.abc.ext', 'temp'), '.abc.temp.ext') self.assertEqual(prepend_extension('.abc.ext', 'temp'), '.abc.temp.ext')
self.assertEqual(prepend_extension('..ext', 'temp', 'temp', True), '..ext.temp.temp')
# Test uncommon extensions # Test uncommon extensions
self.assertEqual(prepend_extension('abc.ext', 'bin'), 'abc.bin.ext') self.assertEqual(prepend_extension('abc.ext', 'bin'), 'abc.bin.ext')

3
yt_dlp/YoutubeDL.py
View File

@ -3394,7 +3394,8 @@ def existing_video_file(*filepaths):
file = self.existing_file(itertools.chain(*zip(map(converted, filepaths), filepaths)), file = self.existing_file(itertools.chain(*zip(map(converted, filepaths), filepaths)),
default_overwrite=False) default_overwrite=False)
if file: if file:
info_dict['ext'] = os.path.splitext(file)[1][1:] real_ext = os.path.splitext(file)[1][1:]
info_dict['ext'] = real_ext if real_ext else info_dict['ext']
return file return file
fd, success = None, True fd, success = None, True

2
yt_dlp/postprocessor/ffmpeg.py
View File

@ -706,7 +706,7 @@ def run(self, info):
self.to_screen('There isn\'t any metadata to add') self.to_screen('There isn\'t any metadata to add')
return [], info return [], info
temp_filename = prepend_extension(filename, 'temp') temp_filename = prepend_extension(filename, 'temp', info['ext'], True)
self.to_screen(f'Adding metadata to "{filename}"') self.to_screen(f'Adding metadata to "{filename}"')
self.run_ffmpeg_multiple_files( self.run_ffmpeg_multiple_files(
(filename, metadata_filename), temp_filename, (filename, metadata_filename), temp_filename,

7
yt_dlp/utils/_utils.py
View File

@ -2122,7 +2122,7 @@ def parse_duration(s):
(days, 86400), (hours, 3600), (mins, 60), (secs, 1), (ms, 1))) (days, 86400), (hours, 3600), (mins, 60), (secs, 1), (ms, 1)))
def _change_extension(prepend, filename, ext, expected_real_ext=None): def _change_extension(prepend, filename, ext, expected_real_ext=None, must_have_ext=False):
name, real_ext = os.path.splitext(filename) name, real_ext = os.path.splitext(filename)
if not expected_real_ext or real_ext[1:] == expected_real_ext: if not expected_real_ext or real_ext[1:] == expected_real_ext:
@ -2131,6 +2131,11 @@ def _change_extension(prepend, filename, ext, expected_real_ext=None):
_UnsafeExtensionError.sanitize_extension(ext, prepend=True) _UnsafeExtensionError.sanitize_extension(ext, prepend=True)
return f'{filename}.{ext}{real_ext}' return f'{filename}.{ext}{real_ext}'
if not real_ext and must_have_ext and expected_real_ext and prepend:
_UnsafeExtensionError.sanitize_extension(ext, prepend=True)
_UnsafeExtensionError.sanitize_extension(expected_real_ext)
return f'{filename}.{ext}.{expected_real_ext}'
return f'{filename}.{_UnsafeExtensionError.sanitize_extension(ext)}' return f'{filename}.{_UnsafeExtensionError.sanitize_extension(ext)}'