7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-22 07:27:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update json to 3.0.1
Some checks are pending
Build Binaries / Build Windows (push) Waiting to run
Details
Build Binaries / Build macOS (push) Waiting to run
Details
Build Binaries / Build Android (64-bit) (push) Waiting to run
Details
Build Binaries / Build Android (32-bit) (push) Waiting to run
Details
Build Binaries / Publish (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
matcool 2024-11-10 19:28:14 -03:00
parent a3beed16f5
commit 4ba8751c68
7 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -241,8 +241,8 @@ if (ANDROID)
endif() endif()
set(MAT_JSON_AS_INTERFACE ON) set(MAT_JSON_AS_INTERFACE ON)
CPMAddPackage("gh:geode-sdk/result@1.1.0") CPMAddPackage("gh:geode-sdk/result@1.1.1")
CPMAddPackage("gh:geode-sdk/json#8c6c325") CPMAddPackage("gh:geode-sdk/json@3.0.1")
CPMAddPackage("gh:fmtlib/fmt#11.0.2") CPMAddPackage("gh:fmtlib/fmt#11.0.2")
target_compile_definitions(${PROJECT_NAME} INTERFACE MAT_JSON_DYNAMIC=1) target_compile_definitions(${PROJECT_NAME} INTERFACE MAT_JSON_DYNAMIC=1)

3
loader/include/Geode/utils/file.hpp
View file

@ -41,8 +41,7 @@ namespace geode::utils::file {
template <class T> template <class T>
Result<> writeToJson(std::filesystem::path const& path, T const& data) { Result<> writeToJson(std::filesystem::path const& path, T const& data) {
GEODE_UNWRAP_INTO(auto str, matjson::Value(data).dump()); GEODE_UNWRAP(writeString(path, matjson::Value(data).dump()));
GEODE_UNWRAP(writeString(path, str));
return Ok(); return Ok();
} }

8
loader/src/loader/ModImpl.cpp
View file

@ -215,15 +215,11 @@ Result<> Mod::Impl::saveData() {
// saveData is expected to be synchronous, and always called from GD thread // saveData is expected to be synchronous, and always called from GD thread
ModStateEvent(m_self, ModEventType::DataSaved).post(); ModStateEvent(m_self, ModEventType::DataSaved).post();
auto res = json.dump().andThen([&](auto const& str) { auto res = utils::file::writeString(m_saveDirPath / "settings.json", json.dump());
return utils::file::writeString(m_saveDirPath / "settings.json", str);
});
if (!res) { if (!res) {
log::error("Unable to save settings: {}", res.unwrapErr()); log::error("Unable to save settings: {}", res.unwrapErr());
} }
auto res2 = m_saved.dump().andThen([&](auto const& str) { auto res2 = utils::file::writeString(m_saveDirPath / "saved.json", m_saved.dump());
return utils::file::writeString(m_saveDirPath / "saved.json", str);
});
if (!res2) { if (!res2) {
log::error("Unable to save values: {}", res2.unwrapErr()); log::error("Unable to save values: {}", res2.unwrapErr());
} }

6
loader/src/platform/mac/LoaderImpl.mm
View file

@ -98,11 +98,7 @@ CFDataRef msgPortCallback(CFMessagePortRef port, SInt32 messageID, CFDataRef dat
std::string cdata(reinterpret_cast<char const*>(CFDataGetBytePtr(data)), CFDataGetLength(data)); std::string cdata(reinterpret_cast<char const*>(CFDataGetBytePtr(data)), CFDataGetLength(data));
auto res = geode::ipc::processRaw(port, cdata).dump(); std::string reply = geode::ipc::processRaw(port, cdata).dump();
if (!res) {
log::warn("Failed to process IPC message: {}", res.unwrapErr());
}
std::string reply = res.unwrapOr("");
return CFDataCreate(NULL, (UInt8 const*)reply.data(), reply.size()); return CFDataCreate(NULL, (UInt8 const*)reply.data(), reply.size());
} }

6
loader/src/platform/windows/IPC.cpp
View file

@ -21,11 +21,7 @@ void ipcPipeThread(HANDLE pipe) {
if (ReadFile(pipe, buffer, sizeof(buffer) - 1, &read, nullptr)) { if (ReadFile(pipe, buffer, sizeof(buffer) - 1, &read, nullptr)) {
buffer[read] = '\0'; buffer[read] = '\0';
auto res = ipc::processRaw((void*)pipe, buffer).dump(); std::string reply = ipc::processRaw((void*)pipe, buffer).dump();
if (!res) {
log::warn("Failed to process IPC message: {}", res.unwrapErr());
}
std::string reply = res.unwrapOr("");
DWORD written; DWORD written;
WriteFile(pipe, reply.c_str(), reply.size(), &written, nullptr); WriteFile(pipe, reply.c_str(), reply.size(), &written, nullptr);

2
loader/src/server/Server.cpp
View file

@ -176,7 +176,7 @@ static Result<matjson::Value, ServerError> parseServerPayload(web::WebResponse c
return Err(ServerError(response.code(), "Expected object, got {}", jsonTypeToString(json.type()))); return Err(ServerError(response.code(), "Expected object, got {}", jsonTypeToString(json.type())));
} }
if (!json.contains("payload")) { if (!json.contains("payload")) {
return Err(ServerError(response.code(), "Object does not contain \"payload\" key - got {}", json.dump().unwrapOr("?"))); return Err(ServerError(response.code(), "Object does not contain \"payload\" key - got {}", json.dump()));
} }
return Ok(json["payload"]); return Ok(json["payload"]);
} }

3
loader/src/utils/web.cpp
View file

@ -592,8 +592,7 @@ WebRequest& WebRequest::bodyString(std::string_view str) {
} }
WebRequest& WebRequest::bodyJSON(matjson::Value const& json) { WebRequest& WebRequest::bodyJSON(matjson::Value const& json) {
this->header("Content-Type", "application/json"); this->header("Content-Type", "application/json");
// TODO: mat std::string str = json.dump(matjson::NO_INDENTATION);
std::string str = json.dump(matjson::NO_INDENTATION).unwrapOr("");
m_impl->m_body = ByteVector { str.begin(), str.end() }; m_impl->m_body = ByteVector { str.begin(), str.end() };
return *this; return *this;
} }