| ${esc(c.title_raw)} | +${esc(c.title_raw)} + ${c.split_copy ? `copy` : ""} | ${statusChip(c)} | ${c.bgg_name ? esc(c.bgg_name) + (c.bgg_id ? " · " + esc(c.bgg_id) : "") : ""} ${c.version_name ? " · " + esc(c.version_name) : ""} @@ -26,6 +27,12 @@ function render() { | ${c.photos.map(p => `${esc(p)}` ).join(", ")} | +${c.can_split + ? `` + : ""} |
${CATALOG.length ? "No titles match that filter." @@ -42,6 +49,19 @@ async function refresh() { render(); } +document.getElementById("catbody").addEventListener("click", async e => { + const b = e.target.closest("button.split"); + if (!b) return; + const n = b.dataset.photos.split(";").length; + if (!confirm(`Split "${b.dataset.title}" into ${n} separate copies (one per photo)? ` + + `Each picks its own edition afterward.`)) return; + const res = await apiPost("/api/split", { + title_raw: b.dataset.title, + source_photos: b.dataset.photos, + row_ix: Number(b.dataset.rowix), + }); + if (res) refresh().catch(() => {}); +}); document.getElementById("catsearch").addEventListener("input", render); refresh().catch(err => errorBanner(err.message || err)); pollLoop(refresh, 5000, () => showBanner("")); diff --git a/src/bggpipe/webreview.py b/src/bggpipe/webreview.py index 66f5193..7a13ac7 100644 --- a/src/bggpipe/webreview.py +++ b/src/bggpipe/webreview.py @@ -142,6 +142,12 @@ class VetoBody(BaseModel): row_ix: int | None = None +class SplitBody(BaseModel): + title_raw: str + source_photos: str + row_ix: int | None = None + + class RunBody(BaseModel): dry_run: bool = True # upload only; the safe direction is the default limit: int | None = None @@ -354,6 +360,32 @@ def create_app( rows_by_title.setdefault(r["title_raw"], []).append(r) title_seen: Counter[str] = Counter() catalog = [] + + def catalog_line(entry, row) -> dict: + return { + "title_raw": entry.title_raw if entry else row["title_raw"], + "confidence": entry.confidence if entry else "", + "photos": ( + list(entry.source_photos) + if entry + else [p for p in row["source_photos"].split(";") if p] + ), + "status": row["match_status"] if row else "awaiting_resolve", + "type": row["type"] if row else "", + "bgg_id": row["bgg_id"] if row else "", + "bgg_name": row["bgg_name"] if row else "", + "version_name": row["version_name"] if row else "", + "merged_into": row.get("merged_into", "") if row else "", + "row_ix": _ix_of(session.rows, row) if row else None, + "can_split": bool( + row + and row["match_status"] in RECOGNIZED_MATCH_STATUSES + and not row.get("dedupe_veto") + and len(row["source_photos"].split(";")) > 1 + ), + "split_copy": bool(row and row.get("dedupe_veto")), + } + for entry in session.titles: same_title = rows_by_title.get(entry.title_raw, []) ix = title_seen[entry.title_raw] @@ -361,19 +393,18 @@ def create_app( # positional pairing, same rule as run_resolve: the ix-th entry # of a title reports the ix-th row of that title row = same_title[ix] if ix < len(same_title) else None + # a split row's photo set is narrower than its entry's — show + # the row's own photos for split copies catalog.append( - { - "title_raw": entry.title_raw, - "confidence": entry.confidence, - "photos": list(entry.source_photos), - "status": row["match_status"] if row else "awaiting_resolve", - "type": row["type"] if row else "", - "bgg_id": row["bgg_id"] if row else "", - "bgg_name": row["bgg_name"] if row else "", - "version_name": row["version_name"] if row else "", - "merged_into": row.get("merged_into", "") if row else "", - } + catalog_line(None if row and row.get("dedupe_veto") else entry, row) + if row + else catalog_line(entry, None) ) + # surplus rows beyond the entry count — split copies — are real + # physical games and get their own catalog lines + for title, rows_for_title in rows_by_title.items(): + for row in rows_for_title[title_seen[title] :]: + catalog.append(catalog_line(None, row)) unresolved_count = sum( 1 for e in session.titles if e.title_raw not in resolved_titles ) @@ -664,6 +695,18 @@ def create_app( raise HTTPException(400, f"unknown action {body.action!r}") return state() + @app.post("/api/split") + def api_split(body: SplitBody) -> dict: + with lock: + revision["n"] += 1 + _refuse_if_rewriting() + row = find_row(body.title_raw, body.source_photos, body.row_ix) + try: + session.split_row(row) + except ValueError as err: + raise HTTPException(400, str(err)) from err + return state() + @app.post("/api/veto-merge") def api_veto_merge(body: VetoBody) -> dict: with lock: diff --git a/tests/test_diff.py b/tests/test_diff.py index acc3c1b..8ab0aef 100644 --- a/tests/test_diff.py +++ b/tests/test_diff.py @@ -405,3 +405,17 @@ def test_rpgitem_rows_are_local_only_never_queued(): assert result.local_only == ["ALICE IS MISSING"] assert [r["bgg_id"] for r in result.to_add] == ["13"] # RPG never queued assert result.recognized == 1 # RPGs aren't counted against the queue + + +def test_split_copies_become_extra_collection_entries(): + # three vetoed per-photo copies, one owned: one claims the copy, the + # other two are queued as new entries + base = _match("Wiz-War", "104710") + copies = [ + {**base, "source_photos": p, "dedupe_veto": "1"} + for p in ("a.jpg", "b.jpg", "c.jpg") + ] + result = compute_diff(copies, [_item(104710, 900)]) + assert result.already_owned == ["Wiz-War"] + assert len(result.to_add) == 2 + assert all(r["second_copy"] == "1" for r in result.to_add) diff --git a/tests/test_review.py b/tests/test_review.py index d9319cb..9e802c7 100644 --- a/tests/test_review.py +++ b/tests/test_review.py @@ -469,3 +469,70 @@ def test_corrupt_dismiss_file_is_quarantined_not_fatal(tmp_path): store = DismissStore(path) assert store.keys == set() assert (tmp_path / "dismissed.json.corrupt").exists() + + +def test_split_row_makes_per_photo_vetoed_copies(tmp_path): + from bggpipe.resolve import read_matches + + cfg = _setup( + tmp_path, + [ + _row( + title_raw="Wiz-War", + match_status="approved", + bgg_id="104710", + bgg_name="Wiz-War", + source_photos="a.jpg;b.jpg;c.jpg", + version_candidates_json='[{"version_id": 1, "name": "8th"}]', + ) + ], + ) + session = ReviewSession( + cfg, + console=quiet_console(), + input_fn=scripted(), + client=unauthorized_client(tmp_path), + ) + copies = session.split_row(session.rows[0]) + saved = read_matches(cfg.matches_path) + assert [r["source_photos"] for r in saved] == ["a.jpg", "b.jpg", "c.jpg"] + assert all(r["dedupe_veto"] == "1" for r in saved) + assert all(r["bgg_id"] == "104710" for r in saved) # match survives + # each copy picks its own edition: candidates kept, status reopened + assert all(r["version_status"] == "version_ambiguous" for r in saved) + assert all(r["version_id"] == "" for r in saved) + assert len(copies) == 3 + + +def test_split_copies_survive_resolve_rerun(tmp_path): + import json as _json + + from bggpipe.resolve import read_matches, run_resolve + + cfg = _setup( + tmp_path, + [ + _row( + title_raw="Wiz-War", + match_status="approved", + bgg_id="104710", + source_photos="a.jpg;b.jpg;c.jpg", + ) + ], + ) + (cfg.data_dir / "titles.json").write_text( + _json.dumps( + [{"title_raw": "Wiz-War", "source_photos": ["a.jpg", "b.jpg", "c.jpg"]}] + ) + ) + session = ReviewSession( + cfg, + console=quiet_console(), + input_fn=scripted(), + client=unauthorized_client(tmp_path), + ) + session.split_row(session.rows[0]) + run_resolve(cfg, client=fixture_client()) + saved = read_matches(cfg.matches_path) + assert len(saved) == 3 # not re-merged, not re-resolved + assert [r["source_photos"] for r in saved] == ["a.jpg", "b.jpg", "c.jpg"]