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

properly store username in device parameters

Browse Source
This commit is contained in:
Michael Zanetti 2014-06-19 23:30:54 +02:00
parent 70b6cffda7
commit 861f5704ef
4 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libguh/plugin/device.cpp
View File

@ -111,6 +111,18 @@ QVariant Device::paramValue(const QString &paramName) const
return QVariant();
}
void Device::setParamValue(const QString &paramName, const QVariant &value)
{
QList<Param> params;
foreach (Param param, m_params) {
if (param.name() == paramName) {
param.setValue(value);
}
params.append(param);
}
m_params = params;
}
/*! Returns the states of this Device. It must match the \l{StateType} description in the associated \l{DeviceClass}. */
QList<State> Device::states() const
{

1
libguh/plugin/device.h
View File

@ -49,6 +49,7 @@ public:
void setParams(const QList<Param> &params);
QVariant paramValue(const QString &paramName) const;
void setParamValue(const QString &paramName, const QVariant &value);
QList<State> states() const;
bool hasState(const StateTypeId &stateTypeId) const;

34
plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp
View File

@ -69,6 +69,8 @@ QList<DeviceClass> DevicePluginPhilipsHue::supportedDevices() const
QList<ParamType> paramTypes;
ParamType ipParam("ip", QVariant::String);
paramTypes.append(ipParam);
ParamType usernameParam("username", QVariant::String);
paramTypes.append(usernameParam);
deviceClassHue.setParamTypes(paramTypes);
QList<StateType> hueStates;
@ -146,6 +148,12 @@ DeviceManager::DeviceError DevicePluginPhilipsHue::discoverDevices(const DeviceC
return DeviceManager::DeviceErrorAsync;
}
QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginPhilipsHue::setupDevice(Device *device)
{
qDebug() << "setupDevice" << device->params();
return reportDeviceSetup();
}
QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginPhilipsHue::confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const QList<Param> &params)
{
Param ipParam;
@ -157,12 +165,19 @@ QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginPhilipsHue::confirm
if (!ipParam.isValid()) {
return reportDeviceSetup(DeviceManager::DeviceSetupStatusFailure, "Missing parameter: ip");
}
QString username = "guh-" + QUuid::createUuid().toString().remove(QRegExp("[\\{\\}]*")).remove(QRegExp("\\-[0-9a-f\\-]*"));
Param usernameParam;
foreach (const Param &param, params) {
if (param.name() == "username") {
usernameParam = param;
}
}
if (!usernameParam.isValid()) {
return reportDeviceSetup(DeviceManager::DeviceSetupStatusFailure, "Missing parameter: username");
}
QVariantMap createUserParams;
createUserParams.insert("devicetype", "guh");
createUserParams.insert("username", username);
createUserParams.insert("username", usernameParam.value().toString());
QJsonDocument jsonDoc = QJsonDocument::fromVariant(createUserParams);
QByteArray data = jsonDoc.toJson();
@ -171,8 +186,7 @@ QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginPhilipsHue::confirm
QNetworkReply *reply = m_nam->post(request, data);
connect(reply, &QNetworkReply::finished, this, &DevicePluginPhilipsHue::createUserFinished);
HueBridgeConnection *bridge = new HueBridgeConnection(QHostAddress(ipParam.value().toString()), username);
m_pairings.insert(reply, qMakePair<QUuid, HueBridgeConnection*>(pairingTransactionId, bridge));
m_pairings.insert(reply, pairingTransactionId);
return reportDeviceSetup(DeviceManager::DeviceSetupStatusAsync);
}
@ -202,6 +216,8 @@ void DevicePluginPhilipsHue::discoveryDone(const QList<QHostAddress> &bridges)
QList<Param> params;
Param param("ip", bridge.toString());
params.append(param);
Param userParam("username", "guh-" + QUuid::createUuid().toString().remove(QRegExp("[\\{\\}]*")).remove(QRegExp("\\-[0-9a-f\\-]*")));
params.append(userParam);
descriptor.setParams(params);
deviceDescriptors.append(descriptor);
}
@ -214,15 +230,12 @@ void DevicePluginPhilipsHue::createUserFinished()
QNetworkReply *reply = static_cast<QNetworkReply*>(sender());
QByteArray data = reply->readAll();
QPair<QUuid, HueBridgeConnection*> pair = m_pairings.take(reply);
QUuid pairingTransactionId = pair.first;
HueBridgeConnection *bridge = pair.second;
QUuid pairingTransactionId = m_pairings.take(reply);
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error);
if (error.error != QJsonParseError::NoError) {
emit pairingFinished(pairingTransactionId, DeviceManager::DeviceSetupStatusFailure, "Pairing failed. Failed to parse response from Hue Bridge.");
delete bridge;
return;
}
@ -231,12 +244,9 @@ void DevicePluginPhilipsHue::createUserFinished()
if (response.contains("error")) {
qDebug() << "Failed to pair Hue bridge:" << response.value("error").toMap().value("description");
emit pairingFinished(pairingTransactionId, DeviceManager::DeviceSetupStatusFailure, "Pairing failed:" + response.value("error").toMap().value("description").toString());
delete bridge;
return;
}
emit pairingFinished(pairingTransactionId, DeviceManager::DeviceSetupStatusSuccess, QString());
m_bridges.append(bridge);
qDebug() << "response" << response << data;
}

6
plugins/deviceplugins/philipshue/devicepluginphilipshue.h
View File

@ -48,6 +48,8 @@ public:
QList<ParamType> configurationDescription() const override;
DeviceManager::DeviceError discoverDevices(const DeviceClassId &deviceClassId, const QVariantMap &params) const override;
QPair<DeviceManager::DeviceSetupStatus, QString> setupDevice(Device *device) override;
QPair<DeviceManager::DeviceSetupStatus, QString> confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const QList<Param> &params) override;
public slots:
@ -63,9 +65,7 @@ private:
Discovery *m_discovery;
QNetworkAccessManager *m_nam;
QHash<QNetworkReply*, QPair<QUuid, HueBridgeConnection*> > m_pairings;
QList<HueBridgeConnection*> m_bridges;
QHash<QNetworkReply*, QUuid> m_pairings;
};
#endif // DEVICEPLUGINBOBLIGHT_H