mirror of https://github.com/yt-dlp/yt-dlp.git
Compare commits
2 Commits
dd986a4149
...
6c8ede8188
Author | SHA1 | Date |
---|---|---|
Kieran Eglin | 6c8ede8188 | |
Kieran Eglin | 3046c17822 |
|
@ -3697,7 +3697,7 @@ class YoutubeDL:
|
||||||
info['filepath'] = filename
|
info['filepath'] = filename
|
||||||
info = self.run_all_pps('post_process', info, additional_pps=info.get('__postprocessors'))
|
info = self.run_all_pps('post_process', info, additional_pps=info.get('__postprocessors'))
|
||||||
info = self.run_pp(MoveFilesAfterDownloadPP(self), info)
|
info = self.run_pp(MoveFilesAfterDownloadPP(self), info)
|
||||||
del info['__multiple_thumbnails']
|
info.pop('__multiple_thumbnails', None)
|
||||||
return self.run_all_pps('after_move', info)
|
return self.run_all_pps('after_move', info)
|
||||||
|
|
||||||
def _make_archive_id(self, info_dict):
|
def _make_archive_id(self, info_dict):
|
||||||
|
|
|
@ -224,4 +224,8 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
|
||||||
thumbnail_filename if converted or not self._already_have_thumbnail else None,
|
thumbnail_filename if converted or not self._already_have_thumbnail else None,
|
||||||
original_thumbnail if converted and not self._already_have_thumbnail else None,
|
original_thumbnail if converted and not self._already_have_thumbnail else None,
|
||||||
info=info)
|
info=info)
|
||||||
|
|
||||||
|
if not self._already_have_thumbnail:
|
||||||
|
info['thumbnails'][idx].pop('filepath', None)
|
||||||
|
|
||||||
return [], info
|
return [], info
|
||||||
|
|
|
@ -662,6 +662,10 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
|
||||||
self.run_ffmpeg_multiple_files(input_files, temp_filename, opts)
|
self.run_ffmpeg_multiple_files(input_files, temp_filename, opts)
|
||||||
os.replace(temp_filename, filename)
|
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
|
files_to_delete = [] if self._already_have_subtitle else sub_filenames
|
||||||
return files_to_delete, info
|
return files_to_delete, info
|
||||||
|
|
||||||
|
@ -698,6 +702,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
|
||||||
infojson_filename = info.get('infojson_filename')
|
infojson_filename = info.get('infojson_filename')
|
||||||
options.extend(self._get_infojson_opts(info, infojson_filename))
|
options.extend(self._get_infojson_opts(info, infojson_filename))
|
||||||
if not infojson_filename:
|
if not infojson_filename:
|
||||||
|
info.pop('infojson_filename', None)
|
||||||
files_to_delete.append(info.get('infojson_filename'))
|
files_to_delete.append(info.get('infojson_filename'))
|
||||||
elif self._add_infojson is True:
|
elif self._add_infojson is True:
|
||||||
self.to_screen('The info-json can only be attached to mkv/mka files')
|
self.to_screen('The info-json can only be attached to mkv/mka files')
|
||||||
|
|
Loading…
Reference in New Issue