[sponskrub] Run before embedding thumbnail
Workaround for https://github.com/faissaloo/SponSkrub/issues/29 Closes https://github.com/yt-dlp/yt-dlp/issues/204
This commit is contained in:
parent
cce889b900
commit
f4e4be19f0
1 changed files with 11 additions and 9 deletions
|
@ -368,15 +368,9 @@ def _real_main(argv=None):
|
||||||
# this was the old behaviour if only --all-sub was given.
|
# this was the old behaviour if only --all-sub was given.
|
||||||
if opts.allsubtitles and not opts.writeautomaticsub:
|
if opts.allsubtitles and not opts.writeautomaticsub:
|
||||||
opts.writesubtitles = True
|
opts.writesubtitles = True
|
||||||
if opts.embedthumbnail:
|
# This should be above EmbedThumbnail since sponskrub removes the thumbnail attachment
|
||||||
already_have_thumbnail = opts.writethumbnail or opts.write_all_thumbnails
|
# but must be below EmbedSubtitle and FFmpegMetadata
|
||||||
postprocessors.append({
|
# See https://github.com/yt-dlp/yt-dlp/issues/204 , https://github.com/faissaloo/SponSkrub/issues/29
|
||||||
'key': 'EmbedThumbnail',
|
|
||||||
'already_have_thumbnail': already_have_thumbnail
|
|
||||||
})
|
|
||||||
if not already_have_thumbnail:
|
|
||||||
opts.writethumbnail = True
|
|
||||||
# This should be below most ffmpeg PP because it may cut parts out from the video
|
|
||||||
# If opts.sponskrub is None, sponskrub is used, but it silently fails if the executable can't be found
|
# If opts.sponskrub is None, sponskrub is used, but it silently fails if the executable can't be found
|
||||||
if opts.sponskrub is not False:
|
if opts.sponskrub is not False:
|
||||||
postprocessors.append({
|
postprocessors.append({
|
||||||
|
@ -387,6 +381,14 @@ def _real_main(argv=None):
|
||||||
'force': opts.sponskrub_force,
|
'force': opts.sponskrub_force,
|
||||||
'ignoreerror': opts.sponskrub is None,
|
'ignoreerror': opts.sponskrub is None,
|
||||||
})
|
})
|
||||||
|
if opts.embedthumbnail:
|
||||||
|
already_have_thumbnail = opts.writethumbnail or opts.write_all_thumbnails
|
||||||
|
postprocessors.append({
|
||||||
|
'key': 'EmbedThumbnail',
|
||||||
|
'already_have_thumbnail': already_have_thumbnail
|
||||||
|
})
|
||||||
|
if not already_have_thumbnail:
|
||||||
|
opts.writethumbnail = True
|
||||||
if opts.split_chapters:
|
if opts.split_chapters:
|
||||||
postprocessors.append({'key': 'FFmpegSplitChapters'})
|
postprocessors.append({'key': 'FFmpegSplitChapters'})
|
||||||
# XAttrMetadataPP should be run after post-processors that may change file contents
|
# XAttrMetadataPP should be run after post-processors that may change file contents
|
||||||
|
|
Loading…
Reference in a new issue