diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 47429de..a483f03 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.1 + rev: v0.5.2 hooks: - id: ruff-format - id: ruff diff --git a/perdoo/__main__.py b/perdoo/__main__.py index c96cece..39763a3 100644 --- a/perdoo/__main__.py +++ b/perdoo/__main__.py @@ -322,9 +322,7 @@ def start(settings: Settings, force: bool = False) -> None: metadata, metron_info, comic_info = fetch_from_services(settings=settings, details=details) new_file = generate_filename( - root=settings.output_folder, - extension=settings.output.format.value, - metadata=metadata, + root=settings.output_folder, extension=settings.output.format.value, metadata=metadata ) with TemporaryDirectory(prefix=f"{new_file.stem}_") as temp_str: temp_folder = Path(temp_str) @@ -359,12 +357,9 @@ def start(settings: Settings, force: bool = False) -> None: continue archive.path.unlink(missing_ok=True) shutil.move(archive_file, archive.path) - if file.relative_to(settings.input_folder) != new_file.relative_to( - settings.output_folder - ): + if file.relative_to(settings.input_folder) != new_file.relative_to(settings.output_folder): LOGGER.info( - "Organizing comic, moving file to %s", - new_file.relative_to(settings.output_folder), + "Organizing comic, moving file to %s", new_file.relative_to(settings.output_folder) ) new_file.parent.mkdir(parents=True, exist_ok=True) shutil.move(file, new_file) diff --git a/perdoo/models/metron_info.py b/perdoo/models/metron_info.py index 271118c..8e5aaf3 100644 --- a/perdoo/models/metron_info.py +++ b/perdoo/models/metron_info.py @@ -11,6 +11,7 @@ "InformationList", "InformationSource", "MetronInfo", + "Page", "Price", "Resource", "Role", diff --git a/perdoo/settings.py b/perdoo/settings.py index 8a7684c..019ff5b 100644 --- a/perdoo/settings.py +++ b/perdoo/settings.py @@ -7,6 +7,7 @@ "Metron", "OutputFormat", "Output", + "Service", "Settings", ]