me/omegafox
1
0
Fork 0
mirror of https://forge.fsky.io/oneflux/omegafox.git synced 2026-02-10 12:02:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated GetJson

Browse source
This commit is contained in:
Paulius Gerve 2025-02-28 10:30:21 +02:00
parent ef6a54509f
commit f0b18df324
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
additions/camoucfg/MaskConfig.hpp
View file

@ -49,9 +49,8 @@ inline const nlohmann::json& GetJson() {
std::call_once(initFlag, []() { std::call_once(initFlag, []() {
std::string jsonString; std::string jsonString;
// First try the chunked environment variables
int index = 1; int index = 1;
while (true) { while (true) {
std::string envName = "CAMOU_CONFIG_" + std::to_string(index); std::string envName = "CAMOU_CONFIG_" + std::to_string(index);
auto partialConfig = get_env_utf8(envName); auto partialConfig = get_env_utf8(envName);
@ -61,22 +60,18 @@ inline const nlohmann::json& GetJson() {
index++; index++;
} }
// If no chunked variables found, try the original CAMOU_CONFIG
if (jsonString.empty()) { if (jsonString.empty()) {
// Check for the original CAMOU_CONFIG as fallback
auto originalConfig = get_env_utf8("CAMOU_CONFIG"); auto originalConfig = get_env_utf8("CAMOU_CONFIG");
if (originalConfig) { if (originalConfig) jsonString = *originalConfig;
jsonString = *originalConfig;
}
} }
// If still empty, return an empty JSON object
if (jsonString.empty()) { if (jsonString.empty()) {
jsonConfig = nlohmann::json{}; jsonConfig = nlohmann::json{};
return; return;
} }
// Validate and parse the JSON // Validate
try {
if (!nlohmann::json::accept(jsonString)) { if (!nlohmann::json::accept(jsonString)) {
printf_stderr("ERROR: Invalid JSON passed to CAMOU_CONFIG!\n"); printf_stderr("ERROR: Invalid JSON passed to CAMOU_CONFIG!\n");
jsonConfig = nlohmann::json{}; jsonConfig = nlohmann::json{};
@ -84,13 +79,8 @@ inline const nlohmann::json& GetJson() {
} }
jsonConfig = nlohmann::json::parse(jsonString); jsonConfig = nlohmann::json::parse(jsonString);
} catch (const nlohmann::json::exception& e) {
printf_stderr("ERROR: JSON parsing failed: %s\n", e.what());
jsonConfig = nlohmann::json{};
}
}); });
// Return the cached JSON object
return jsonConfig; return jsonConfig;
} }