fix(ffmpeg_handling): change folder handling and overwrite function

get video files from fideo_files() function
choose correct filenames fi suffix changes for overwrite
overwrite files for convert-av ffmpeg
This commit is contained in:
lucas committed 2026-11-09 20:16:32 +01:00
1 parent e24f9f3464
commit c415bc10c6
1 file changed
+21 -17
+21 -17
View File
@@ -137,6 +137,13 @@ def is_russian_track(track: dict) -> bool:
return descr or lang or language return descr or lang or language
def video_files(path: Path, recursive: bool):
iterator = path.rglob("*") if recursive else path.iterdir()
yield from (
p for p in iterator if p.is_file() and p.suffix.lower() in VIDEO_SUFFIXES
)
class ArgsBuffer: class ArgsBuffer:
input: Path | None = None input: Path | None = None
output: Path | None = None output: Path | None = None
@@ -209,7 +216,7 @@ def move_overwrite_file(files_move_from, files_move_to, args):
backup_files = args.backup backup_files = args.backup
silent = not args.loud silent = not args.loud
for file_to, file_from in zip(files_move_to, files_move_from): for file_to, file_from in zip(files_move_to, files_move_from):
if not file_to.is_file(): if not file_to.is_file() and not hasattr(args, "new_suffix"):
logger.error(f"overwrite Target File does not exist: {file_to}") logger.error(f"overwrite Target File does not exist: {file_to}")
return False return False
@@ -464,6 +471,7 @@ def cmd_convert_av(args):
logger.debug(f"Convert Audio/Video for {args.input} -> {output}") logger.debug(f"Convert Audio/Video for {args.input} -> {output}")
cmd = [ cmd = [
"ffmpeg", "ffmpeg",
"-y",
"-i", "-i",
str(args.input), str(args.input),
"-map", "-map",
@@ -488,6 +496,8 @@ def cmd_convert_av(args):
check=False, check=False,
capture_output=True, capture_output=True,
text=True, text=True,
encoding="utf-8",
errors="replace",
) )
return result.returncode == 0, "nooutputneeded" return result.returncode == 0, "nooutputneeded"
@@ -1960,11 +1970,11 @@ def main():
parents=[base_p], parents=[base_p],
) )
p.add_argument("suffix", type=str)
p.add_argument("--video-codec", default="libx264") p.add_argument("--video-codec", default="libx264")
p.add_argument("--audio-codec", default="aac") p.add_argument("--audio-codec", default="aac")
p.add_argument("--preset", default="slow") p.add_argument("--preset", default="slow")
p.add_argument("--quality", type=int) p.add_argument("--quality", type=int)
p.add_argument("--suffix", type=str)
p.add_argument("--new-suffix", type=str) p.add_argument("--new-suffix", type=str)
# ========================================================= # =========================================================
@@ -2285,24 +2295,12 @@ def main():
if input_path.is_dir(): if input_path.is_dir():
counter = 0 counter = 0
logger.info(f"Processing dir: {input_path}") logger.info(f"Processing dir: {input_path}")
if args.recursive:
sorted_files = sorted( sorted_files = sorted(
( video_files(input_path, args.recursive),
p
for p in input_path.rglob("*")
if p.is_file() and p.suffix.lower() in VIDEO_SUFFIXES
),
key=natural_sort_key,
)
else:
sorted_files = sorted(
(
p
for p in input_path.iterdir()
if p.is_file() and p.suffix.lower() in VIDEO_SUFFIXES
),
key=natural_sort_key, key=natural_sort_key,
) )
for file in sorted_files: for file in sorted_files:
if ( if (
file.suffix.lower() not in VIDEO_SUFFIXES file.suffix.lower() not in VIDEO_SUFFIXES
@@ -2323,6 +2321,12 @@ def main():
if output_str != "nooutputneeded": if output_str != "nooutputneeded":
outputs.append(output_str) outputs.append(output_str)
if args.overwrite and return_value: if args.overwrite and return_value:
if hasattr(args, "new_suffix") and args.new_suffix:
out_path = file.with_name(
f"{file.stem}_overwrite{args.new_suffix}"
)
safe_delete(file, logger)
file = file.with_suffix(args.new_suffix)
files_move_from.append(out_path) files_move_from.append(out_path)
files_move_to.append(file) files_move_to.append(file)
counter += 1 counter += 1