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

got rid of last use of Engine singleton in C++ (except the qml singleton provider)

Browse Source
This commit is contained in:
Michael Zanetti 2018-09-01 00:57:17 +02:00
parent c3dd7da60c
commit 56d30ea0ca
7 changed files with 34 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libnymea-app-core/devicemanager.cpp
View File

@ -101,10 +101,9 @@ void DeviceManager::notificationReceived(const QVariantMap &data)
}
dev->setStateValue(data.value("params").toMap().value("stateTypeId").toUuid(), data.value("params").toMap().value("value"));
} else if (notification == "Devices.DeviceAdded") {
Device *dev = new Device();
if (!JsonTypes::unpackDevice(data.value("params").toMap().value("device").toMap(), dev)) {
Device *dev = JsonTypes::unpackDevice(data.value("params").toMap().value("device").toMap(), m_deviceClasses);
if (!dev) {
qWarning() << "Cannot parse json device:" << data;
delete dev;
return;
}
DeviceClass *dc = deviceClasses()->getDeviceClass(dev->deviceClassId());
@ -113,7 +112,6 @@ void DeviceManager::notificationReceived(const QVariantMap &data)
delete dev;
return;
}
dev->setDeviceClass(dc);
m_devices->addDevice(dev);
} else if (notification == "Devices.DeviceRemoved") {
QUuid deviceId = data.value("params").toMap().value("deviceId").toUuid();
@ -129,7 +127,7 @@ void DeviceManager::notificationReceived(const QVariantMap &data)
qWarning() << "Received a device changed notification for a device we don't know";
return;
}
if (!JsonTypes::unpackDevice(data.value("params").toMap().value("device").toMap(), oldDevice)) {
if (!JsonTypes::unpackDevice(data.value("params").toMap().value("device").toMap(), m_deviceClasses, oldDevice)) {
qWarning() << "Error parsing device changed notification";
return;
}
@ -216,25 +214,17 @@ void DeviceManager::getConfiguredDevicesResponse(const QVariantMap &params)
if (params.value("params").toMap().keys().contains("devices")) {
QVariantList deviceList = params.value("params").toMap().value("devices").toList();
foreach (QVariant deviceVariant, deviceList) {
Device *device = new Device();
if (!JsonTypes::unpackDevice(deviceVariant.toMap(), device)) {
qWarning() << "Error parsing device json" << deviceVariant;
Device *device = JsonTypes::unpackDevice(deviceVariant.toMap(), m_deviceClasses);
if (!device) {
qWarning() << "Error unpacking device" << deviceVariant;
continue;
}
// qDebug() << QJsonDocument::fromVariant(deviceVariant).toJson();
DeviceClass *dc = m_deviceClasses->getDeviceClass(device->deviceClassId());
if (!dc) {
qWarning() << "Can't find a deviceClass for this device" << device->name();
continue;
}
device->setDeviceClass(dc);
// set initial state values
QVariantList stateVariantList = deviceVariant.toMap().value("states").toList();
foreach (const QVariant &stateMap, stateVariantList) {
QString stateTypeId = stateMap.toMap().value("stateTypeId").toString();
StateType *st = dc->stateTypes()->getStateType(stateTypeId);
StateType *st = device->deviceClass()->stateTypes()->getStateType(stateTypeId);
if (!st) {
qWarning() << "Can't find a statetype for this state";
continue;
@ -262,19 +252,11 @@ void DeviceManager::addDeviceResponse(const QVariantMap &params)
qWarning() << "Failed to add the device:" << params.value("params").toMap().value("deviceError").toString();
} else if (params.value("params").toMap().keys().contains("device")) {
QVariantMap deviceVariant = params.value("params").toMap().value("device").toMap();
Device *device = new Device();
if (!JsonTypes::unpackDevice(deviceVariant, device)) {
Device *device = JsonTypes::unpackDevice(deviceVariant, m_deviceClasses);
if (!device) {
qWarning() << "Couldn't parse json in addDeviceResponse";
device->deleteLater();
return;
}
DeviceClass *dc = deviceClasses()->getDeviceClass(device->deviceClassId());
if (!dc) {
qWarning() << "Uh.. We couldn't find a DeviceClass for the Device we just added. Skipping...";
device->deleteLater();
return;
}
device->setDeviceClass(dc);
qDebug() << "Device added" << device->id().toString();
m_devices->addDevice(device);

2
libnymea-app-core/engine.h
View File

@ -46,7 +46,7 @@ class Engine : public QObject
Q_PROPERTY(AWSClient* awsClient READ awsClient CONSTANT)
public:
// static Engine *instance();
static Engine *instance();
bool connected() const;
QString connectedHost() const;

23
libnymea-app-core/jsonrpc/jsontypes.cpp
View File

@ -196,11 +196,23 @@ ActionType *JsonTypes::unpackActionType(const QVariantMap &actionTypeMap, QObjec
return actionType;
}
bool JsonTypes::unpackDevice(const QVariantMap &deviceMap, Device *device)
Device* JsonTypes::unpackDevice(const QVariantMap &deviceMap, DeviceClasses *deviceClasses, Device *oldDevice)
{
QUuid deviceClassId = deviceMap.value("deviceClassId").toUuid();
DeviceClass *deviceClass = deviceClasses->getDeviceClass(deviceClassId);
if (!deviceClass) {
qWarning() << "Cannot find a device class for this device";
return nullptr;
}
Device *device = nullptr;
if (oldDevice) {
device = oldDevice;
} else {
device = new Device(deviceClass);
}
device->setName(deviceMap.value("name").toString());
device->setId(deviceMap.value("id").toUuid());
device->setDeviceClassId(deviceMap.value("deviceClassId").toUuid());
device->setSetupComplete(deviceMap.value("setupComplete").toBool());
Params *params = device->params();
@ -218,11 +230,6 @@ bool JsonTypes::unpackDevice(const QVariantMap &deviceMap, Device *device)
}
device->setParams(params);
DeviceClass *deviceClass = Engine::instance()->deviceManager()->deviceClasses()->getDeviceClass(device->deviceClassId());
if (!deviceClass) {
qWarning() << "Cannot find a device class for this device..." << device->deviceClassId() << "Skipping...";
return false;
}
States *states = new States(device);
foreach (StateType *stateType, deviceClass->stateTypes()->stateTypes()) {
State *state = new State(device->id(), stateType->id(), stateType->defaultValue(), states);
@ -230,7 +237,7 @@ bool JsonTypes::unpackDevice(const QVariantMap &deviceMap, Device *device)
}
device->setStates(states);
return true;
return device;
}
QVariantMap JsonTypes::packRule(Rule *rule)

5
libnymea-app-core/jsonrpc/jsontypes.h
View File

@ -38,6 +38,7 @@ class ActionType;
class ParamType;
class Device;
class DeviceClasses;
class Param;
class Rule;
class StateEvaluator;
@ -52,7 +53,7 @@ class JsonTypes : public QObject
{
Q_OBJECT
public:
explicit JsonTypes(QObject *parent = 0);
explicit JsonTypes(QObject *parent = nullptr);
static Vendor *unpackVendor(const QVariantMap &vendorMap);
static Plugin *unpackPlugin(const QVariantMap &pluginMap, QObject *parent);
@ -62,7 +63,7 @@ public:
static StateType *unpackStateType(const QVariantMap &stateTypeMap, QObject *parent);
static EventType *unpackEventType(const QVariantMap &eventTypeMap, QObject *parent);
static ActionType *unpackActionType(const QVariantMap &actionTypeMap, QObject *parent);
static bool unpackDevice(const QVariantMap &deviceMap, Device *device);
static Device *unpackDevice(const QVariantMap &deviceMap, DeviceClasses *deviceClasses, Device *oldDevice = nullptr);
static QVariantMap packRule(Rule* rule);
static QVariantList packRuleActions(RuleActions* ruleActions);

17
libnymea-common/types/device.cpp
View File

@ -25,8 +25,9 @@
#include <QDebug>
Device::Device(QObject *parent) :
QObject(parent)
Device::Device(DeviceClass *deviceClass, QObject *parent) :
QObject(parent),
m_deviceClass(deviceClass)
{
}
@ -53,12 +54,7 @@ void Device::setId(const QUuid &id)
QUuid Device::deviceClassId() const
{
return m_deviceClassId;
}
void Device::setDeviceClassId(const QUuid &deviceClassId)
{
m_deviceClassId = deviceClassId;
return m_deviceClass->id();
}
bool Device::setupComplete()
@ -99,11 +95,6 @@ DeviceClass *Device::deviceClass() const
return m_deviceClass;
}
void Device::setDeviceClass(DeviceClass *deviceClass)
{
m_deviceClass = deviceClass;
}
bool Device::hasState(const QUuid &stateTypeId)
{
foreach (State *state, states()->states()) {

9
libnymea-common/types/device.h
View File

@ -44,7 +44,7 @@ class Device : public QObject
Q_PROPERTY(DeviceClass *deviceClass READ deviceClass CONSTANT)
public:
explicit Device(QObject *parent = nullptr);
explicit Device(DeviceClass *deviceClass, QObject *parent = nullptr);
QString name() const;
void setName(const QString &name);
@ -53,7 +53,6 @@ public:
void setId(const QUuid &id);
QUuid deviceClassId() const;
void setDeviceClassId(const QUuid &deviceClassId);
bool setupComplete();
void setSetupComplete(const bool &setupComplete);
@ -71,15 +70,9 @@ public:
Q_INVOKABLE QVariant stateValue(const QUuid &stateTypeId);
void setStateValue(const QUuid &stateTypeId, const QVariant &value);
private:
void setDeviceClass(DeviceClass *deviceClass);
friend class DeviceManager;
private:
QString m_name;
QUuid m_id;
QUuid m_deviceClassId;
bool m_setupComplete;
Params *m_params = nullptr;
States *m_states = nullptr;

1
nymea-app/ui/customviews/SensorView.qml
View File

@ -25,6 +25,7 @@ CustomViewBase {
ValueLogsProxyModel {
id: logsModel
engine: Engine
deviceId: root.device.id
typeIds: [stateType.id]
average: zoomTabBar.currentItem.avg