mirror of https://github.com/yt-dlp/yt-dlp.git
Compare commits
4 Commits
5288fab7b6
...
cfd0dacc5d
Author | SHA1 | Date |
---|---|---|
Kieran | cfd0dacc5d | |
Kieran Eglin | 6c8ede8188 | |
Kieran Eglin | 3046c17822 | |
bashonly | 89f535e265 |
|
@ -53,7 +53,7 @@ jobs:
|
|||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
- name: Install test requirements
|
||||
run: python3 ./devscripts/install_deps.py --include dev --include curl_cffi
|
||||
run: python3 ./devscripts/install_deps.py --include dev --include curl-cffi
|
||||
- name: Run tests
|
||||
continue-on-error: False
|
||||
run: |
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -224,4 +224,8 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
|
|||
thumbnail_filename if converted or not self._already_have_thumbnail else None,
|
||||
original_thumbnail if converted and not self._already_have_thumbnail else None,
|
||||
info=info)
|
||||
|
||||
if not self._already_have_thumbnail:
|
||||
info['thumbnails'][idx].pop('filepath', None)
|
||||
|
||||
return [], info
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Reference in New Issue