Update darkseid to v7

Author: Buried-In-Code

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.12.4
     hooks:
       - id: ruff-format
       - id: ruff-check

perdoo/comic.py

@@ -5,7 +5,13 @@
 from pathlib import Path
 from typing import Final, TypeVar
 
-from darkseid.archivers import Archiver, ArchiverFactory, ZipArchiver
+from darkseid.archivers import (
+    PY7ZR_AVAILABLE,
+    Archiver,
+    ArchiverFactory,
+    SevenZipArchiver,
+    ZipArchiver,
+)
 from darkseid.comic import (
     COMIC_RACK_FILENAME,
     METRON_INFO_FILENAME,
@@ -18,9 +24,6 @@
 from perdoo.metadata import ComicInfo, MetronInfo
 from perdoo.settings import Naming
 
-PY7ZR_AVAILABLE = False
-SevenZipArchiver = None
-
 LOGGER = logging.getLogger(__name__)
 T = TypeVar("T", bound=ComicInfo | MetronInfo)
 
@@ -112,7 +115,7 @@ def clean_archive(self) -> None:
                     filepath.name not in {COMIC_RACK_FILENAME, METRON_INFO_FILENAME}
                     and filepath.suffix.lower() not in SUPPORTED_IMAGE_EXTENSIONS
                 ):
-                    source.remove_file(archive_file=filename)
+                    source.remove_files(filename_list=[filename])
                     LOGGER.info("Removed '%s' from '%s'", filename, source.path.name)
 
     def write_metadata(self, metadata: ComicInfo | MetronInfo | None) -> None:
@@ -151,7 +154,7 @@ def _rename_images(self, base_name: str) -> None:
                 if new_file.stem != img_file.stem:
                     LOGGER.info("Renaming '%s' to '%s'", img_file.stem, new_file.stem)
                     file_contents = source.read_file(archive_file=filename)
-                    source.remove_file(archive_file=filename)
+                    source.remove_files(filename_list=[filename])
                     source.write_file(archive_file=new_file.name, data=file_contents)
 
     def rename(self, naming: Naming, output_folder: Path) -> None:

pyproject.toml

@@ -9,7 +9,7 @@ dev = [
 tests = [
   "pytest >= 8.4.1",
   "pytest-cov >= 6.2.1",
-  "tox >= 4.27.0",
+  "tox >= 4.28.0",
   "tox-uv >= 1.26.1"
 ]
 
@@ -35,16 +35,16 @@ classifiers = [
 ]
 dependencies = [
   "comicfn2dict >= 0.2.5",
-  "darkseid >= 6.0.0",
+  "darkseid >= 7.0.0",
   "esak >= 2.0.0",
   "lxml >= 6.0.0",
   "mokkari >= 3.13.0",
   "natsort >= 8.4.0",
-  "pillow >= 10.4.0",
+  "pillow >= 11.3.0",
   "pydantic >= 2.11.7",
   "pydantic-xml >= 2.17.3",
   "rich >= 14.0.0",
-  "simyan >= 1.5.0",
+  "simyan >= 1.5.1",
   "tomli >= 2.2.1 ; python_version < '3.11'",
   "tomli-w >= 1.2.0",
   "typer >= 0.16.0",
@@ -59,7 +59,7 @@ requires-python = ">= 3.10"
 
 [project.optional-dependencies]
 cb7 = [
-  "darkseid[7zip] >= 6.0.0"
+  "darkseid[7zip] >= 7.0.0"
 ]
 
 [project.scripts]

tests/comic_test.py

@@ -42,10 +42,11 @@ 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"]
     )
-    cbz_comic._archiver.remove_file = MagicMock()  # noqa: SLF001
+    cbz_comic._archiver.remove_files = MagicMock()  # noqa: SLF001
 
     cbz_comic.clean_archive()
-    cbz_comic._archiver.remove_file.assert_called_once_with(archive_file="info.txt")  # noqa: SLF001
+    cbz_comic._archiver.remove_files.assert_called_once()  # noqa: SLF001
+    cbz_comic._archiver.remove_files.assert_called_once_with(filename_list=["info.txt"])  # noqa: SLF001
 
 
 def test_write_comicinfo(cbz_comic: Comic, comic_info: ComicInfo) -> None: