mirror of
https://github.com/denizsafak/abogen.git
synced 2026-11-19 01:00:54 +01:00
fix(output): use collision-free merged path so repeat conversions don't overwrite
resolve_output_layout computed a unique base name via resolve_unique_path but discarded it, and the executor rebuilt the merged audio path from the raw base name. Converting the same book twice silently overwrote the previous audiobook (and its subtitles, which derive from the audio path). - store the unique path in OutputLayout.merged_path (checked against the directory the audio is actually written to) - make resolve_merged_path prefer layout.merged_path - have the executor use resolve_merged_path instead of its own _base_name - add a regression test Fixes #203
This commit is contained in:
1 parent
08e2ee8b85
commit
08acd8e8fd
3 files changed
+34
-16
No files matched your search
@@ -24,6 +24,7 @@ from abogen.application.conversion_ports import (
|
||||
VoiceResolver,
|
||||
)
|
||||
from abogen.application.conversion_result import ConversionResult
|
||||
from abogen.application.output_layout_service import resolve_merged_path
|
||||
from abogen.domain.audio_sink import open_audio_sink
|
||||
from abogen.domain.conversion_engine import (
|
||||
SegmentStats,
|
||||
@@ -229,7 +230,7 @@ def execute_conversion(
|
||||
audio_sink: Optional[AudioSink] = None
|
||||
audio_path = None
|
||||
if merge_chapters:
|
||||
audio_path = output_layout.audio_dir / f"{_base_name(request)}{request.output_format.dot_ext}"
|
||||
audio_path = resolve_merged_path(output_layout, request)
|
||||
meta = plan.metadata if plan.metadata else None
|
||||
audio_sink = stack.enter_context(
|
||||
open_audio_sink(
|
||||
@@ -622,15 +623,6 @@ def _resolve_voice(
|
||||
)
|
||||
|
||||
|
||||
def _base_name(request: Any) -> str:
|
||||
"""Get base name for output file."""
|
||||
from abogen.domain.output_paths import sanitize_output_stem
|
||||
|
||||
if request.original_filename:
|
||||
return sanitize_output_stem(request.original_filename)
|
||||
return "output"
|
||||
|
||||
|
||||
def _format_heading(title: str, index: int, request: Any) -> str:
|
||||
"""Format chapter heading for TTS."""
|
||||
from abogen.domain.chapter_titles import format_spoken_chapter_title
|
||||
|
||||
@@ -54,12 +54,6 @@ def resolve_output_layout(request: ConversionRequest) -> OutputLayout:
|
||||
else:
|
||||
base_name = "output"
|
||||
|
||||
# Find unique output path
|
||||
allowed_exts = {request.output_format, SubtitleFormat.SRT, SubtitleFormat.ASS, "vtt", "mp4", OutputFormat.M4B}
|
||||
unique_base = resolve_unique_path(
|
||||
parent_dir, base_name, "", allowed_extensions=allowed_exts
|
||||
)
|
||||
|
||||
# Resolve project layout
|
||||
project_root = None
|
||||
audio_dir = parent_dir
|
||||
@@ -73,8 +67,15 @@ def resolve_output_layout(request: ConversionRequest) -> OutputLayout:
|
||||
base_dir=parent_dir,
|
||||
)
|
||||
|
||||
# Find unique output path so repeat conversions don't overwrite prior outputs
|
||||
allowed_exts = {request.output_format, SubtitleFormat.SRT, SubtitleFormat.ASS, "vtt", "mp4", OutputFormat.M4B}
|
||||
unique_base = resolve_unique_path(
|
||||
audio_dir, base_name, "", allowed_extensions=allowed_exts
|
||||
)
|
||||
|
||||
return OutputLayout(
|
||||
parent_dir=parent_dir,
|
||||
merged_path=Path(f"{unique_base}{request.output_format.dot_ext}"),
|
||||
project_root=project_root,
|
||||
audio_dir=audio_dir,
|
||||
subtitle_dir=subtitle_dir,
|
||||
@@ -95,6 +96,8 @@ def resolve_merged_path(
|
||||
Returns:
|
||||
Path to the merged output file
|
||||
"""
|
||||
if layout.merged_path is not None:
|
||||
return layout.merged_path
|
||||
base_name = sanitize_output_stem(
|
||||
request.original_filename or "output"
|
||||
)
|
||||
|
||||
@@ -379,6 +379,29 @@ class TestOutputLayoutService:
|
||||
assert path.name == "book.wav"
|
||||
assert path.parent == Path(tmpdir)
|
||||
|
||||
def test_resolve_merged_path_avoids_overwriting_existing_output(self):
|
||||
"""Repeat conversions get a unique merged path instead of overwriting."""
|
||||
from abogen.application.output_layout_service import (
|
||||
resolve_merged_path,
|
||||
resolve_output_layout,
|
||||
)
|
||||
|
||||
with tempfile.TemporaryDirectory() as tmpdir:
|
||||
existing = Path(tmpdir) / "book.wav"
|
||||
existing.write_bytes(b"previous output")
|
||||
req = ConversionRequest(
|
||||
direct_text="Hello",
|
||||
voice="M1",
|
||||
save=SaveConfig(mode="custom_folder", output_folder=Path(tmpdir)),
|
||||
original_filename="book.wav",
|
||||
output_format="wav",
|
||||
)
|
||||
layout = resolve_output_layout(req)
|
||||
path = resolve_merged_path(layout, req)
|
||||
|
||||
assert path == Path(tmpdir) / "book_2.wav"
|
||||
assert layout.merged_path == path
|
||||
|
||||
def test_resolve_chapter_path(self):
|
||||
"""Resolve chapter output path."""
|
||||
from abogen.application.output_layout_service import resolve_chapter_path
|
||||
|
||||
Reference in new issue
Block a user