Reimplement cbt export

Author: Buried-In-Code

.github/workflows/publishing.yaml

@@ -5,13 +5,15 @@ on: push
 jobs:
   build:
     name: Build
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
       - name: Install pypa/build
         run: pip install build
       - name: Build a binary wheel and a source tarball
@@ -22,16 +24,17 @@ jobs:
           path: dist/
 
   publish-to-pypi:
-    name: Publish to PyPI
     if: startsWith(github.ref, 'refs/tags/')
     needs:
       - build
-    runs-on: ubuntu-latest
+
     environment:
       name: pypi
       url: https://pypi.org/p/perdoo
+    name: Publish to PyPI
     permissions:
       id-token: write
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/download-artifact@v4

.github/workflows/testing.yaml

@@ -30,20 +30,29 @@ jobs:
           - ubuntu-latest
           - macos-latest
           - windows-latest
+
+    permissions:
+      contents: read
     runs-on: ${{ matrix.os }}
+
     steps:
       - uses: actions/checkout@v4
       - uses: astral-sh/setup-uv@v6
       - name: Setup Python
         run: uv python install ${{ matrix.python-version }}
       - name: Install project
-        run: uv sync --group tests
+        run: uv sync --all-extras --group tests
       - name: Run tests
         run: uv run pytest
+
   collector:
-    needs: [pytest]
     if: always()
+    needs:
+      - pytest
+
+    permissions: { }
     runs-on: ubuntu-latest
+
     steps:
       - name: Check for failures
         if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')

perdoo/__main__.py

@@ -6,12 +6,11 @@
 from typing import Annotated
 
 from comicfn2dict import comicfn2dict
-from darkseid.comic import SUPPORTED_IMAGE_EXTENSIONS
 from typer import Argument, Context, Exit, Option, Typer
 
 from perdoo import __version__, get_cache_root, setup_logging
 from perdoo.cli import archive_app, settings_app
-from perdoo.comic import Comic, ComicArchiveError, ComicMetadataError
+from perdoo.comic import SUPPORTED_IMAGE_EXTENSIONS, Comic, ComicArchiveError, ComicMetadataError
 from perdoo.console import CONSOLE
 from perdoo.metadata import ComicInfo, MetronInfo
 from perdoo.metadata.comic_info import Page
@@ -244,8 +243,10 @@ def run(
             style="subtitle",
         )
         if not skip_convert:
-            with CONSOLE.status("Converting to 'CBZ'", spinner="simpleDotsScrolling"):
-                entry.convert_to_cbz()
+            with CONSOLE.status(
+                f"Converting to '{settings.output.format}'", spinner="simpleDotsScrolling"
+            ):
+                entry.convert(extension=settings.output.format)
 
         metadata: tuple[MetronInfo | None, ComicInfo | None] = (entry.metron_info, entry.comic_info)
 

perdoo/comic.py

@@ -1,15 +1,22 @@
-__all__ = ["Comic", "ComicArchiveError", "ComicMetadataError", "MetadataFormat"]
+__all__ = [
+    "SUPPORTED_IMAGE_EXTENSIONS",
+    "Comic",
+    "ComicArchiveError",
+    "ComicMetadataError",
+    "MetadataFormat",
+]
 
 import logging
 import shutil
 from pathlib import Path
-from typing import Final, TypeVar
+from typing import Final, Literal, TypeVar
 
 from darkseid.archivers import (
     PY7ZR_AVAILABLE,
     Archiver,
     ArchiverFactory,
     SevenZipArchiver,
+    TarArchiver,
     ZipArchiver,
 )
 from darkseid.comic import (
@@ -98,11 +105,15 @@ def read_metadata(self, metadata_format: MetadataFormat) -> None:
         else:
             raise ComicMetadataError(f"Unsupported metadata format: {metadata_format}")
 
-    def convert_to_cbz(self) -> None:
-        if self.is_cbz():
+    def convert(self, extension: Literal["cbt", "cbz"]) -> None:
+        check, archiver = {
+            "cbt": (self.is_cbt, TarArchiver),
+            "cbz": (self.is_cbz, ZipArchiver),
+        }.get(extension)
+        if check():
             return
-        output_file = self.path.with_suffix(".cbz")
-        with self.archive as source, ZipArchiver(path=output_file) as destination:
+        output_file = self.path.with_suffix(f".{extension}")
+        with self.archive as source, archiver(path=output_file) as destination:
             LOGGER.debug("Converting '%s' to '%s'", source.path.name, destination.path.name)
             if destination.copy_from_archive(other_archive=source):
                 self._archiver = destination
@@ -176,7 +187,7 @@ def rename(self, naming: Naming, output_folder: Path) -> None:
             "Renaming '%s' to '%s'", self.path.name, output.relative_to(output_folder.parent)
         )
         shutil.move(self.path, output)
-        self._archiver = ZipArchiver(path=output)
+        self.archive._path = output  # noqa: SLF001
 
         new_filename = self.path.stem
         if all(

perdoo/settings.py

@@ -13,7 +13,7 @@
 
 from enum import Enum
 from pathlib import Path
-from typing import Annotated, Any, ClassVar
+from typing import Annotated, Any, ClassVar, Literal
 
 import tomli_w as tomlwriter
 from pydantic import BeforeValidator
@@ -74,6 +74,7 @@ class Naming(SettingsModel):
 class Output(SettingsModel):
     comic_info: ComicInfo = ComicInfo()
     folder: Path = get_data_root()
+    format: Literal["cbt", "cbz"] = "cbz"
     metron_info: MetronInfo = MetronInfo()
     naming: Naming = Naming()
 

tests/comic_test.py

@@ -34,10 +34,15 @@ def comic_info() -> ComicInfo:
 
 
 def test_convert_to_cbz(cbt_comic: Comic) -> None:
-    cbt_comic.convert_to_cbz()
+    cbt_comic.convert(extension="cbz")
     assert cbt_comic.path.suffix == ".cbz"
 
 
+def test_convert_to_cbt(cbz_comic: Comic) -> None:
+    cbz_comic.convert(extension="cbt")
+    assert cbz_comic.path.suffix == ".cbt"
+
+
 def test_clean_archive(cbz_comic: Comic) -> None:
     cbz_comic._archiver.get_filename_list = MagicMock(  # noqa: SLF001
         return_value=["image1.jpg", "info.txt", "ComicInfo.xml", "cover.png"]