Grasscutters/Akebi-GC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

json parsing checker

Browse Source
This commit is contained in:
HarrySilan 2022-08-10 20:03:06 +08:00
parent 375c2a8540
commit c10b97115d
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cheat-library/src/user/cheat/teleport/CustomTeleports.cpp
View File

@ -24,7 +24,7 @@ namespace cheat::feature
NF(f_DelayTime, "Delay time (in s)", "CustomTeleports", 20), NF(f_DelayTime, "Delay time (in s)", "CustomTeleports", 20),
NF(f_Interpolate, "Interpolate Teleport", "CustomTeleports", false), NF(f_Interpolate, "Interpolate Teleport", "CustomTeleports", false),
NF(f_Speed, "Interpolation Speed", "CustomTeleports", 10.0f), NF(f_Speed, "Interpolation Speed", "CustomTeleports", 10.0f),
dir(util::GetCurrentPath() / "teleports"), dir(util::GetCurrentPath() /= "teleports"),
nextTime(0) nextTime(0)
{ {
f_Next.value().PressedEvent += MY_METHOD_HANDLER(CustomTeleports::OnNext); f_Next.value().PressedEvent += MY_METHOD_HANDLER(CustomTeleports::OnNext);
@ -83,16 +83,19 @@ namespace cheat::feature
} }
} }
Teleport CustomTeleports::SerializeFromJson(std::string json, bool fromfile) std::optional<Teleport> CustomTeleports::SerializeFromJson(std::string json, bool fromfile)
{ {
nlohmann::json j; nlohmann::json j;
try { j = nlohmann::json::parse(json);} try { j = nlohmann::json::parse(json); }
catch (nlohmann::json::parse_error &e) catch (nlohmann::json::parse_error& e)
{ {
LOG_ERROR("Invalid JSON Format"); LOG_ERROR("Invalid JSON Format");
LOG_ERROR("Failed to parse JSON: %s", e.what()); LOG_ERROR("Failed to parse JSON: %s", e.what());
return std::nullopt;
} }
std::string teleportName; std::string teleportName;
teleportName = j["name"]; teleportName = j["name"];
if (j["name"].is_null() && fromfile) if (j["name"].is_null() && fromfile)
{ {
@ -102,7 +105,8 @@ namespace cheat::feature
std::string description; std::string description;
if (j["description"].is_null()) description = ""; if (j["description"].is_null()) description = "";
else description = j["description"]; else description = j["description"];
return Teleport_(teleportName, {j["position"][0], j["position"][1], j["position"][2]}, description); return Teleport_(teleportName, { j["position"][0], j["position"][1], j["position"][2] }, description);
} }
void CustomTeleports::ReloadTeleports() void CustomTeleports::ReloadTeleports()
@ -117,7 +121,8 @@ namespace cheat::feature
std::ifstream ifs(file.path()); std::ifstream ifs(file.path());
std::string json; std::string json;
std::getline(ifs, json); std::getline(ifs, json);
SerializeTeleport(SerializeFromJson(json, true)); auto t = SerializeFromJson(json, true);
if(t.has_value()) SerializeTeleport(t.value());
} }
} }
} }
@ -289,10 +294,16 @@ namespace cheat::feature
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Load from JSON")) if (ImGui::Button("Load from JSON"))
{ {
selectedIndex = -1; if (!JSONBuffer_.empty()) {
UpdateIndexName(); auto t = SerializeFromJson(JSONBuffer_, false);
SerializeTeleport(SerializeFromJson(JSONBuffer_, false)); if (t.has_value()) {
JSONBuffer_ = ""; selectedIndex = -1;
UpdateIndexName();
SerializeTeleport(t.value());
}
JSONBuffer_.clear();
}
} }
ImGui::InputTextMultiline("JSON input", &JSONBuffer_, ImVec2(0, 50), ImGuiInputTextFlags_AllowTabInput); ImGui::InputTextMultiline("JSON input", &JSONBuffer_, ImVec2(0, 50), ImGuiInputTextFlags_AllowTabInput);

2
cheat-library/src/user/cheat/teleport/CustomTeleports.h
View File

@ -41,7 +41,7 @@ namespace cheat::feature
Teleport Teleport_(std::string name, app::Vector3 position, std::string description); Teleport Teleport_(std::string name, app::Vector3 position, std::string description);
void SerializeTeleport(Teleport t); void SerializeTeleport(Teleport t);
void ReloadTeleports(); void ReloadTeleports();
Teleport SerializeFromJson(std::string json, bool fromfile); std::optional<Teleport> SerializeFromJson(std::string json, bool fromfile);
void DrawMain() override; void DrawMain() override;