Compare commits

...

4 Commits

Author SHA1 Message Date
Kieran cfd0dacc5d
Merge 6c8ede8188 into 89f535e265 2024-04-26 23:17:03 +00:00
Kieran Eglin 6c8ede8188
Fixed embedding filepath issue for subs and infojson 2024-04-26 16:16:56 -07:00
Kieran Eglin 3046c17822
Fixed filepath bug when embedding thumbnails 2024-04-26 15:51:37 -07:00
bashonly 89f535e265
[ci] Fix `curl-cffi` installation (Bugfix for 02483bea1c)
Authored by: bashonly
2024-04-22 20:36:01 +00:00
4 changed files with 11 additions and 2 deletions

View File

@ -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: |

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

@ -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

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')