jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-29 22:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix json issues when subkey does not exist

Browse Source
This commit is contained in:
fvanroie 2020-04-12 21:51:37 +02:00
parent 6f78873114
commit 46dcc0b386
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hasp_config.cpp
View File

@ -163,22 +163,27 @@ void configWriteConfig()
configFile = String(FPSTR(HASP_CONFIG_FILE)); configFile = String(FPSTR(HASP_CONFIG_FILE));
/* Read Config File */ /* Read Config File */
DynamicJsonDocument settings(8 * 256); DynamicJsonDocument doc(8 * 256);
Log.notice(F("CONF: Config LOADING first %s"), configFile.c_str()); Log.notice(F("CONF: Config LOADING first %s"), configFile.c_str());
configGetConfig(settings, false); configGetConfig(doc, false);
Log.trace(F("CONF: Config LOADED first %s"), configFile.c_str()); Log.trace(F("CONF: Config LOADED first %s"), configFile.c_str());
bool writefile = false; bool writefile = false;
bool changed = false; bool changed = false;
JsonObject settings;
settings = doc.as<JsonObject>();
#if HASP_USE_WIFI #if HASP_USE_WIFI
changed = wifiGetConfig(settings[F("wifi")].as<JsonObject>()); if(!settings[F("wifi")].is<JsonObject>()) settings[F("wifi")].to<JsonObject>();
changed = wifiGetConfig(settings[F("wifi")]);
if(changed) { if(changed) {
Log.verbose(F("WIFI: Settings changed")); Log.verbose(F("WIFI: Settings changed"));
writefile = true; writefile = true;
} }
#if HASP_USE_MQTT #if HASP_USE_MQTT
changed = mqttGetConfig(settings[F("mqtt")].as<JsonObject>()); if(!settings[F("mqtt")].is<JsonObject>()) settings[F("mqtt")].to<JsonObject>();
changed = mqttGetConfig(settings[F("mqtt")]);
if(changed) { if(changed) {
Log.verbose(F("MQTT: Settings changed")); Log.verbose(F("MQTT: Settings changed"));
configOutput(settings[F("mqtt")]); configOutput(settings[F("mqtt")]);
@ -186,7 +191,8 @@ void configWriteConfig()
} }
#endif #endif
#if HASP_USE_TELNET #if HASP_USE_TELNET
changed = telnetGetConfig(settings[F("telnet")].as<JsonObject>()); if(!settings[F("telnet")].is<JsonObject>()) settings[F("telnet")].to<JsonObject>();
changed = telnetGetConfig(settings[F("telnet")]);
if(changed) { if(changed) {
Log.verbose(F("TELNET: Settings changed")); Log.verbose(F("TELNET: Settings changed"));
configOutput(settings[F("telnet")]); configOutput(settings[F("telnet")]);
@ -194,14 +200,16 @@ void configWriteConfig()
} }
#endif #endif
#if HASP_USE_MDNS #if HASP_USE_MDNS
changed = mdnsGetConfig(settings[F("mdns")].as<JsonObject>()); if(!settings[F("mdns")].is<JsonObject>()) settings[F("mdns")].to<JsonObject>();
changed = mdnsGetConfig(settings[F("mdns")]);
if(changed) { if(changed) {
Log.verbose(F("MDNS: Settings changed")); Log.verbose(F("MDNS: Settings changed"));
writefile = true; writefile = true;
} }
#endif #endif
#if HASP_USE_HTTP #if HASP_USE_HTTP
changed = httpGetConfig(settings[F("http")].as<JsonObject>()); if(!settings[F("http")].is<JsonObject>()) settings[F("http")].to<JsonObject>();
changed = httpGetConfig(settings[F("http")].as<JsonVariant>());
if(changed) { if(changed) {
Log.verbose(F("HTTP: Settings changed")); Log.verbose(F("HTTP: Settings changed"));
configOutput(settings[F("http")]); configOutput(settings[F("http")]);
@ -210,31 +218,34 @@ void configWriteConfig()
#endif #endif
#endif #endif
changed = debugGetConfig(settings[F("debug")].as<JsonObject>()); if(!settings[F("debug")].is<JsonObject>()) settings[F("debug")].to<JsonObject>();
changed = debugGetConfig(settings[F("debug")].as<JsonVariant>());
if(changed) { if(changed) {
Log.verbose(F("DEBUG: Settings changed")); Log.verbose(F("DEBUG: Settings changed"));
writefile = true; writefile = true;
} }
changed = guiGetConfig(settings[F("gui")].as<JsonObject>()); if(!settings[F("gui")].is<JsonObject>()) settings[F("gui")].to<JsonObject>();
changed = guiGetConfig(settings[F("gui")].as<JsonVariant>());
if(changed) { if(changed) {
Log.verbose(F("GUI: Settings changed")); Log.verbose(F("GUI: Settings changed"));
writefile = true; writefile = true;
} }
changed = haspGetConfig(settings[F("hasp")].as<JsonObject>()); if(!settings[F("hasp")].is<JsonObject>()) settings[F("hasp")].to<JsonObject>();
changed = haspGetConfig(settings[F("hasp")].as<JsonVariant>());
if(changed) { if(changed) {
Log.verbose(F("HASP: Settings changed")); Log.verbose(F("HASP: Settings changed"));
writefile = true; writefile = true;
} }
// changed |= otaGetConfig(settings[F("ota")].to<JsonObject>()); // changed |= otaGetConfig(settings[F("ota")].as<JsonObject>());
if(writefile) { if(writefile) {
File file = SPIFFS.open(configFile, "w"); File file = SPIFFS.open(configFile, "w");
if(file) { if(file) {
Log.notice(F("CONF: Writing %s"), configFile.c_str()); Log.notice(F("CONF: Writing %s"), configFile.c_str());
size_t size = serializeJson(settings, file); size_t size = serializeJson(doc, file);
file.close(); file.close();
if(size > 0) { if(size > 0) {
Log.verbose(F("CONF: [SUCCESS] Saved %s"), configFile.c_str()); Log.verbose(F("CONF: [SUCCESS] Saved %s"), configFile.c_str());