SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2026-06-18 23:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix JsonEncode with mixed key/value index/value tables

Browse Source
This commit is contained in:
Lion Kortlepel
2022-03-17 19:27:17 +01:00
parent be498be661
commit 39db1a5e42
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/LuaAPI.cpp
+18 -7
View File
@@ -359,13 +359,12 @@ std::string LuaAPI::FS::ConcatPaths(sol::variadic_args Args) {
return Result; return Result;
} }
static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, const sol::object& right, size_t depth = 0) { static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, const sol::object& right, bool is_array, size_t depth = 0) {
if (depth > 100) { if (depth > 100) {
beammp_lua_error("json serialize will not go deeper than 100 nested tables, internal references assumed, aborted this path"); beammp_lua_error("json serialize will not go deeper than 100 nested tables, internal references assumed, aborted this path");
return; return;
} }
std::string key; std::string key;
bool is_array = false;
switch (left.get_type()) { switch (left.get_type()) {
case sol::type::lua_nil: case sol::type::lua_nil:
case sol::type::none: case sol::type::none:
@@ -382,8 +381,7 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
key = left.as<std::string>(); key = left.as<std::string>();
break; break;
case sol::type::number: case sol::type::number:
is_array = true; key = std::to_string(left.as<double>());
// TODO: deal with this
break; break;
} }
nlohmann::json value; nlohmann::json value;
@@ -415,12 +413,19 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
case sol::type::function: case sol::type::function:
beammp_lua_warn("unsure what to do with function in JsonEncode, ignoring"); beammp_lua_warn("unsure what to do with function in JsonEncode, ignoring");
return; return;
case sol::type::table: case sol::type::table: {
bool local_is_array = true;
for (const auto& pair : right.as<sol::table>()) { for (const auto& pair : right.as<sol::table>()) {
JsonEncodeRecursive(value, pair.first, pair.second, depth + 1); if (pair.first.get_type() != sol::type::number) {
local_is_array = false;
}
}
for (const auto& pair : right.as<sol::table>()) {
JsonEncodeRecursive(value, pair.first, pair.second, local_is_array, depth + 1);
} }
break; break;
} }
}
if (is_array) { if (is_array) {
json.push_back(value); json.push_back(value);
} else { } else {
@@ -431,8 +436,14 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
std::string LuaAPI::MP::JsonEncode(const sol::table& object) { std::string LuaAPI::MP::JsonEncode(const sol::table& object) {
nlohmann::json json; nlohmann::json json;
// table // table
bool is_array = true;
for (const auto& pair : object.as<sol::table>()) {
if (pair.first.get_type() != sol::type::number) {
is_array = false;
}
}
for (const auto& entry : object) { for (const auto& entry : object) {
JsonEncodeRecursive(json, entry.first, entry.second); JsonEncodeRecursive(json, entry.first, entry.second, is_array);
} }
return json.dump(); return json.dump();
} }