Completes U7 with its fourth component: a jump-to-group rail derived from filename prefixes, replacing the subfolder sections ROADMAP named. The scope departure was ratified by the operator 2026-09-22; this commit deletes test_no_group_rail_is_shipped_yet, the guard that held it back, in the same change that builds what it guarded against. All seven v1 capabilities are now landed. The 1.0 cut is a decision, not a dependency, and it is the operator's — no version bump here, because a commit is not a release. THE RULE CHANGED AT IMPLEMENTATION, ON MEASURED GROUNDS. The contract specified `strip ONE trailing run of digits`; run against the live set that yields 24 groups for sindra-bakeoff's 40 images and 27 for sindra's 30 — a rail with a row per tile — because it keys on the END of the stem, where the instance number lives. The contract's own table claimed 5 and 1 for those two booths and neither reproduces; the numbers are reachable only by two OTHER heuristics, so the table that justified the design was assembled from more than one rule. Its own worked example contradicts it in plain sight. The shipped rule keys on the first separator-delimited segment, where the family lives, destemming only when the stem has no separator at all — so `ac01` -> `ac` while `v30-seed8302` and `v35-seed8302` stay apart. Re-measured across all 17 live booths; the table is in the contract. INV-3 GAINED ITS SECOND DEGENERACY. The contract guarded one group for everything (sc-iso-spread: DSC0001-DSC0006). The live set's actual failure is the opposite — pewpew-ui-brief yields 23 groups for 34 items, dfa-concepts 13 for 20 — and the contract as written would have shipped a rail that is a second copy of the grid. The rail now renders only when grouping is informative: two or more groups, and the middle group holding more than one item. That predicate gets all 17 booths right. Grouping is a VIEW. The grid stays sorted(rel) and the zoom ring stays that order filtered to images; the group fixture interleaves across subdirectories precisely so a (group, rel) re-sort goes red. Groups are derived from the RENDERED list, not the full gallery, so no anchor points at a filtered-out tile. booth/items.py _group_of + Item.group, derived in the resolver (INV-1) booth/app.py _groups() builds the rail rows; build_gallery carries it booth/templates/ the rail-groups nav and its CSS tests/ +16 tests; 639 green Every new falsifier was proved by running its defeating change (12/12). Three were vacuous first time out: one fixture's positional order happened to be alphabetical, one assertion miscounted elements, and the harness itself certified a broken test twice — no green baseline, and byte-identical mutations silently defeated by the pyc cache's one-second mtime granularity.
285 lines
10 KiB
Python
285 lines
10 KiB
Python
"""The item record — ONE resolver for what is in a booth.
|
|
|
|
Before this module, three functions independently walked a booth and derived
|
|
overlapping subsets of the same facts: `build_gallery` (kind, caption, blur,
|
|
doc), `booth_view_file` (kind, doc, image ring) and `list_booths` (kind counts,
|
|
cover thumb). The zoom route's subset was the smallest, and the fact it lacked
|
|
was the caption — so an annotated image lost its annotation at exactly the size
|
|
where the annotation is most readable.
|
|
|
|
That was never a rendering bug. It was three readers of one truth. This module
|
|
is the one truth; every surface reads its record and derives nothing itself.
|
|
|
|
See docs/contracts/u1_item_record.contract.md.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
from dataclasses import dataclass
|
|
from pathlib import Path
|
|
from typing import Sequence
|
|
from urllib.parse import quote
|
|
|
|
try: # optional: markdown rendering degrades to raw text without it
|
|
import markdown as _markdown
|
|
except ImportError: # pragma: no cover
|
|
_markdown = None
|
|
|
|
from booth.asks import is_answer_file, is_ask_file
|
|
|
|
# Browser-playable media buckets. Anything else renders as a download link.
|
|
IMAGE_EXTS = {".png", ".jpg", ".jpeg", ".gif", ".webp", ".avif", ".svg", ".bmp"}
|
|
VIDEO_EXTS = {".webm", ".mp4", ".ogv", ".m4v", ".mov"}
|
|
AUDIO_EXTS = {".mp3", ".wav", ".ogg", ".oga", ".flac", ".m4a", ".opus", ".aac"}
|
|
|
|
# Loose text docs that render as a readable page rather than a download.
|
|
MARKDOWN_EXTS = {".md", ".markdown", ".mdown"}
|
|
TEXT_EXTS = {".txt", ".text", ".log"}
|
|
|
|
CAPTION_MAX = 800 # chars of a sidecar .txt caption we render
|
|
DOC_MAX_BYTES = 2 * 1024 * 1024 # above this, a doc is handed back raw, not rendered
|
|
|
|
BLUR_FILE = ".blurred"
|
|
|
|
|
|
def classify(name: str) -> str:
|
|
"""image | video | audio | other, by extension."""
|
|
ext = Path(name).suffix.lower()
|
|
if ext in IMAGE_EXTS:
|
|
return "image"
|
|
if ext in VIDEO_EXTS:
|
|
return "video"
|
|
if ext in AUDIO_EXTS:
|
|
return "audio"
|
|
return "other"
|
|
|
|
|
|
def doc_kind(name: str) -> str | None:
|
|
"""'markdown' | 'text' | None — a booth file viewable as a readable page."""
|
|
ext = Path(name).suffix.lower()
|
|
if ext in MARKDOWN_EXTS:
|
|
return "markdown"
|
|
if ext in TEXT_EXTS:
|
|
return "text"
|
|
return None
|
|
|
|
|
|
def render_doc(text: str, kind: str) -> tuple[str, bool]:
|
|
"""(rendered, is_html). Markdown → HTML (fenced code, tables, sane lists);
|
|
plain text — or markdown when the lib is unavailable — → raw text for <pre>.
|
|
|
|
Text is returned RAW on purpose: the template escapes it inside <pre>, and
|
|
pre-escaping here would double-encode under Jinja autoescape.
|
|
"""
|
|
if kind == "markdown" and _markdown is not None:
|
|
html = _markdown.markdown(text, extensions=["fenced_code", "tables", "sane_lists"])
|
|
return html, True
|
|
return text, False
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class Item:
|
|
"""One renderable file in a booth, with every fact any surface needs.
|
|
|
|
`rel` is the identity — the booth-relative POSIX path. Marks (U2) attach to
|
|
it, blur is keyed by it, and the zoom route resolves by it.
|
|
"""
|
|
|
|
rel: str
|
|
url: str
|
|
kind: str
|
|
section: str | None
|
|
group: str | None
|
|
caption: str | None
|
|
blurred: bool
|
|
doc: str | None
|
|
size: int
|
|
|
|
|
|
def read_blurred(booth: Path) -> set[str]:
|
|
"""Blurred item paths for a booth. Missing file -> empty set."""
|
|
try:
|
|
text = (booth / BLUR_FILE).read_text()
|
|
except (OSError, UnicodeDecodeError):
|
|
return set()
|
|
return {ln.strip() for ln in text.splitlines() if ln.strip()}
|
|
|
|
|
|
def _section_of(rel: str) -> str | None:
|
|
"""The item's parent directory relative to the booth; None at the root.
|
|
|
|
Derived, never stored. This is the whole input to the navigation fix (U7):
|
|
the structure a poster already created on disk, which `rglob` has been
|
|
flattening into one wall at render time.
|
|
"""
|
|
parent = Path(rel).parent
|
|
return None if str(parent) == "." else parent.as_posix()
|
|
|
|
|
|
# One separator run between name segments. A filename is the only grouping
|
|
# signal the live booths actually carry: 0 of 11 galleries have a subdirectory.
|
|
_SEG = re.compile(r"[-_. ]+")
|
|
|
|
|
|
def _group_of(rel: str) -> str | None:
|
|
"""The grouping key for an item, or None when it has none.
|
|
|
|
THE RULE, in one line: **the first separator-delimited segment of the
|
|
basename's stem — with a trailing digit run stripped only when the stem has
|
|
no separator at all.** `00-sheet-c1-market-noon.png` -> `00`;
|
|
`m-c1-market-noon-9401.png` -> `m`; `flag-rear.png` -> `flag`;
|
|
`ac01.png` -> `ac` (no separator, so the digits are the separator);
|
|
`v30-seed8302.png` -> `v30` (separator present, so `v30` survives and does
|
|
not merge with `v35`, which is the axis that booth is about).
|
|
|
|
None for a stem with nothing before the digits -- `01.png` has no prefix to
|
|
group on, and inventing one would file every numbered render under the
|
|
empty string.
|
|
|
|
⚠ THIS IS NOT THE RULE THE CONTRACT FIRST NAMED. `strip ONE trailing run of
|
|
digits` was measured against the live set on 2026-09-22 and yields 24 groups
|
|
for sindra-bakeoff's 40 images and 27 for sindra's 30 -- a rail with one row
|
|
per tile. The contract's own table claimed 5 and 1 for those two booths;
|
|
neither reproduces under the rule it states beside them. The rewritten table
|
|
carries the re-measurement.
|
|
|
|
Derived HERE and nowhere else (INV-1). A route body that re-derived it would
|
|
be the caption bug in a new field.
|
|
"""
|
|
stem = Path(rel).stem # basename without its last suffix; `a.tar.gz` -> `a.tar`
|
|
segs = _SEG.split(stem)
|
|
if len(segs) == 1:
|
|
return re.sub(r"\d+$", "", stem) or None
|
|
return segs[0] or None
|
|
|
|
|
|
def _resolve_captions(by_rel: dict[str, Path]) -> tuple[dict[str, str], set[str]]:
|
|
"""(caption-by-rel, rels consumed as sidecars).
|
|
|
|
Two forms, in this precedence, preserved from the original gallery:
|
|
1. `<file>.txt` — `a.png.txt` captions `a.png`
|
|
2. `<stem>.txt` beside a same-stem MEDIA sibling — `a.txt` captions
|
|
`a.png`, but NOT `a.bin` (the `classify != "other"` guard, so a stray
|
|
`data.txt` next to `data.bin` stays an item of its own)
|
|
|
|
The sibling scan runs in sorted order rather than filesystem order: when two
|
|
media files share a stem in one directory (`a.png` and `a.webm`), the
|
|
original picked whichever `rglob` happened to yield first. Same rule, now
|
|
deterministic.
|
|
"""
|
|
caption: dict[str, str] = {}
|
|
sidecars: set[str] = set()
|
|
|
|
for rel in sorted(by_rel):
|
|
if not rel.lower().endswith(".txt"):
|
|
continue
|
|
p = by_rel[rel]
|
|
target = None
|
|
|
|
base_full = rel[:-4] # "a.png.txt" -> "a.png"
|
|
if base_full in by_rel:
|
|
target = base_full
|
|
else:
|
|
parent = str(Path(rel).parent)
|
|
stem = Path(rel).stem
|
|
for q_rel in sorted(by_rel):
|
|
if q_rel == rel:
|
|
continue
|
|
q = by_rel[q_rel]
|
|
if (
|
|
str(Path(q_rel).parent) == parent
|
|
and Path(q_rel).stem == stem
|
|
and classify(q.name) != "other"
|
|
):
|
|
target = q_rel
|
|
break
|
|
|
|
if target is not None:
|
|
try:
|
|
caption[target] = p.read_text(errors="replace").strip()[:CAPTION_MAX]
|
|
except OSError:
|
|
pass
|
|
sidecars.add(rel)
|
|
|
|
return caption, sidecars
|
|
|
|
|
|
def booth_items(booth: Path) -> list[Item]:
|
|
"""Every renderable file in a booth, sorted by relative path.
|
|
|
|
Excluded: dotfiles, `*.ask.json` / `*.answer.json` (they render as the asks
|
|
panel, not as tiles), and any file consumed as another item's caption.
|
|
|
|
Doc BODIES are deliberately not rendered here. The index calls this once per
|
|
booth to count items and pick a cover; rendering every doc in every booth on
|
|
every page load would be the cost of that convenience. `render_doc_body` is
|
|
the separate step, for the one consumer that needs it.
|
|
"""
|
|
by_rel: dict[str, Path] = {}
|
|
for p in booth.rglob("*"):
|
|
if not p.is_file() or p.name.startswith("."):
|
|
continue
|
|
if is_ask_file(p.name) or is_answer_file(p.name):
|
|
continue
|
|
by_rel[p.relative_to(booth).as_posix()] = p
|
|
|
|
caption, sidecars = _resolve_captions(by_rel)
|
|
blurred = read_blurred(booth) # ONE read per call, not one per item
|
|
|
|
items: list[Item] = []
|
|
for rel in sorted(by_rel):
|
|
if rel in sidecars:
|
|
continue
|
|
p = by_rel[rel]
|
|
try:
|
|
size = p.stat().st_size
|
|
except OSError:
|
|
size = 0
|
|
items.append(
|
|
Item(
|
|
rel=rel,
|
|
url=quote(rel, safe="/"),
|
|
kind=classify(p.name),
|
|
section=_section_of(rel),
|
|
group=_group_of(rel),
|
|
caption=caption.get(rel),
|
|
blurred=rel in blurred,
|
|
doc=doc_kind(p.name),
|
|
size=size,
|
|
)
|
|
)
|
|
return items
|
|
|
|
|
|
def image_chain(items: Sequence[Item]) -> list[str]:
|
|
"""The rels of the image items, in order — the zoom view's prev/next ring.
|
|
|
|
Replaces `booth_image_names`, which walked the tree a second time to derive
|
|
what the item list already knows.
|
|
"""
|
|
return [it.rel for it in items if it.kind == "image"]
|
|
|
|
|
|
def find_item(items: Sequence[Item], rel: str) -> Item | None:
|
|
"""The record for one rel, or None — the zoom/doc route's entry point."""
|
|
for it in items:
|
|
if it.rel == rel:
|
|
return it
|
|
return None
|
|
|
|
|
|
def render_doc_body(booth: Path, item: Item) -> tuple[str, bool] | None:
|
|
"""(body, is_html) for a doc item under DOC_MAX_BYTES, else None.
|
|
|
|
None means "do not inline this": either it is not a doc, or it is a log big
|
|
enough that inlining it into every page render is the wrong trade.
|
|
"""
|
|
if item.doc is None or item.size > DOC_MAX_BYTES:
|
|
return None
|
|
try:
|
|
text = (booth / item.rel).read_text(encoding="utf-8", errors="replace")
|
|
except OSError:
|
|
return None
|
|
return render_doc(text, item.doc)
|