ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #601: Allow registering lists of ThingId on json rpc

Browse Source
This commit is contained in:
jenkins 2022-12-13 21:05:00 +01:00
commit 375c513186
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libnymea/jsonrpc/jsonhandler.cpp
View File

@ -208,7 +208,7 @@ void JsonHandler::registerObject(const QMetaObject &metaObject)
typeName = QString("$ref:BasicType"); typeName = QString("$ref:BasicType");
} else if (QString(metaProperty.typeName()).startsWith("QList")) { } else if (QString(metaProperty.typeName()).startsWith("QList")) {
QString elementType = QString(metaProperty.typeName()).remove("QList<").remove(">"); QString elementType = QString(metaProperty.typeName()).remove("QList<").remove(">");
if (elementType == "EventTypeId" || elementType == "StateTypeId" || elementType == "ActionTypeId") { if (elementType == "ThingId" || elementType == "EventTypeId" || elementType == "StateTypeId" || elementType == "ActionTypeId") {
elementType = "QUuid"; elementType = "QUuid";
} }
QVariant::Type variantType = QVariant::nameToType(elementType.toUtf8()); QVariant::Type variantType = QVariant::nameToType(elementType.toUtf8());
@ -354,6 +354,10 @@ QVariant JsonHandler::pack(const QMetaObject &metaObject, const void *value) con
foreach (const QUuid &entry, propertyValue.value<QList<QUuid>>()) { foreach (const QUuid &entry, propertyValue.value<QList<QUuid>>()) {
list << entry; list << entry;
} }
} else if (propertyTypeName == "QList<ThingId>") {
foreach (const ThingId &entry, propertyValue.value<QList<ThingId>>()) {
list << entry;
}
} else if (propertyTypeName == "QList<EventTypeId>") { } else if (propertyTypeName == "QList<EventTypeId>") {
foreach (const EventTypeId &entry, propertyValue.value<QList<EventTypeId>>()) { foreach (const EventTypeId &entry, propertyValue.value<QList<EventTypeId>>()) {
list << entry; list << entry;
@ -482,6 +486,7 @@ QVariant JsonHandler::unpack(const QMetaObject &metaObject, const QVariant &valu
} }
metaProperty.writeOnGadget(ptr, QVariant::fromValue(intList)); metaProperty.writeOnGadget(ptr, QVariant::fromValue(intList));
} else if (metaProperty.typeName() == QStringLiteral("QList<QUuid>") } else if (metaProperty.typeName() == QStringLiteral("QList<QUuid>")
|| metaProperty.typeName() == QStringLiteral("QList<ThingId>")
|| metaProperty.typeName() == QStringLiteral("QList<EventTypeId>") || metaProperty.typeName() == QStringLiteral("QList<EventTypeId>")
|| metaProperty.typeName() == QStringLiteral("QList<StateTypeId>") || metaProperty.typeName() == QStringLiteral("QList<StateTypeId>")
|| metaProperty.typeName() == QStringLiteral("QList<ActionTypeId>")) { || metaProperty.typeName() == QStringLiteral("QList<ActionTypeId>")) {