diff --git a/docs/EDITOR.md b/docs/EDITOR.md index d93076a..2924236 100644 --- a/docs/EDITOR.md +++ b/docs/EDITOR.md @@ -19,6 +19,7 @@ Das vollständige Editor-Paket entpacken und `OpenBMHEditor.exe` (Windows) bezie - **Prüfen** zeigt überlieferte Quellenkonflikte. Eine Auswahl übernimmt den gewählten Wert; die übrigen Quellen bleiben erhalten. Fehlende Daten sind Hinweise, fehlerhafte Verknüpfungen oder unzulässige Werte blockieren Änderungen und Speichern. - Rückgängig/Wiederholen gilt gemeinsam für native Oberfläche und MCP. Noch nicht angewendete Eingaben werden bei externen Änderungen nicht automatisch ersetzt; eine veraltete Änderung muss nach Aktualisierung erneut geprüft werden. - **Bilder** und die Bildaktionen am Datensatz unterstützen PNG, JPEG, WebP und eigenständige SVG. Vor dem Import: Ausschnitt ziehen oder Werte eingeben, frei drehen, spiegeln. Ein unveränderter Import behält seine Originalbytes. Bearbeitete Rasterbilder werden PNG, SVG bleibt Vektor. Das Original und die Transformationswerte bleiben für erneutes Bearbeiten im Paket. Classic-Porträts werden aus ihren eingefrorenen Rezepten angezeigt; eine Umbenennung ändert das Gesicht nicht. +- Bildänderungen am Spieler, Verein oder Wettbewerb erhalten eine eigene Zuordnung. Gemeinsame Platzhalter und Bilder anderer Datensätze bleiben dabei erhalten. Im Bereich **Bilder** kann ein gemeinsam verwendetes Bild bewusst zentral bearbeitet werden. **Speichern** erzeugt ausschließlich `.obw` im Profil **`editor-world-v1`, Format 1.1**. Editorwelten sind **noch nicht im Classic-Spiel startbar**. Die Bezeichnung ist im Editor sichtbar. Unbekannte Erweiterungen, nicht bearbeitete Dokumente, Quellnachweise und Bilder bleiben erhalten. Noch nicht im Formular angebotene Regeln, Kalender- und Finanzdaten werden erhalten, aber nicht als vollständig editierbare Bereiche ausgegeben. diff --git a/docs/qa/editor-poc/README.md b/docs/qa/editor-poc/README.md index 32e604e..a7ee415 100644 --- a/docs/qa/editor-poc/README.md +++ b/docs/qa/editor-poc/README.md @@ -20,10 +20,12 @@ These are native application captures, not HTML/browser mockups. Validation performed: -- `editor_core_tests`: 55 assertions for edit/rollback, revision conflicts, +- `editor_core_tests`: 59 assertions for edit/rollback, revision conflicts, references, dates/scales, roster moves/swaps/order, shared undo/redo/save checkpoint, atomic OBW overwrite, exact image originals, arbitrary SVG/raster transforms, unknown-extension preservation and authenticated MCP HTTP. + Individual image edits also verify that shared fallback images and other + records remain unchanged. Windows additionally checks a profile directory containing non-ASCII letters. - `tests/editor_gui_smoke.py`: real mouse/keyboard inspector edit; untouched JSON colour field retained; native search focus; shared MCP/native undo/redo; diff --git a/src/editor/mcp.cpp b/src/editor/mcp.cpp index a5d59cd..4969d75 100644 --- a/src/editor/mcp.cpp +++ b/src/editor/mcp.cpp @@ -199,8 +199,14 @@ Json McpServer::tools() { {"file"}); add("editor_image_edit", "Re-edit an existing image using its preserved original. No repeated " - "resampling.", - {{"key", id}, {"transform", transform}, {"expected_revision", revision}}, {"key", "transform"}); + "resampling. Optional source_key clones that source into key; target assigns it to one entity without changing " + "other users of a shared fallback.", + {{"key", id}, + {"source_key", id}, + {"target", field("object")}, + {"transform", transform}, + {"expected_revision", revision}}, + {"key", "transform"}); add("editor_image_preview", "Return a PNG preview as an MCP image content block.", {{"key", id}, {"transform", transform}}, {"key"}, true); add("editor_image_export", "Export an image as PNG to an explicit filesystem path.", diff --git a/src/editor/session.cpp b/src/editor/session.cpp index 6a4bbc2..5659b06 100644 --- a/src/editor/session.cpp +++ b/src/editor/session.cpp @@ -259,17 +259,23 @@ Json Session::apply(const Json &args, std::vector files, const std::s Json Session::import_image(const Json &args) { auto &w = world(); std::string original, extension, original_name; - const auto *existing = w.find("assets", str(args, "key")); + const auto source_key = str(args, "source_key", str(args, "key")); + const auto *existing = w.find("assets", source_key); if (args.contains("file")) { original = read_file(path(str(args, "file"))); extension = folded(utf8(path(str(args, "file")).extension())); original_name = utf8(path(str(args, "file")).filename()); + } else if (source_key.starts_with("portrait:") && w.find("players", source_key.substr(9))) { + auto value = asset_bytes(source_key); + original = std::move(value.first); + extension = value.second; + original_name = w.title(*w.find("players", source_key.substr(9))); } else { if (!existing) throw Error("record_missing"); auto source = str(existing->value("x-editor", Json::object()), "original"); if (source.empty()) - source = w.asset_file(str(args, "key")); + source = w.asset_file(source_key); original = w.store->read(source); extension = folded(utf8(path(source).extension())); original_name = text(existing->value("name", Json(str(args, "key")))); @@ -280,14 +286,26 @@ Json Session::import_image(const Json &args) { auto result = images::transform(original, extension, args.value("transform", Json::object())); auto key = str(args, "key"); const auto target = args.value("target", Json::object()); + const auto target_table = str(target, "table"); + const auto target_field = str(target, "field", + target_table == "players" || target_table == "staff" ? "photo" + : target_table == "competitions" ? "trophy" + : "crest"); if (key.empty()) { if (!target.empty()) { auto id = str(target, "id"); auto table = str(target, "table"); - key = "asset:" + table + '/' + id + '/' + str(target, "field", table == "players" ? "photo" : "crest"); + key = "asset:" + table + '/' + id + '/' + target_field; } else key = new_id("asset:uploaded/"); } + if (!target.empty() && w.find("assets", key)) { + for (const auto &[table, id] : w.references(key)) + if (table != str(target, "table") || id != str(target, "id")) { + key = "asset:editor/" + target_table + '/' + str(target, "id") + '/' + target_field; + break; + } + } const auto original_hash = content::sha256(original), edited_hash = content::sha256(result.bytes); auto source_file = "x-editor/originals/" + original_hash + extension; auto output_file = "assets/edited/" + edited_hash + result.extension; @@ -308,6 +326,8 @@ Json Session::import_image(const Json &args) { {"license", "user-supplied"}, {"kind", result.extension == ".svg" ? "vector" : "raster"}, {"x-editor", {{"original", source_file}, {"original_sha256", original_hash}, {"transform", result.recipe}}}}; + if (!args.contains("file") && !source_key.empty() && source_key != key) + row["x-editor"]["source_asset"] = source_key; Json changes = Json::array(); if (const auto *before = w.find("assets", key)) { auto after = *before; @@ -323,7 +343,7 @@ Json Session::import_image(const Json &args) { changes.push_back({{"op", "update"}, {"table", str(target, "table")}, {"id", str(target, "id")}, - {"set", {{'/' + str(target, "field", "crest"), key}}}}); + {"set", {{'/' + target_field, key}}}}); Json command{{"changes", changes}}; if (args.contains("expected_revision")) command["expected_revision"] = args["expected_revision"]; diff --git a/src/editor/ui.cpp b/src/editor/ui.cpp index bd9482d..0f0586b 100644 --- a/src/editor/ui.cpp +++ b/src/editor/ui.cpp @@ -152,7 +152,7 @@ class EditorUi final : public Rml::EventListener { std::future work_; std::function completed_; std::function modal_accept_, discard_continuation_; - std::string image_bytes_, image_extension_, image_file_, image_key_; + std::string image_bytes_, image_extension_, image_file_, image_key_, image_source_key_; Json image_target_, image_recipe_; double drag_x_ = 0, drag_y_ = 0; bool dragging_ = false; @@ -842,17 +842,22 @@ class EditorUi final : public Rml::EventListener { void edit_image(bool existing, bool fresh = false) { image_file_.clear(); image_key_ = fresh ? "" : image_key(selected_); + image_source_key_ = image_key_; image_target_ = Json::object(); image_recipe_ = {{"angle", 0}, {"flip_x", false}, {"flip_y", false}, {"crop", {{"x", 0}, {"y", 0}, {"width", 1}, {"height", 1}}}}; - if (table() != "assets") + if (table() != "assets") { image_target_ = {{"table", table()}, {"id", selected_id_}, {"field", table() == "players" ? "photo" : table() == "competitions" ? "trophy" : "crest"}}; + // Editing one person/club must not overwrite a shared fallback or + // a template image also referenced by another record. + image_key_ = "asset:editor/" + table() + '/' + selected_id_ + '/' + str(image_target_, "field"); + } if (!existing) { image_file_ = native_dialog("image"); if (image_file_.empty()) @@ -862,10 +867,18 @@ class EditorUi final : public Rml::EventListener { if (table() == "assets" && selected_id_.empty()) image_key_.clear(); } else { - auto row = session_.execute("get", {{"table", "assets"}, {"id", image_key_}})["record"]; + Json row; + try { + row = session_.execute("get", {{"table", "assets"}, {"id", image_source_key_}})["record"]; + } catch (const Error &error) { + if (error.code != "record_missing" || table() != "players" || !selected_.contains("appearance")) + throw; + image_source_key_ = "portrait:" + selected_id_; + row = Json::object(); + } auto metadata = row.value("x-editor", Json::object()); auto source = str(metadata, "original"); - auto pair = session_.asset_bytes(source.empty() ? image_key_ : source); + auto pair = session_.asset_bytes(source.empty() ? image_source_key_ : source); image_bytes_ = std::move(pair.first); image_extension_ = pair.second; if (metadata.contains("transform")) @@ -906,6 +919,8 @@ class EditorUi final : public Rml::EventListener { Json args{{"key", image_key_}, {"transform", image_recipe_}, {"expected_revision", revision_}}; if (!image_file_.empty()) args["file"] = image_file_; + else + args["source_key"] = image_source_key_; if (!image_target_.empty()) args["target"] = image_target_; session_.execute(image_file_.empty() ? "asset.edit" : "asset.import", args); diff --git a/tests/editor_core_tests.cpp b/tests/editor_core_tests.cpp index 1ab921c..31c347f 100644 --- a/tests/editor_core_tests.cpp +++ b/tests/editor_core_tests.cpp @@ -124,16 +124,33 @@ int main() { "height=\"10\">", ".svg"); }); - auto imported = s.execute("asset.import", - {{"file", utf8(root / "input.png")}, - {"key", "asset:test"}, - {"target", {{"table", "players"}, {"id", "player:demo-0"}, {"field", "photo"}}}}); + auto imported = s.execute("asset.import", {{"file", utf8(root / "input.png")}, + {"key", "asset:test"}, + {"target", {{"table", "players"}, {"id", "player:demo-0"}}}}); check(row(s, "players", "player:demo-0")["photo"] == "asset:test", "image assigned"); check(s.asset_bytes("asset:test").first == png, "source exact on import"); rejects("record_referenced", [&] { s.execute("apply", {{"changes", Json::array({{{"table", "assets"}, {"id", "asset:test"}, {"op", "delete"}}})}}); }); + s.execute("apply", update("players", "player:demo-1", {{"/photo", "asset:test"}})); + s.execute("asset.edit", {{"key", "asset:individual"}, + {"source_key", "asset:test"}, + {"transform", {{"angle", 18.0}}}, + {"target", {{"table", "players"}, {"id", "player:demo-0"}, {"field", "photo"}}}}); + check(row(s, "players", "player:demo-0")["photo"] == "asset:individual", "individual image assigned"); + check(row(s, "players", "player:demo-1")["photo"] == "asset:test" && s.asset_bytes("asset:test").first == png, + "shared fallback and other person remain unchanged"); + s.execute("undo"); + check(row(s, "players", "player:demo-0")["photo"] == "asset:test", "image assignment undo atomic"); + const auto isolated = s.execute( + "asset.import", {{"file", utf8(root / "input.png")}, + {"key", "asset:test"}, + {"transform", {{"flip_y", true}}}, + {"target", {{"table", "players"}, {"id", "player:demo-0"}, {"field", "photo"}}}}); + check(isolated["key"] != "asset:test" && s.asset_bytes("asset:test").first == png, + "targeted import cannot overwrite another entity's shared image"); + s.execute("undo"); s.execute("asset.edit", {{"key", "asset:test"}, {"transform", {{"angle", 30.5}}}}); auto metadata = row(s, "assets", "asset:test")["x-editor"]; check(metadata["transform"]["angle"] == 30.5, "float angle metadata");