uvos/UvosSmartHomeInterface
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Item: only save fields that are set in the item

Browse source
This commit is contained in:
Carl Philipp Klemm 2026-04-25 23:40:35 +02:00
parent 221cb519a2
commit a96b27c741
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/items/item.cpp
View file

@ -58,9 +58,9 @@ void ItemData::storeWithChanges(QJsonObject& json, const ItemFieldChanges& chang
json["Name"] = name_; json["Name"] = name_;
if(changes.value) if(changes.value)
json["Value"] = static_cast<double>(value_); json["Value"] = static_cast<double>(value_);
if(changes.groupName) if(changes.groupName && !groupName_.isEmpty() && groupName_ != "All")
json["GroupName"] = groupName_; json["GroupName"] = groupName_;
if(changes.valueNames) if(changes.valueNames && !valueNames_.empty())
{ {
QJsonArray valueNamesArray; QJsonArray valueNamesArray;
for(const QString& name : valueNames_) for(const QString& name : valueNames_)
@ -218,31 +218,37 @@ void Item::store(QJsonObject &json)
{ {
ItemData::store(json); ItemData::store(json);
json["override"] = override_; json["override"] = override_;
QJsonArray actorsArray; if(!actors_.empty())
for(size_t i = 0; i < actors_.size(); ++i)
{ {
if(!actors_[i]->isExausted()) QJsonArray actorsArray;
for(size_t i = 0; i < actors_.size(); ++i)
{ {
QJsonObject actorObject; if(!actors_[i]->isExausted())
actors_[i]->store(actorObject); {
actorsArray.append(actorObject); QJsonObject actorObject;
actors_[i]->store(actorObject);
actorsArray.append(actorObject);
}
} }
json["Actors"] = actorsArray;
} }
json["Actors"] = actorsArray;
} }
void Item::load(const QJsonObject &json, const bool preserve) void Item::load(const QJsonObject &json, const bool preserve)
{ {
ItemData::load(json, preserve); ItemData::load(json, preserve);
override_ = json["override"].toBool(false); override_ = json["override"].toBool(false);
const QJsonArray actorsArray(json["Actors"].toArray(QJsonArray())); if(json.contains("Actors"))
for(int i = 0; i < actorsArray.size(); ++i)
{ {
if(actorsArray[i].isObject()) const QJsonArray actorsArray(json["Actors"].toArray(QJsonArray()));
for(int i = 0; i < actorsArray.size(); ++i)
{ {
std::shared_ptr<Actor> actor = Actor::loadActor(actorsArray[i].toObject()); if(actorsArray[i].isObject())
if(actor != nullptr) {
addActor(actor); std::shared_ptr<Actor> actor = Actor::loadActor(actorsArray[i].toObject());
if(actor != nullptr)
addActor(actor);
}
} }
} }
} }