Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use recursive config patching #653

Merged
merged 1 commit into from
Jan 14, 2020
Merged

Use recursive config patching #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions src/Homie/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,26 +249,7 @@ bool Config::patch(const char* patch) {
deserializeJson(configJsonDoc, configJson);
JsonObject configObject = configJsonDoc.as<JsonObject>();

// To do alow object that dont currently exist to be added like settings.
// if settings wasnt there origionally then it should be allowed to be added by incremental.
for (JsonObject::iterator it = patchObject.begin(); it != patchObject.end(); ++it) {
if (patchObject[it->key()].is<JsonObject>()) {
JsonObject subObject = patchObject[it->key()].as<JsonObject>();
for (JsonObject::iterator it2 = subObject.begin(); it2 != subObject.end(); ++it2) {
if (!configObject.containsKey(it->key()) || !configObject[it->key()].is<JsonObject>()) {
String error = "✖ Config does not contain a ";
error.concat(it->key().c_str());
error.concat(" object");
Interface::get().getLogger() << error << endl;
return false;
}
JsonObject subConfigObject = configObject[it->key()].as<JsonObject>();
subConfigObject[it2->key()] = it2->value();
}
} else {
configObject[it->key()] = it->value();
}
}
_patchJsonObject(configObject, patchObject);

ConfigValidationResult configValidationResult = Validation::validateConfig(configObject);
if (!configValidationResult.valid) {
Expand All @@ -281,6 +262,26 @@ bool Config::patch(const char* patch) {
return true;
}

void Config::_patchJsonObject(JsonObject object, JsonObject patch) {
for (JsonPair patchItem : patch) {
JsonVariant patchElement = patchItem.value();
JsonVariant objectElement = object[patchItem.key()];

// If both object element and patch element are objects, then recursively call this method again
if (objectElement.is<JsonObject>() && patchElement.is<JsonObject>()) {
_patchJsonObject(objectElement.as<JsonObject>(), patchElement.as<JsonObject>());
} else {
// Delete the object element if the patch element is null
if (patchElement.isNull()) {
object.remove(patchItem.key());
} else {
// Otherwise replace the object element value with the patch element value
object[patchItem.key()] = patchElement;
}
}
}
}

bool Config::isValid() const {
return this->_valid;
}
Expand Down
1 change: 1 addition & 0 deletions src/Homie/Config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class Config {
bool _valid;

bool _spiffsBegin();
void _patchJsonObject(JsonObject object, JsonObject patch);
};

const ConfigStruct& Config::get() const {
Expand Down