evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fine

Browse Source 
goodbye nice syntax highlighting
This commit is contained in:
WasabiRaptor 2024-03-07 18:56:13 -05:00
parent f5400e5877
commit c5e568e47c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/base/StarAssets.cpp
View File

@ -676,9 +676,9 @@ Json Assets::checkPatchArray(String const& path, AssetSourcePtr const& source, J
try { try {
newResult = checkPatchArray(path, source, newResult, patch.toArray(), externalRef); newResult = checkPatchArray(path, source, newResult, patch.toArray(), externalRef);
} catch (JsonPatchTestFail const& e) { } catch (JsonPatchTestFail const& e) {
Logger::debug("Patch test failure from file %s in source: '%s' at '%s'. Caused by: %s", path, source->metadata().value("name", ""), m_assetSourcePaths.getLeft(source), e.what()); Logger::debug("Patch test failure from file {} in source: '{}' at '{}'. Caused by: {}", path, source->metadata().value("name", ""), m_assetSourcePaths.getLeft(source), e.what());
} catch (JsonPatchException const& e) { } catch (JsonPatchException const& e) {
Logger::error("Could not apply patch from file %s in source: '%s' at '%s'. Caused by: %s", path, source->metadata().value("name", ""), m_assetSourcePaths.getLeft(source), e.what()); Logger::error("Could not apply patch from file {} in source: '{}' at '{}'. Caused by: {}", path, source->metadata().value("name", ""), m_assetSourcePaths.getLeft(source), e.what());
} }
break; break;
case Json::Type::Object: // if its an object, check for operations, or for if an external file is needed for patches to reference case Json::Type::Object: // if its an object, check for operations, or for if an external file is needed for patches to reference
@ -688,11 +688,11 @@ Json Assets::checkPatchArray(String const& path, AssetSourcePtr const& source, J
try { try {
externalRef = json(patch.toString()); externalRef = json(patch.toString());
} catch (...) { } catch (...) {
throw JsonPatchTestFail(strf("Unable to load reference asset: %s", patch.toString())); throw JsonPatchTestFail(strf("Unable to load reference asset: {}", patch.toString()));
} }
break; break;
default: default:
throw JsonPatchException(strf("Patch data is wrong type: %s", Json::typeName(patch.type()))); throw JsonPatchException(strf("Patch data is wrong type: {}", Json::typeName(patch.type())));
break; break;
} }
} }
@ -711,9 +711,9 @@ Json Assets::readJson(String const& path) const {
try { try {
result = checkPatchArray(pair.first, pair.second, result, patchData, {}); result = checkPatchArray(pair.first, pair.second, result, patchData, {});
} catch (JsonPatchTestFail const& e) { } catch (JsonPatchTestFail const& e) {
Logger::debug("Patch test failure from file %s in source: '%s' at '%s'. Caused by: %s", pair.first, pair.second->metadata().value("name", ""), m_assetSourcePaths.getLeft(pair.second), e.what()); Logger::debug("Patch test failure from file {} in source: '{}' at '{}'. Caused by: {}", pair.first, pair.second->metadata().value("name", ""), m_assetSourcePaths.getLeft(pair.second), e.what());
} catch (JsonPatchException const& e) { } catch (JsonPatchException const& e) {
Logger::error("Could not apply patch from file %s in source: '%s' at '%s'. Caused by: %s", pair.first, pair.second->metadata().value("name", ""), m_assetSourcePaths.getLeft(pair.second), e.what()); Logger::error("Could not apply patch from file {} in source: '{}' at '{}'. Caused by: {}", pair.first, pair.second->metadata().value("name", ""), m_assetSourcePaths.getLeft(pair.second), e.what());
} }
} else if (patchJson.isType(Json::Type::Object)) { //Kae: Do a good ol' json merge instead if the .patch file is a Json object } else if (patchJson.isType(Json::Type::Object)) { //Kae: Do a good ol' json merge instead if the .patch file is a Json object
auto patchData = patchJson.toObject(); auto patchData = patchJson.toObject();
@ -722,7 +722,7 @@ Json Assets::readJson(String const& path) const {
} }
return result; return result;
} catch (std::exception const& e) { } catch (std::exception const& e) {
throw JsonParsingException(strf("Cannot parse json file: %s", path), e); throw JsonParsingException(strf("Cannot parse json file: {}", path), e);
} }
} }