Use actual league names in settings groups and search (by Codex)
This commit is contained in:
1 parent
3a1242650f
commit
f9f950fc7f
7 files changed
+88
-4
No files matched your search
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/demo_settings.hpp"
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include "modern/ui/settings_presentation.hpp"
|
||||
#include <set>
|
||||
namespace bmh::modern_ui {
|
||||
namespace {
|
||||
@@ -21,6 +22,32 @@ Json engine_settings_projection(const Json &bundle) {
|
||||
require_settings(read.at("meta").at(key) == meta.at(key),
|
||||
"Die Einstellungen sind veraltet.");
|
||||
const auto &data = read.at("data");
|
||||
require_settings(data.at("leagueGroups").is_array() &&
|
||||
data.at("leagueGroups").size() == 5,
|
||||
"Unvollständige Wettbewerbszuordnung.");
|
||||
Json titles = Json::object();
|
||||
std::set<std::string> leagues;
|
||||
for (size_t i = 0; i < 5; ++i) {
|
||||
const auto &group = data.at("leagueGroups")[i];
|
||||
const auto row = std::string(1, char('A' + i));
|
||||
const auto &id = group.at("competitionId"), &name = group.at("name");
|
||||
require_settings(group.at("row") == row &&
|
||||
((id.is_null() && name.is_null()) ||
|
||||
(id.is_string() && !id.get<std::string>().empty() &&
|
||||
name.is_string() && !name.get<std::string>().empty() &&
|
||||
leagues.insert(id.get<std::string>()).second)),
|
||||
"Ungültige Wettbewerbszuordnung.");
|
||||
titles[row] = name.is_null() ? "Wettbewerb " + row : name.get<std::string>();
|
||||
}
|
||||
Json catalogue = live_settings_catalogue();
|
||||
for (auto &group : catalogue.at("groups"))
|
||||
if (group.contains("competitions"))
|
||||
for (auto &competition : group["competitions"]) {
|
||||
const auto code = competition.at("options").at(0).at("code").get<std::string>();
|
||||
const auto row = code.substr(0, 1);
|
||||
if (titles.contains(row))
|
||||
competition["title"] = titles.at(row);
|
||||
}
|
||||
require_settings(data.at("cells").is_array() &&
|
||||
data.at("cells").size() == 180,
|
||||
"Unvollständige Spieloptionen.");
|
||||
@@ -89,6 +116,7 @@ Json engine_settings_projection(const Json &bundle) {
|
||||
{"formation", data.at("formation")}}},
|
||||
{"cells", capabilities},
|
||||
{"automation", auto_caps},
|
||||
{"catalogue", std::move(catalogue)},
|
||||
{"formations", data.at("formations")}};
|
||||
}
|
||||
Json engine_settings_command(const Json &bundle, const Json &draft,
|
||||
|
||||
Reference in new issue
Block a user