Fixed embedding filepath issue for subs and infojson

This commit is contained in:
Kieran Eglin 2024-04-26 16:16:56 -07:00
parent 3046c17822
commit 6c8ede8188
No known key found for this signature in database
GPG Key ID: 193984967FCF432D
3 changed files with 7 additions and 2 deletions

View File

@ -3697,7 +3697,7 @@ class YoutubeDL:
info['filepath'] = filename
info = self.run_all_pps('post_process', info, additional_pps=info.get('__postprocessors'))
info = self.run_pp(MoveFilesAfterDownloadPP(self), info)
del info['__multiple_thumbnails']
info.pop('__multiple_thumbnails', None)
return self.run_all_pps('after_move', info)
def _make_archive_id(self, info_dict):

View File

@ -226,6 +226,6 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
info=info)
if not self._already_have_thumbnail:
del info['thumbnails'][idx]['filepath']
info['thumbnails'][idx].pop('filepath', None)
return [], info

View File

@ -662,6 +662,10 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
self.run_ffmpeg_multiple_files(input_files, temp_filename, opts)
os.replace(temp_filename, filename)
if not self._already_have_subtitle:
for _, subtitle in subtitles.items():
subtitle.pop('filepath', None)
files_to_delete = [] if self._already_have_subtitle else sub_filenames
return files_to_delete, info
@ -698,6 +702,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
infojson_filename = info.get('infojson_filename')
options.extend(self._get_infojson_opts(info, infojson_filename))
if not infojson_filename:
info.pop('infojson_filename', None)
files_to_delete.append(info.get('infojson_filename'))
elif self._add_infojson is True:
self.to_screen('The info-json can only be attached to mkv/mka files')