mirror of
https://github.com/denizsafak/abogen.git
synced 2026-07-22 07:10:28 +02:00
refactor: delete redundant _prepare_project_layout wrapper
resolve_project_layout() from domain already handles mkdir. Callers now use the domain function directly. Tests: 1253 passed
This commit is contained in:
@@ -323,7 +323,11 @@ def run_conversion_job(job: Job) -> None:
|
||||
_apply_newline_policy(extraction.chapters, job.replace_single_newlines)
|
||||
|
||||
base_output_dir = _prepare_output_dir(job)
|
||||
project_root, audio_dir, subtitle_dir, metadata_dir = _prepare_project_layout(job, base_output_dir)
|
||||
project_root, audio_dir, subtitle_dir, metadata_dir = _resolve_project_layout(
|
||||
original_filename=job.original_filename,
|
||||
save_as_project=job.save_as_project,
|
||||
base_dir=base_output_dir,
|
||||
)
|
||||
|
||||
if job.output_format.lower() == "m4b" and not job.merge_chapters_at_end:
|
||||
job.add_log(
|
||||
@@ -1018,16 +1022,6 @@ def _prepare_output_dir(job: Job) -> Path:
|
||||
return directory
|
||||
|
||||
|
||||
def _prepare_project_layout(job: Job, base_dir: Path) -> tuple[Path, Path, Path, Optional[Path]]:
|
||||
base_dir.mkdir(parents=True, exist_ok=True)
|
||||
return _resolve_project_layout(
|
||||
original_filename=job.original_filename,
|
||||
save_as_project=job.save_as_project,
|
||||
base_dir=base_dir,
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
def _make_canceller(job: Job) -> Callable[[], None]:
|
||||
def _cancel() -> None:
|
||||
|
||||
Reference in New Issue
Block a user