hoelee/tubesync
1
0
Fork 0
mirror of https://github.com/meeb/tubesync.git synced 2025-06-24 22:16:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'meeb:main' into patch-6

Browse Source
This commit is contained in:
tcely 2025-04-23 12:15:55 -04:00 committed by GitHub
commit 77bbce5aec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tubesync/sync/youtube.py
View File

@ -20,7 +20,7 @@ from .utils import mkdir_p
import yt_dlp import yt_dlp
import yt_dlp.patch.check_thumbnails import yt_dlp.patch.check_thumbnails
import yt_dlp.patch.fatal_http_errors import yt_dlp.patch.fatal_http_errors
from yt_dlp.utils import remove_end, OUTTMPL_TYPES from yt_dlp.utils import remove_end, shell_quote, OUTTMPL_TYPES
_defaults = getattr(settings, 'YOUTUBE_DEFAULTS', {}) _defaults = getattr(settings, 'YOUTUBE_DEFAULTS', {})
@ -314,9 +314,31 @@ def download_media(
if extension in audio_exts: if extension in audio_exts:
pp_opts.extractaudio = True pp_opts.extractaudio = True
pp_opts.nopostoverwrites = False pp_opts.nopostoverwrites = False
# The ExtractAudio post processor can change the extension.
# This post processor is to change the final filename back
# to what we are expecting it to be.
final_path = Path(output_file)
try:
final_path = final_path.resolve(strict=True)
except FileNotFoundError:
# This is very likely the common case
final_path = Path(output_file).resolve(strict=False)
expected_file = shell_quote(str(final_path))
cmds = pp_opts.exec_cmd.get('after_move', list())
# It is important that we use a tuple for strings.
# Otherwise, list adds each character instead.
# That last comma is really necessary!
cmds += (
f'test -f {expected_file} || '
'mv -T -u -- %(filepath,_filename|)q '
f'{expected_file}',
)
# assignment is the quickest way to cover both 'get' cases
pp_opts.exec_cmd['after_move'] = cmds
ytopts = { ytopts = {
'format': media_format, 'format': media_format,
'final_ext': extension,
'merge_output_format': extension, 'merge_output_format': extension,
'outtmpl': os.path.basename(output_file), 'outtmpl': os.path.basename(output_file),
'quiet': False if settings.DEBUG else True, 'quiet': False if settings.DEBUG else True,
@ -381,6 +403,15 @@ def download_media(
'modifychapters+ffmpeg': codec_options, 'modifychapters+ffmpeg': codec_options,
}) })
# Provide the user control of 'overwrites' in the post processors.
pp_opts.overwrites = opts.get(
'overwrites',
ytopts.get(
'overwrites',
default_opts.overwrites,
),
)
# Create the post processors list. # Create the post processors list.
# It already included user configured post processors as well. # It already included user configured post processors as well.
ytopts['postprocessors'] = list(yt_dlp.get_postprocessors(pp_opts)) ytopts['postprocessors'] = list(yt_dlp.get_postprocessors(pp_opts))