Manage real OBS careers in native save and load dialogs (by Codex)

This commit is contained in:
Codex committed 2026-10-29 02:57:32 +01:00
1 parent 693744a961
commit e3ea03a05d
25 files changed
+539 -39

No files matched your search

+54
View File
@@ -0,0 +1,54 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/career_files.hpp"
#include <chrono>
#include <iostream>
#include <stdexcept>
using namespace bmh::modern_ui;
namespace {
void require(bool ok,const char *why){if(!ok)throw std::runtime_error(why);}
template<class F> void rejected(F f,const char *why){bool caught=false;try{f();}catch(const std::exception&){caught=true;}require(caught,why);}
struct Fixture {
fs::path root=fs::temp_directory_path()/("modern-career-files-"+std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()));
Fixture(){fs::create_directories(root);}
~Fixture(){std::error_code e;fs::remove_all(root,e);}
};
Json metadata(const fs::path &file){const auto j=Json::parse(bmh::editor::read_file(file));if(j.at("world")!="synthetic")throw std::runtime_error("wrong world");return j;}
CareerFiles::Writer writer(int value){return [value](const fs::path &file){bmh::editor::write_atomic(file,Json{{"world","synthetic"},{"value",value}}.dump(),false);};}
void transactions(){
Fixture f;CareerFiles store(f.root/"careers",metadata);require(store.list().empty()&&!fs::exists(store.directory()),"browsing created storage");
auto first=store.put("Öffnung",writer(1));const auto original=bmh::editor::read_file(store.file(first.id));require(first.data.at("value")==1&&store.read(first.id,first.token).bytes==original.size(),"published save differs");
rejected([&]{store.put("o\xcc\x88" "FFNUNG",writer(2));},"casefold duplicate replaced save");
rejected([&]{store.put(first.name,writer(2),first.id,"stale");},"stale overwrite accepted");
rejected([&]{store.put(first.name,[](const auto &file){bmh::editor::write_atomic(file,"partial",false);throw std::runtime_error("disk error");},first.id,first.token);},"writer failure published");
rejected([&]{store.put(first.name,[](const auto &file){bmh::editor::write_atomic(file,"not a career",false);},first.id,first.token);},"invalid replacement published");
require(bmh::editor::read_file(store.file(first.id))==original,"failed replacement damaged original");
auto second=store.put(first.name,writer(2),first.id,first.token);require(second.data.at("value")==2&&second.token!=first.token,"confirmed overwrite lost new state");
rejected([&]{store.remove(first.id,first.token);},"old deletion token accepted");
const auto renamed=store.rename(second.id,second.token,"Neue Saison");require(!fs::exists(store.file(second.id))&&renamed.data==second.data,"rename altered data");
const auto exported=f.root/"export.obs";store.export_file(renamed.id,renamed.token,exported);require(bmh::editor::read_file(exported)==bmh::editor::read_file(store.file(renamed.id)),"export altered bytes");
rejected([&]{store.export_file(renamed.id,renamed.token,exported);},"export overwrote without consent");
rejected([&]{store.export_file(renamed.id,renamed.token,store.file("Other.obs"));},"export mutated internal library");
const auto imported=store.import_file(exported);require(imported.id!=renamed.id&&imported.data==renamed.data,"import replaced an existing entry");
bmh::editor::write_atomic(store.file(renamed.id),Json{{"world","synthetic"},{"value",3}}.dump());
rejected([&]{store.read(renamed.id,renamed.token);},"external mutation missed on read");
rejected([&]{store.rename(renamed.id,renamed.token,"Stale");},"external mutation missed on rename");
rejected([&]{store.remove(renamed.id,renamed.token);},"external mutation missed on delete");
rejected([&]{store.export_file(renamed.id,renamed.token,f.root/"stale.obs");},"external mutation missed on export");
store.remove(imported.id,imported.token);require(!fs::exists(store.file(imported.id)),"delete retained selected save");
bmh::editor::write_atomic(store.file("Corrupt.obs"),"damaged");const auto entries=store.list();bool corrupt=false;for(const auto &e:entries)if(e.id=="Corrupt.obs")corrupt=!e.valid()&&!e.token.empty();require(corrupt,"corrupt entry disappeared or became loadable");
for(const auto &p:fs::directory_iterator(store.directory()))require(!bmh::editor::utf8(p.path().filename()).starts_with(".pending-"),"staging leak");
}
void boundaries(){
Fixture f;CareerFiles store(f.root/"library",metadata);
for(const auto *name:{"../escape.obs","a/b.obs","a\\b.obs",".hidden.obs","wrong.json",""})rejected([&]{store.read(name);},"unsafe identifier accepted");
for(const auto *name:{"CON","../escape","", "line\nbreak"})rejected([&]{store.put(name,writer(1));},"unsafe filename accepted");
auto max=store.put(std::string(64,'x'),writer(1));const auto free=store.free_name(max.name);require(free!=max.name&&DemoFiles::clean_name(free)==free,"long-name import suffix invalid");
const auto before=store.list().size();rejected([&]{store.put("Wrong world",[](const auto &p){bmh::editor::write_atomic(p,"{\"world\":\"other\"}",false);});},"foreign world accepted");require(store.list().size()==before,"foreign import changed library");
std::error_code e;fs::create_symlink(store.file(max.id),store.file("Link.obs"),e);if(!e){rejected([&]{store.read("Link.obs");},"linked source accepted");rejected([&]{store.remove("Link.obs",max.token);},"linked source deleted");}
fs::create_directory_symlink(store.directory(),f.root/"linked",e);if(!e){CareerFiles linked(f.root/"linked",metadata);rejected([&]{linked.list();},"linked library accepted");}
// Recursive callback simulates concurrent writers. OS locks release after the failure.
rejected([&]{store.put("Outer",[&](const auto &){store.put("Inner",writer(7));});},"simultaneous writers accepted");
require(store.put("After failed lock",writer(8)).valid(),"failed writer retained lock");
}
}
int main(){try{transactions();boundaries();std::cout<<"career files: transactions, stale files, failed producers, imports, names and boundaries passed\n";return 0;}catch(const std::exception &e){std::cerr<<e.what()<<'\n';return 1;}}
+20 -1
View File
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-only
// Opt-in private-data probe. Never registered as an unconditional CTest.
#include "modern/ui/engine_bridge.hpp"
#include "modern/ui/career_files.hpp"
#include "content/package.hpp"
#include "modern/app/modern_session.hpp"
#include "modern/content/world_package.hpp"
#include "modern/ui/demo_opening.hpp"
@@ -13,7 +15,7 @@ using namespace bmh::modern_ui;
int main(int argc, char **argv) {
try {
const std::string mode=argc>1?argv[1]:"";
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac"};
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files"};
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <world.obw> <new-output-directory>");
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
@@ -128,6 +130,23 @@ int main(int argc, char **argv) {
auto link = EngineBridge::open(world, out / "input.obs");
const auto before = link->snapshot(); write("before.json", before);
if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection");
if(mode=="verify-files") {
auto store=make_career_files(out/"library",world);const auto meta=link->file_metadata();write("metadata.json",meta);
const auto first=store.put("Erste Saison",[&](const auto &path){link->save_copy(path);});
if(first.data!=meta||link->snapshot()!=before)throw std::runtime_error("save/list changed state or metadata");
// A real command changes revision; loading the saved copy must restore the earlier career.
const auto current=engine_money_minor(before.at("stadium").at("data").at("ticketPrice"))/100;
const auto request=engine_ticket_command(before,int(current==20?21:20),"request:file-change");
const auto response=link->command(request);write("changed-response.json",response);if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());
link->load_same_world(store.file(first.id),first.token);if(link->snapshot()!=before)throw std::runtime_error("staged load failed to restore snapshot");
store.export_file(first.id,first.token,out/"export.obs");const auto imported=store.import_file(out/"export.obs");if(imported.data!=first.data)throw std::runtime_error("real OBS import metadata differs");
editor::write_atomic(out/"damaged.obs","damaged");
auto documents=content::read_archive(store.file(first.id));auto driver=Json::parse(documents.at("state/driver.json"));driver["schema"]="invalid-driver";documents["state/driver.json"]=driver.dump();auto integrity=Json::parse(documents.at("state/integrity.json"));integrity["entries"]["state/driver.json"]=content::sha256(documents.at("state/driver.json"));documents["state/integrity.json"]=integrity.dump();content::write_archive(documents,out/"bad-driver.obs",false);
Json rejected=Json::array();for(const auto *file:{"damaged.obs","bad-driver.obs"}){bool caught=false;try{link->load_same_world(out/file);}catch(const std::exception &e){caught=true;rejected.push_back({{"file",file},{"error",e.what()}});}if(!caught||link->snapshot()!=before)throw std::runtime_error("rejected load damaged old session");}
// A command after the failed staged constructor catches leaked process-global layout state.
const auto after=link->command(request);if(after.value("messageType","")!="command_result")throw std::runtime_error("old session no longer usable after failed load");
write("rejected.json",rejected);write("after-failures.json",link->snapshot());write("receipt.json",{{"status","passed"},{"realObsRoundTrip",true},{"failedLoadPreservesSession",true},{"metadataReadOnly",true}});std::cout<<"real OBS file library and staged load failure preservation passed\n";return 0;
}
if (std::string(argv[1]) == "inspect-friendlies") {
const auto &opponents=before.at("friendly-plan").at("data").at("opponents");
if(opponents.empty())throw std::runtime_error("no friendly opponents");