Fix file sorting

Author: Buried-In-Code

.pre-commit-config.yaml

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

perdoo/comic/archive/session.py

@@ -34,7 +34,8 @@ def __enter__(self) -> Self:
         self._temp_dir = TemporaryDirectory()
         self._folder = Path(self._temp_dir.name)
         with CONSOLE.status(
-            f"Extracting {self._archive.filepath} to {self._folder}", spinner="simpleDotsScrolling"
+            f"Extracting '{self._archive.filepath}' to '{self._folder}'",
+            spinner="simpleDotsScrolling",
         ):
             self._archive.extract_files(destination=self._folder)
         self._extracted = True
@@ -50,7 +51,7 @@ def __exit__(
         try:
             if exc_type is None and self._extracted and self.updated:
                 with CONSOLE.status(
-                    f"Archiving {self._folder} to {self._archive.filepath}",
+                    f"Archiving '{self._folder}' to '{self._archive.filepath}'",
                     spinner="simpleDotsScrolling",
                 ):
                     filepath = self._archive.archive_files(
@@ -80,20 +81,21 @@ def read(self, filename: str) -> bytes:
         return (self._folder / filename).read_bytes()
 
     def write(self, filename: str, data: bytes) -> None:
+        LOGGER.info("Writing '%s'", filename)
         if self._archive.IS_EDITABLE:
             self._archive.write_file(filename, data)
         else:
             (self._folder / filename).write_bytes(data)
 
     def remove(self, filename: str) -> None:
-        LOGGER.info("Removing %s", filename)
+        LOGGER.info("Removing '%s'", filename)
         if self._archive.IS_EDITABLE:
             self._archive.remove_file(filename)
         else:
             (self._folder / filename).unlink(missing_ok=True)
 
     def rename(self, old_name: str, new_name: str) -> None:
-        LOGGER.info("Renaming %s to %s", old_name, new_name)
+        LOGGER.info("Renaming '%s' to '%s'", old_name, new_name)
         if self._archive.IS_EDITABLE:
             self._archive.rename_file(old_name=old_name, new_name=new_name)
         else:

perdoo/comic/comic.py

@@ -5,6 +5,8 @@
 from pathlib import Path
 from typing import Final, Literal
 
+from natsort import humansorted, ns
+
 from perdoo.comic.archive import Archive, CB7Archive, CBTArchive, CBZArchive
 from perdoo.comic.archive.session import ArchiveSession
 from perdoo.comic.metadata import ComicInfo, MetronInfo
@@ -47,18 +49,25 @@ def read_metadata(self, session: ArchiveSession) -> tuple[MetronInfo | None, Com
         return metroninfo, comicinfo
 
     def list_images(self) -> list[Path]:
-        return [
-            Path(name)
-            for name in self.archive.list_filenames()
-            if Path(name).suffix.lower() in IMAGE_EXTENSIONS
-        ]
+        return humansorted(
+            [
+                Path(name)
+                for name in self.archive.list_filenames()
+                if Path(name).suffix.lower() in IMAGE_EXTENSIONS
+            ],
+            alg=ns.NA | ns.G | ns.P,
+        )
 
     def list_extras(self) -> list[Path]:
-        return [
-            Path(name)
-            for name in self.archive.list_filenames()
-            if name not in METADATA_FILENAMES and Path(name).suffix.lower() not in IMAGE_EXTENSIONS
-        ]
+        return humansorted(
+            [
+                Path(name)
+                for name in self.archive.list_filenames()
+                if name not in METADATA_FILENAMES
+                and Path(name).suffix.lower() not in IMAGE_EXTENSIONS
+            ],
+            alg=ns.NA | ns.G | ns.P,
+        )
 
     def validate_naming(self, naming: str) -> bool:
         template = Path(naming).stem