Improve the display order algorithm

Author: URenko

comiclib/main.py

@@ -3,7 +3,7 @@
 
 from .scan import watch, scannow
 from .config import settings
-from .utils import is_image, extract_thumbnail, convert_image, ArchiveFile
+from .utils import is_image, extract_thumbnail, convert_image, ArchiveFile, ordered
 from typing import Union, Annotated
 from enum import Enum
 from pathlib import Path
@@ -285,10 +285,10 @@ def extract_archive(id: str, force: bool = True, db: Session = Depends(get_db)):
         return JSONResponse({"operation": "", "error": "This ID doesn't exist on the server.", "success": 0}, status.HTTP_400_BAD_REQUEST)
     path = Path(settings.content) / a.path
     if path.is_dir():
-        pages = [f"./api/archives/{id}/page?path="+quote(p.name, safe='') for p in sorted(path.iterdir()) if is_image(p)]
+        pages = [f"./api/archives/{id}/page?path="+quote(p.name, safe='') for p in ordered(path.iterdir()) if is_image(p)]
     elif ArchiveFile.support_formats.fullmatch(path.name):
         with ArchiveFile(path) as z:
-            pages = [f"./api/archives/{id}/page?path="+quote(filename, safe='') for filename in sorted(map(lambda z_info: z_info.filename, filter(lambda z_info: not z_info.is_dir() and is_image(z_info.filename), z.infolist())))]
+            pages = [f"./api/archives/{id}/page?path="+quote(filename, safe='') for filename in ordered(map(lambda z_info: z_info.filename, filter(lambda z_info: not z_info.is_dir() and is_image(z_info.filename), z.infolist())))]
     else:
         raise NotImplementedError
     return {"job": -1, "pages": pages}

comiclib/utils.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Union, Iterable
 from pathlib import Path
 from zipfile import ZipFile
 import io
@@ -21,6 +21,16 @@
 from .config import settings
 
 
+def ordered(iterable: Iterable[str]) -> list[str]:
+    unsorted = tuple(iterable)
+    try:
+        unsorted_path = tuple(Path(s) for s in unsorted)
+        if any(unsorted_path[0].parent != p.parent for p in unsorted_path[1:]):
+            raise ValueError
+        return sorted(unsorted, key=lambda s: int(Path(s).stem))
+    except ValueError:
+        return sorted(unsorted)
+
 mimetypes.add_type('image/jxl', '.jxl')
 def is_image(p: Union[str, Path]):
     if Path(p).parts[0] == '__MACOSX': return False
@@ -53,10 +63,10 @@ def extract_thumbnail(path: Union[str, Path], id: str, page: int, cache=False, c
         return saveto.relative_to(settings.thumb)
     saveto.parent.mkdir(parents=True, exist_ok=True)
     if path.is_dir():
-        convert_image(sorted(filter(is_image, path.iterdir()))[page-1], saveto, thumbnail=True)
+        convert_image(ordered(filter(is_image, path.iterdir()))[page-1], saveto, thumbnail=True)
     elif ArchiveFile.support_formats.fullmatch(path.name):
         with ArchiveFile(path) as z:
-            with z.open(sorted(map(lambda z_info: z_info.filename, filter(lambda z_info: not z_info.is_dir() and is_image(z_info.filename), z.infolist())))[page-1]) as f:
+            with z.open(ordered(map(lambda z_info: z_info.filename, filter(lambda z_info: not z_info.is_dir() and is_image(z_info.filename), z.infolist())))[page-1]) as f:
                 convert_image(f, saveto, thumbnail=True)
     else:
         raise NotImplementedError