* refactor(thumbnails): one resolver for where previews live on disk (#320) Add py/api/preview_store.py: the store of a source, a preview's path, URL parts to disk, containment (owns), a write generation and the lock around every preview's final rename. Every preview reader, writer and remover now asks it instead of joining <source>/thumbnails by hand: serve, on-demand, capture (its path resolved when the write starts), the after-scan queue, the thumbnail plans and job payloads, clear, the temp sweep, History covers, the auto-tag listing and the owned-preview lookups. Source mode only: every path is the one built before, so nothing changes on disk or on the wire. A structural test keeps new thumbnails joins out of the backend. * refactor(thumbnails): keep the after-scan queue's store rule and pin the write lock (#320) A planned target keeps the plan's own containment rule (inside the store, as the thumbnail job writes it); captures keep the serve rule. The structural test also covers PREVIEW_FOLDER joins and the repo-root modules; the write-lock test asserts the lock instead of waiting on a timer; new tests cover nested roots in the after-scan queue and a legacy upper-case preview served through the resolver. * feat(thumbnails): keep previews in one folder, set from config.json (#320) thumbnails.location in config.json can now name one folder for every source's previews: <folder>/<source key>/<rel>_thumb<ext>. A source key is a readable slug plus a short hash of the source's identity, stored in the folder's marker (.promptmanager-thumbnails.json) with the install that made it. Serving, on-demand and capture writes, listings, clear, delete, duplicates, the temp sweep and History covers all follow it; a leftover in <source>/thumbnails is never served and other text under thumbnails/ is refused. A missing, unplugged or foreign folder is unavailable (a probe checks it every 5 s within 2 s; a stalled or failing store call flips it at once): originals are served, nothing is written anywhere, the folder is never re-created, and generate, convert and clear answer 409 location-unavailable. A bad config value is unavailable too, never a fall-back to the sources. No UI yet: POST /settings refuses thumbnail_location (409 location-needs-move); GET /settings reports it with its path, the thumbnail status without one. Sources inside or around the folder and a library move into it are refused. * fix(thumbnails): never follow a marker or a link out of the thumbnail folder (#320) Marker keys are data, not paths: only a single <slug>-<hex> folder name is ever joined onto the thumbnail folder; anything else is dropped and logged. Every preview write and delete passes one ownership check (below a key folder, lexically and resolved, no link, junction or reparse point on the way); make_parent refuses anything else and writes nothing while the folder lacks this install's marker (an unmounted mount point). Clear never descends into a junction. The configured location is in force before any request (unchecked folder mode is unavailable), and a startup check that fails leaves it invalid, never the sources. Older listings that run on the event loop no longer touch the store in folder mode. A leftover under another case of thumbnails/ on a case-insensitive disk is refused too. * test(memory): let the musl test fake os.confstr on Windows (#523) The portability run on main fails since #523: Windows has no os.confstr, so patching it without create=True raises before the test runs. * feat(thumbnails): move thumbnails between the sources and one folder (#320) POST /images/thumbnails/plan reviews a move (what is copied, removed and left, free space, too-long Windows paths, sources no longer listed) and hands out a token; POST /jobs/thumbnails {mode: move} runs it as a thumbnails job: hold automatic previews, copy and check every preview on the job pool, switch with one config commit that records the old copies, then remove them. Per-file errors still switch; a folder-wide error, a cancel before the switch or a crash leaves nothing changed (a journal is undone at the next start); old copies that could not go are removed by a finishing job at the next start. Leaving a folder removes the previews of this install's sources that are no longer listed (Q320-8). Recreate folder and Use this folder answer an unavailable folder; the Thumbnail maintenance scope prune removes the thumbnails of removed sources. * feat(system): choose where thumbnails are kept and move them (#320) System › Sources & scans gains the Thumbnail location row (D196): Inside each source or One folder, the folder path, the status line and Review move…, whose review (D197) lists what is copied, removed and left before Move thumbnails starts; a refused folder is explained under the field, a folder of your own asks for a confirmation first. Activity shows a move and a prune with their own tiles and step line (D198). An unavailable folder shows a notice on Overview and Sources & scans with Recreate folder or Use this folder (D199). Thumbnail maintenance offers Remove thumbnails of removed sources in folder mode (D200), and Move library's review says where the thumbnails stay (D201). Closes #320 * fix(thumbnails): keep a move's own previews and never walk out of a store (#320) A cleanup that waited from an earlier move never names a key folder the new move just filled, so moving back keeps the previews. Removing empty folders walks top-down and never into a link or junction. Any error while copying undoes the copies; once the switch is committed, a journal that cannot be removed no longer undoes it. Hand-edited cleanup entries and marker keys never name a folder outside the stores; removal stops at interpreter exit. The path field carries aria-invalid with its reason, and a review that went stale reviews again. * test(thumbnails): cover the prune scope, the Overview notice and the space refusal (#320) The frontend coverage gate counted the new branches of thumbnail maintenance, the Activity views, the notices' Change location and the api-client's space refusal as uncovered; page and unit tests now drive them. * fix(thumbnails): report removals that fail and explain the quiet excepts (#320) An old thumbnail the finishing move cannot remove (held open on Windows) is now an error row of the job with its path, and logged; a failed copy's temp that cannot go is logged with its path. Every except that only passes says why, and the thread runners say their caller re-raises. * fix(thumbnails): never plan or delete through a linked key folder (#320) Review finding P1 on #591: in folder mode a source key folder that is a link or junction to a folder outside was still handed to the planner, so Convert outdated could remove an older-format file outside the thumbnail folder. ensure_store now refuses a linked store before any planning, and each removal of an old preview passes may_write at the moment it runs. * fix(thumbnails): the temp sweep never walks into a link (#320) Review finding P2 on #591: Clear thumbnails and the startup sweep removed crashed-write temps with a plain os.walk, which on Windows walks into a junction even without followlinks. The sweeper now skips a folder that is a link, junction or reparse point (the top one too), and each temp passes may_write before it is removed. * fix(thumbnails): lock the folder marker across processes (#320) Review finding P2 on #591: two installs sharing one thumbnail folder could each read the marker, add a key and replace it, so the last writer dropped the other's key. write_marker now re-reads, changes and replaces the marker under a lock file made with O_CREAT | O_EXCL beside it (atomic on shares, unlike flock); a lock older than 30 s, left by a writer that died, is taken over, and a wait past 1.5 s fails as a TimeoutError like an unreachable folder. Tested with three processes adding keys at once. * test(thumbnails): cover the space refusal, Overview's Use this folder and the prune review (#320) The frontend coverage floors of activity-kinds, system-overview and thumbnail-review: a disk without the space shows the review but cannot move (a fixture route fakes the free space), Use this folder on Overview reloads the host values, the prune review's text and rows are pure functions with unit tests, and Overview takes the System drafts it is always mounted with. * fix(thumbnails): never copy through a linked folder; refuse a target inside the folder in use (#320) Moving back to Inside each source followed an existing linked folder in the destination and could replace a file outside the source (Codex P1). A target nested inside the thumbnail folder in use was accepted, and the old-copy cleanup then removed the previews just copied there (Codex P2). Every copy now checks the whole destination chain for links, also when the folders exist, and the move refuses a folder inside the one in use with location-inside-current. The cancelled branches no longer mix explicit and implicit returns (code-quality note). * fix(system): one full stop in the move-back review (#320) * fix(thumbnails): a folder check answers for the folder as it is now (#320) Probe.check() joined a check already running, or a finished one nobody had collected. A folder deleted right after configure() woke the probe therefore stayed available until the next probe, which failed the Overview notice spec in the merge queue. It now waits for a running check and starts a new one, still never two at once, and a stuck check still times out. The spec also asserts the fixture's removal took effect.
247 lines
8.8 KiB
Python
247 lines
8.8 KiB
Python
"""Thumbnail settings and names (#317): the one place every preview writer reads.
|
||
|
||
Settings (System › Appearance, ``POST /prompt_manager/settings``, config.json
|
||
``thumbnails``): ``thumbnail_format`` (``webp`` default, ``jxl``, ``jpeg``),
|
||
``thumbnail_quality`` (1–100, default 80) and ``thumbnail_edge`` (the longest
|
||
edge, 128–2048 px, default 512). ``current()`` is the snapshot a writer takes
|
||
once per preview; automatic previews, the Activity job, the history route and
|
||
the legacy gallery routes all go through it.
|
||
|
||
Names: a media file ``<rel>/<stem>.<ext>`` previews as
|
||
``thumbnails/<rel>/<stem>_thumb<extension of the format>`` (``.webp``,
|
||
``.jxl``, ``.jpg``), images and videos alike. Two files with one stem in one
|
||
folder share that name (ruling R2). Older releases kept the source's own
|
||
extension (``.png``, ``.jpeg``, ``.gif``, ``.webp``, ``.jpg``; ``.jpg`` for a
|
||
video): those are read, served and converted, never written. A preview with a
|
||
format extension (``.webp``, ``.jxl``, ``.jpg``) belongs to every same-stem
|
||
source; a legacy-only one (``.png``, ``.jpeg``, ``.gif``) only to a source
|
||
with that extension (``owns``, ruling R4). Lookups take the first existing
|
||
preview the source owns, preferring the configured format.
|
||
"""
|
||
|
||
import os
|
||
from dataclasses import dataclass
|
||
from pathlib import Path
|
||
|
||
FORMATS = ("webp", "jxl", "jpeg")
|
||
FORMAT_EXTENSIONS = {"webp": ".webp", "jxl": ".jxl", "jpeg": ".jpg"}
|
||
FORMAT_LABELS = {"webp": "WebP", "jxl": "JPEG XL", "jpeg": "JPEG"}
|
||
DEFAULT_FORMAT = "webp"
|
||
DEFAULT_QUALITY = 80
|
||
DEFAULT_EDGE = 512
|
||
MIN_QUALITY, MAX_QUALITY = 1, 100
|
||
MIN_EDGE, MAX_EDGE = 128, 2048
|
||
|
||
# Extensions a format writes, then the ones only older releases wrote.
|
||
WRITTEN_EXTENSIONS = (".webp", ".jxl", ".jpg")
|
||
LEGACY_EXTENSIONS = (".png", ".jpeg", ".gif")
|
||
THUMBNAIL_EXTENSIONS = WRITTEN_EXTENSIONS + LEGACY_EXTENSIONS
|
||
CONTENT_TYPES = {
|
||
".webp": "image/webp",
|
||
".jxl": "image/jxl",
|
||
".jpg": "image/jpeg",
|
||
".jpeg": "image/jpeg",
|
||
".png": "image/png",
|
||
".gif": "image/gif",
|
||
}
|
||
THUMB_SUFFIX = "_thumb"
|
||
|
||
|
||
@dataclass(frozen=True)
|
||
class ThumbnailSettings:
|
||
"""One preview's settings: the format, the quality and the longest edge."""
|
||
|
||
format: str
|
||
quality: int
|
||
edge: int
|
||
|
||
@property
|
||
def extension(self):
|
||
return FORMAT_EXTENSIONS[self.format]
|
||
|
||
@property
|
||
def size(self):
|
||
return (self.edge, self.edge)
|
||
|
||
def describe(self):
|
||
"""``WebP · quality 80 · 512 px`` (log lines and the job's scope)."""
|
||
return f"{FORMAT_LABELS[self.format]} · quality {self.quality} · {self.edge} px"
|
||
|
||
|
||
def current():
|
||
"""The configured settings now (read once per preview or per run)."""
|
||
from ..config import PromptManagerConfig
|
||
|
||
fmt = PromptManagerConfig.THUMBNAIL_FORMAT
|
||
return ThumbnailSettings(
|
||
fmt if fmt in FORMATS else DEFAULT_FORMAT,
|
||
int(PromptManagerConfig.THUMBNAIL_QUALITY),
|
||
int(PromptManagerConfig.THUMBNAIL_EDGE),
|
||
)
|
||
|
||
|
||
def _whole(value, low, high, message):
|
||
if type(value) is not int or not low <= value <= high:
|
||
raise ValueError(message)
|
||
return value
|
||
|
||
|
||
def validate_format(value):
|
||
if not isinstance(value, str) or value not in FORMATS:
|
||
raise ValueError('thumbnail_format must be "webp", "jxl" or "jpeg"')
|
||
return value
|
||
|
||
|
||
def validate_quality(value):
|
||
return _whole(
|
||
value,
|
||
MIN_QUALITY,
|
||
MAX_QUALITY,
|
||
f"thumbnail_quality must be a whole number from {MIN_QUALITY} to {MAX_QUALITY}",
|
||
)
|
||
|
||
|
||
def validate_edge(value):
|
||
return _whole(
|
||
value,
|
||
MIN_EDGE,
|
||
MAX_EDGE,
|
||
"thumbnail_edge must be a whole number of pixels "
|
||
f"from {MIN_EDGE} to {MAX_EDGE}",
|
||
)
|
||
|
||
|
||
# ── names ────────────────────────────────────────────────────────────
|
||
|
||
|
||
def preview_stem(rel_path):
|
||
"""``<rel without extension>_thumb`` (POSIX): a preview's name inside the
|
||
store of its source (``preview_store``)."""
|
||
return f"{Path(rel_path).with_suffix('').as_posix()}{THUMB_SUFFIX}"
|
||
|
||
|
||
def thumbnail_stem_rel(rel_path):
|
||
"""``thumbnails/<rel without extension>_thumb`` (POSIX): URL text only.
|
||
Where the preview is on disk is ``preview_store``'s answer."""
|
||
return f"thumbnails/{preview_stem(rel_path)}"
|
||
|
||
|
||
def thumbnail_rel(rel_path, extension=None):
|
||
"""The preview of *rel_path* in *extension* (the configured one when None)."""
|
||
return thumbnail_stem_rel(rel_path) + (extension or current().extension)
|
||
|
||
|
||
# Ruling R2: files sharing a stem share one preview, made from the first
|
||
# source in this order: these images, then videos (by extension name).
|
||
IMAGE_SOURCE_ORDER = (".png", ".jpg", ".jpeg", ".webp", ".gif")
|
||
|
||
|
||
def source_rank(source_extension):
|
||
"""Sort key of a source extension in R2's order (images first)."""
|
||
extension = source_extension.lower()
|
||
if extension in IMAGE_SOURCE_ORDER:
|
||
return (0, IMAGE_SOURCE_ORDER.index(extension), extension)
|
||
return (1, 0, extension)
|
||
|
||
|
||
def owns(thumb_extension, source_extension):
|
||
"""Whether a ``_thumb<thumb_extension>`` preview can belong to a source
|
||
with *source_extension* (ruling R4)."""
|
||
thumb_extension = thumb_extension.lower()
|
||
if thumb_extension in WRITTEN_EXTENSIONS:
|
||
return True
|
||
if thumb_extension in LEGACY_EXTENSIONS:
|
||
return thumb_extension == source_extension.lower()
|
||
return False
|
||
|
||
|
||
def _legacy_extension(source_extension):
|
||
from .inspection_service import VIDEO_EXTENSIONS
|
||
|
||
source_extension = source_extension.lower()
|
||
return ".jpg" if source_extension in VIDEO_EXTENSIONS else source_extension
|
||
|
||
|
||
def candidate_extensions(source_extension, preferred=None):
|
||
"""The preview extensions a source owns, in lookup order: the configured
|
||
one, the name an older release gave it, then the other written ones."""
|
||
preferred = preferred or current().extension
|
||
ordered = [preferred, _legacy_extension(source_extension), *WRITTEN_EXTENSIONS]
|
||
seen = []
|
||
for extension in ordered:
|
||
if extension not in seen and owns(extension, source_extension):
|
||
seen.append(extension)
|
||
return tuple(seen)
|
||
|
||
|
||
def owned_extensions(source_extension, preferred=None):
|
||
"""``candidate_extensions`` plus the other spellings an older release
|
||
may have given a legacy preview (review M1): the source's own
|
||
(``X_thumb.JPG`` for ``X.JPG``) and the upper-case legacy one."""
|
||
extensions = list(candidate_extensions(source_extension, preferred))
|
||
legacy = _legacy_extension(source_extension)
|
||
for spelling in (source_extension, legacy.upper()):
|
||
if spelling not in extensions and owns(spelling, source_extension):
|
||
extensions.append(spelling)
|
||
return tuple(extensions)
|
||
|
||
|
||
def _is_preview_file(path):
|
||
try:
|
||
return not path.is_symlink() and path.is_file()
|
||
except OSError:
|
||
return False
|
||
|
||
|
||
def owned_in_folder(folder, stem, source_extension, preferred=None):
|
||
"""Yield the existing previews ``<folder>/<stem><ext>`` a source with
|
||
*source_extension* owns, in lookup order (regular files, no links; one
|
||
file found under two spellings on a case-insensitive disk once)."""
|
||
seen = set()
|
||
for extension in owned_extensions(source_extension, preferred):
|
||
path = Path(folder) / (stem + extension)
|
||
if not _is_preview_file(path):
|
||
continue
|
||
try:
|
||
stat = path.stat()
|
||
identity = (stat.st_dev, stat.st_ino) if stat.st_ino else str(path)
|
||
except OSError:
|
||
continue
|
||
if identity in seen:
|
||
continue # the same file under another case (Windows, macOS)
|
||
seen.add(identity)
|
||
yield path
|
||
|
||
|
||
def _owned(root, rel_path, preferred):
|
||
from . import preview_store
|
||
|
||
rel_path = Path(rel_path)
|
||
store = preview_store.store_dir(root)
|
||
if store is None:
|
||
return iter(())
|
||
stem = store / preview_stem(rel_path)
|
||
found = owned_in_folder(stem.parent, stem.name, rel_path.suffix, preferred)
|
||
if preview_store.current().mode == preview_store.SOURCE_MODE:
|
||
return found
|
||
# Folder mode: timed, so a stalled share marks the folder unreachable,
|
||
# and only previews no link takes out of the key folder (deletes use it).
|
||
with preview_store.store_io():
|
||
return iter([path for path in found if preview_store.may_write(path)])
|
||
|
||
|
||
def owned_thumbnails(root, rel_path, preferred=None):
|
||
"""Every existing preview of *rel_path* under *root*, in lookup order."""
|
||
return list(_owned(root, rel_path, preferred))
|
||
|
||
|
||
def existing_thumbnail(root, rel_path, preferred=None):
|
||
"""The preview a listing shows for *rel_path*: the first owned one that
|
||
exists (the configured format first), or None."""
|
||
return next(_owned(root, rel_path, preferred), None)
|
||
|
||
|
||
def content_type(path):
|
||
"""The Content-Type of a preview file by its extension, or None."""
|
||
return CONTENT_TYPES.get(os.path.splitext(str(path))[1].lower())
|