-
Total comics
-
—
+
+
+
+
+
Generating thumbnails…
+
+ (0 / 0)
+
+
+
+ —
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+ window.addEventListener("beforeunload", ()=>{ Object.values(Chart.instances||{}).forEach(c=>{ try{c.destroy()}catch{}}); });
+
diff --git a/app/thumbs.py b/app/thumbs.py
index 1b49717..d9ce4ae 100644
--- a/app/thumbs.py
+++ b/app/thumbs.py
@@ -1,54 +1,155 @@
-import hashlib, re, io, zipfile
+# app/thumbs.py
+from __future__ import annotations
+
+import logging, warnings
from pathlib import Path
from typing import Optional
-from PIL import Image
+import hashlib
+import zipfile
+from PIL import Image, UnidentifiedImageError
-THUMB_DIR: Path = Path("/data/thumbs")
-THUMB_DIR.mkdir(parents=True, exist_ok=True)
+from .config import LIBRARY_DIR
-SAFE = re.compile(r"[^A-Za-z0-9._-]")
+logger = logging.getLogger("comicopds")
+warnings.simplefilter("ignore", UserWarning) # silence noisy EXIF warnings
+ERROR_LOG = Path("/data/thumbs_errors.log")
-def _sanitize(name: str) -> str:
- name = SAFE.sub("_", name).strip("._")
- return name[:128] or "unnamed"
+THUMBS_DIR = Path("/data/thumbs")
+THUMBS_DIR.mkdir(parents=True, exist_ok=True)
+# Keep consistent naming if we have a ComicVine issue id
def _thumb_name(rel: str, comicvine_issue: Optional[str]) -> str:
if comicvine_issue:
- return _sanitize(comicvine_issue) + ".jpg"
- return hashlib.sha1(rel.encode("utf-8")).hexdigest() + ".jpg"
+ safe = "".join(c for c in comicvine_issue if c.isalnum() or c in ("-", "_"))
+ if not safe:
+ safe = comicvine_issue
+ return f"{safe}.jpg"
+ # stable fallback by path hash
+ h = hashlib.sha1(rel.encode("utf-8")).hexdigest()
+ return f"{h}.jpg"
-def thumb_path(rel: str, comicvine_issue: Optional[str]) -> Path:
- return THUMB_DIR / _thumb_name(rel, comicvine_issue)
+def _cover_candidate_names():
+ # common cover file names (lowercased)
+ return (
+ "cover.jpg", "cover.jpeg", "cover.png", "000.jpg", "001.jpg", "0001.jpg", "1.jpg",
+ "front.jpg", "folder.jpg"
+ )
+
+def _choose_cover_name(names: list[str]) -> str:
+ # pick best candidate; otherwise first image by natural order
+ lower = {n.lower(): n for n in names}
+ for key in _cover_candidate_names():
+ if key in lower:
+ return lower[key]
+ # natural sort by numeric chunks
+ import re
+ def natkey(s: str):
+ return [int(t) if t.isdigit() else t.lower() for t in re.split(r"(\d+)", s)]
+ images = [n for n in names if not n.endswith("/")]
+ images.sort(key=natkey)
+ return images[0] if images else names[0]
+
+def _list_image_entries(zf: zipfile.ZipFile) -> list[str]:
+ valid = {".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".tif", ".tiff"}
+ return [n for n in zf.namelist() if Path(n).suffix.lower() in valid and not n.endswith("/")]
def have_thumb(rel: str, comicvine_issue: Optional[str]) -> Optional[Path]:
- p = thumb_path(rel, comicvine_issue)
+ p = THUMBS_DIR / _thumb_name(rel, comicvine_issue)
return p if p.exists() else None
-def _first_image_from_cbz(fp: Path) -> Optional[bytes]:
- try:
- with zipfile.ZipFile(fp, "r") as zf:
- names = sorted(zf.namelist())
- for n in names:
- ln = n.lower()
- if ln.endswith((".jpg", ".jpeg", ".png", ".webp")) and not ln.endswith("/"):
- with zf.open(n) as f:
- return f.read()
- except Exception:
- return None
- return None
+def _save_as_jpeg(src_img: Image.Image, dest: Path) -> Path:
+ im = src_img
+ if im.mode not in ("RGB", "L"):
+ im = im.convert("RGB")
+ elif im.mode == "L":
+ im = im.convert("RGB")
+ dest.parent.mkdir(parents=True, exist_ok=True)
+ # reasonable default size/quality; tweak if you wish
+ # resize if huge (e.g., keep max dimension ≈ 1200px to save space)
+ max_dim = 1200
+ w, h = im.size
+ if max(w, h) > max_dim:
+ if w >= h:
+ nh = int(h * (max_dim / float(w)))
+ im = im.resize((max_dim, nh))
+ else:
+ nw = int(w * (max_dim / float(h)))
+ im = im.resize((nw, max_dim))
+ im.save(dest, format="JPEG", quality=88, optimize=True)
+ return dest
-def generate_thumb(rel: str, abs_path: Path, comicvine_issue: Optional[str], size=(512, 512)) -> Optional[Path]:
- out = thumb_path(rel, comicvine_issue)
- out.parent.mkdir(parents=True, exist_ok=True)
+def generate_thumb(rel: str, abs_cbz_path: Path, comicvine_issue: Optional[str]) -> Optional[Path]:
+ """
+ Create the thumbnail if missing. Returns the path if it exists afterwards.
+ Logs errors to /data/thumbs_errors.log via _log_thumb_error().
+ """
+ out = THUMBS_DIR / _thumb_name(rel, comicvine_issue)
- img_bytes = _first_image_from_cbz(abs_path)
- if img_bytes is None:
- return None
-
- try:
- im = Image.open(io.BytesIO(img_bytes)).convert("RGB")
- im.thumbnail(size)
- im.save(out, "JPEG", quality=85)
+ # Already there?
+ if out.exists():
return out
- except Exception:
+
+ # Missing source
+ if not abs_cbz_path.exists() or not abs_cbz_path.is_file():
+ _log_thumb_error(rel, FileNotFoundError(f"CBZ not found: {abs_cbz_path}"))
return None
+
+ try:
+ with zipfile.ZipFile(abs_cbz_path, "r") as zf:
+ images = _list_image_entries(zf)
+ if not images:
+ _log_thumb_error(rel, RuntimeError("No image entries in archive"))
+ return None
+
+ cover_name = _choose_cover_name(images)
+ try:
+ with zf.open(cover_name) as fp:
+ try:
+ img = Image.open(fp)
+ # Force decode to catch truncated/corrupt images early
+ img.load()
+ except UnidentifiedImageError as e:
+ _log_thumb_error(rel, UnidentifiedImageError(f"Unidentified image: {cover_name}"))
+ return None
+ except Exception as e:
+ _log_thumb_error(rel, e)
+ return None
+
+ try:
+ return _save_as_jpeg(img, out)
+ except Exception as e:
+ _log_thumb_error(rel, e)
+ return None
+
+ except KeyError:
+ _log_thumb_error(rel, KeyError(f"Cover not found in zip: {cover_name}"))
+ return None
+
+ except zipfile.BadZipFile as e:
+ _log_thumb_error(rel, e)
+ return None
+ except Exception as e:
+ _log_thumb_error(rel, e)
+ return None
+
+def ensure_thumb(rel: str, comicvine_issue: Optional[str]) -> Optional[Path]:
+ """
+ Ensure a thumb exists (lazy). Uses LIBRARY_DIR and rel to find the CBZ.
+ """
+ existing = have_thumb(rel, comicvine_issue)
+ if existing:
+ return existing
+ abs_cbz = (LIBRARY_DIR / rel)
+ if abs_cbz.suffix.lower() != ".cbz":
+ return None
+ return generate_thumb(rel, abs_cbz, comicvine_issue)
+
+def _log_thumb_error(rel: str, err: Exception):
+ try:
+ msg = f"{rel}: {err}"
+ logger.warning(f"thumbnail error: {msg}")
+ ERROR_LOG.parent.mkdir(parents=True, exist_ok=True)
+ with ERROR_LOG.open("a", encoding="utf-8") as fp:
+ fp.write(msg + "\n")
+ except Exception:
+ pass
\ No newline at end of file