update for even newer matjson

Cvolton · Nov 11, 2024 · 04f7ab0 · 04f7ab0
1 parent c545a62
commit 04f7ab0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/managers/BaseJsonManager.cpp b/src/managers/BaseJsonManager.cpp
@@ -23,17 +23,7 @@ Result<> BaseJsonManager::load() {
 
     auto savedPath = Mod::get()->getSaveDir() / m_filename;
     if (std::filesystem::exists(savedPath)) {
-        auto result = utils::file::readString(savedPath);
-        if (!result) {
-            return Err(result.unwrapErr());
-        }
-
-        std::string error;
-        auto parsed = matjson::parse(result.unwrap());
-        if (!parsed) {
-            return Err("Unable to parse: {}", parsed.err());
-        }
-        m_json = parsed.unwrap();
+        GEODE_UNWRAP_INTO(m_json, utils::file::readJson(savedPath));
 
         if (!m_json.isObject()) {
             m_json = matjson::Value();
@@ -53,7 +43,7 @@ Result<> BaseJsonManager::save() {
     //std::cout <<  ("Locking shared_lock save") << std::endl;
     std::shared_lock guard(m_jsonMutex);
     //TODO: v4 this func will change
-    std::string savedStr = m_json.dump(matjson::NO_INDENTATION).unwrap();
+    std::string savedStr = m_json.dump(matjson::NO_INDENTATION);
 
     auto res2 = utils::file::writeString(Mod::get()->getSaveDir() / m_filename, savedStr);
     if (!res2) {

diff --git a/src/managers/BetterInfoCache.cpp b/src/managers/BetterInfoCache.cpp
@@ -223,7 +223,10 @@ void BetterInfoCache::checkClaimableLists() {
             if(value["diamonds"].asInt().unwrapOr(0) <= 0) continue;
 
             auto listID = BetterInfo::stoi(key);
-            auto levels = value["levels"].asArray().unwrapOr(std::vector<matjson::Value>());
+            auto levelsRes = value["levels"].asArray();
+            if(!levelsRes) continue;
+
+            auto levels = levelsRes.unwrap();
             auto levelsToClaim = value["levels-to-claim"].asInt().unwrapOr(0);
 
             if(levelsToClaim <= 0) continue;

diff --git a/src/managers/BetterInfoStatsV2.cpp b/src/managers/BetterInfoStatsV2.cpp
@@ -46,7 +46,10 @@ void BetterInfoStatsV2::logDeath(GJGameLevel* level, bool practice, LevelDeath d
 std::pair<int, int> BetterInfoStatsV2::getCommonFail(GJGameLevel* gjLevel) {
     std::unordered_map<int, int> fails;
 
-    auto attempts = levelObject(gjLevel)["attempts"].asArray().unwrapOr(std::vector<matjson::Value>());
+    auto attemptsRes = levelObject(gjLevel)["attempts"].asArray();
+    if(!attemptsRes) return {0,0};
+
+    auto attempts = attemptsRes.unwrap();
     if(attempts.size() == 0) return {0,0};
 
     for(auto& attempt : attempts) {