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

fix hue network error

Browse Source
This commit is contained in:
Simon Stürz 2015-12-18 18:42:40 +01:00 committed by Michael Zanetti
parent b44d5aa9b7
commit a271430204
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
PairingInfo *pairingInfo = m_pairingRequests.take(reply); PairingInfo *pairingInfo = m_pairingRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "Request error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Request error:" << status << reply->errorString();
pairingInfo->deleteLater(); pairingInfo->deleteLater();
reply->deleteLater(); reply->deleteLater();
@ -307,7 +307,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
PairingInfo *pairingInfo = m_informationRequests.take(reply); PairingInfo *pairingInfo = m_informationRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "Request error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Request error:" << status << reply->errorString();
reply->deleteLater(); reply->deleteLater();
pairingInfo->deleteLater(); pairingInfo->deleteLater();
@ -318,7 +318,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
} else if (m_discoveryRequests.contains(reply)) { } else if (m_discoveryRequests.contains(reply)) {
m_discoveryRequests.removeAll(reply); m_discoveryRequests.removeAll(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "N-UPNP discovery error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "N-UPNP discovery error:" << status << reply->errorString();
reply->deleteLater(); reply->deleteLater();
return; return;
@ -329,7 +329,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
Device *device = m_bridgeLightsDiscoveryRequests.take(reply); Device *device = m_bridgeLightsDiscoveryRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "Bridge light discovery error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Bridge light discovery error:" << status << reply->errorString();
bridgeReachableChanged(device, false); bridgeReachableChanged(device, false);
reply->deleteLater(); reply->deleteLater();
@ -341,7 +341,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
Device *device = m_bridgeSensorsDiscoveryRequests.take(reply); Device *device = m_bridgeSensorsDiscoveryRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "Bridge sensor discovery error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Bridge sensor discovery error:" << status << reply->errorString();
bridgeReachableChanged(device, false); bridgeReachableChanged(device, false);
reply->deleteLater(); reply->deleteLater();
@ -353,7 +353,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
Device *device = m_bridgeSearchDevicesRequests.take(reply); Device *device = m_bridgeSearchDevicesRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "Bridge search new devices error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Bridge search new devices error:" << status << reply->errorString();
bridgeReachableChanged(device, false); bridgeReachableChanged(device, false);
reply->deleteLater(); reply->deleteLater();
@ -361,11 +361,25 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
} }
discoverBridgeDevices(m_bridges.key(device)); discoverBridgeDevices(m_bridges.key(device));
} else if (m_bridgeRefreshRequests.keys().contains(reply)) {
Device *device = m_bridgeRefreshRequests.take(reply);
// check HTTP status code
if (status != 200 || reply->error() != QNetworkReply::NoError) {
if (device->stateValue(bridgeReachableStateTypeId).toBool()) {
qCWarning(dcPhilipsHue) << "Refresh Hue Bridge request error:" << status << reply->errorString();
bridgeReachableChanged(device, false);
}
reply->deleteLater();
return;
}
processBridgeRefreshResponse(device, reply->readAll());
} else if (m_lightRefreshRequests.keys().contains(reply)) { } else if (m_lightRefreshRequests.keys().contains(reply)) {
Device *device = m_lightRefreshRequests.take(reply); Device *device = m_lightRefreshRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "Refresh Hue Light request error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Refresh Hue Light request error:" << status << reply->errorString();
bridgeReachableChanged(device, false); bridgeReachableChanged(device, false);
reply->deleteLater(); reply->deleteLater();
@ -377,7 +391,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
Device *device = m_lightsRefreshRequests.take(reply); Device *device = m_lightsRefreshRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
if (device->stateValue(bridgeReachableStateTypeId).toBool()) { if (device->stateValue(bridgeReachableStateTypeId).toBool()) {
qCWarning(dcPhilipsHue) << "Refresh Hue lights request error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Refresh Hue lights request error:" << status << reply->errorString();
bridgeReachableChanged(device, false); bridgeReachableChanged(device, false);
@ -391,7 +405,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
Device *device = m_sensorsRefreshRequests.take(reply); Device *device = m_sensorsRefreshRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
if (device->stateValue(bridgeReachableStateTypeId).toBool()) { if (device->stateValue(bridgeReachableStateTypeId).toBool()) {
qCWarning(dcPhilipsHue) << "Refresh Hue sensors request error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Refresh Hue sensors request error:" << status << reply->errorString();
bridgeReachableChanged(device, false); bridgeReachableChanged(device, false);
@ -401,25 +415,11 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
} }
processSensorsRefreshResponse(device, reply->readAll()); processSensorsRefreshResponse(device, reply->readAll());
} else if (m_bridgeRefreshRequests.keys().contains(reply)) {
Device *device = m_bridgeRefreshRequests.take(reply);
// check HTTP status code
if (status != 200) {
if (device->stateValue(bridgeReachableStateTypeId).toBool()) {
qCWarning(dcPhilipsHue) << "Refresh Hue Bridge request error:" << status << reply->errorString();
bridgeReachableChanged(device, false);
}
reply->deleteLater();
return;
}
processBridgeRefreshResponse(device, reply->readAll());
} else if (m_asyncActions.keys().contains(reply)) { } else if (m_asyncActions.keys().contains(reply)) {
QPair<Device *, ActionId> actionInfo = m_asyncActions.take(reply); QPair<Device *, ActionId> actionInfo = m_asyncActions.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "Execute Hue Light action request error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Execute Hue Light action request error:" << status << reply->errorString();
bridgeReachableChanged(actionInfo.first, false); bridgeReachableChanged(actionInfo.first, false);
emit actionExecutionFinished(actionInfo.second, DeviceManager::DeviceErrorHardwareNotAvailable); emit actionExecutionFinished(actionInfo.second, DeviceManager::DeviceErrorHardwareNotAvailable);
@ -432,7 +432,7 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
Device *device = m_lightSetNameRequests.take(reply); Device *device = m_lightSetNameRequests.take(reply);
// check HTTP status code // check HTTP status code
if (status != 200) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCWarning(dcPhilipsHue) << "Set name of Hue Light request error:" << status << reply->errorString(); qCWarning(dcPhilipsHue) << "Set name of Hue Light request error:" << status << reply->errorString();
bridgeReachableChanged(device, false); bridgeReachableChanged(device, false);
reply->deleteLater(); reply->deleteLater();
@ -440,7 +440,6 @@ void DevicePluginPhilipsHue::networkManagerReplyReady(QNetworkReply *reply)
} }
processSetNameResponse(device, reply->readAll()); processSetNameResponse(device, reply->readAll());
} }
reply->deleteLater(); reply->deleteLater();
} }
@ -622,6 +621,15 @@ void DevicePluginPhilipsHue::refreshLight(Device *device)
void DevicePluginPhilipsHue::refreshBridge(Device *device) void DevicePluginPhilipsHue::refreshBridge(Device *device)
{ {
if (!m_bridgeRefreshRequests.isEmpty()) {
QNetworkReply *reply = m_bridgeRefreshRequests.key(device);
reply->abort();
m_bridgeRefreshRequests.remove(reply);
reply->deleteLater();
bridgeReachableChanged(device, false);
return;
}
HueBridge *bridge = m_bridges.key(device); HueBridge *bridge = m_bridges.key(device);
QNetworkRequest request(QUrl("http://" + bridge->hostAddress().toString() + "/api/" + bridge->apiKey() + "/config")); QNetworkRequest request(QUrl("http://" + bridge->hostAddress().toString() + "/api/" + bridge->apiKey() + "/config"));
@ -920,14 +928,9 @@ void DevicePluginPhilipsHue::processBridgeRefreshResponse(Device *device, const
break; break;
} }
// do lights/sensor update right after successfull bridge update // do lights/sensor update right after successfull bridge update
HueBridge *bridge = m_bridges.key(device); HueBridge *bridge = m_bridges.key(device);
refreshLights(bridge); refreshLights(bridge);
if (!m_remotes.isEmpty())
refreshSensors(bridge);
} }
void DevicePluginPhilipsHue::processLightsRefreshResponse(Device *device, const QByteArray &data) void DevicePluginPhilipsHue::processLightsRefreshResponse(Device *device, const QByteArray &data)
@ -958,11 +961,13 @@ void DevicePluginPhilipsHue::processLightsRefreshResponse(Device *device, const
// get the light of this bridge // get the light of this bridge
foreach (HueLight *light, m_lights.keys()) { foreach (HueLight *light, m_lights.keys()) {
if (light->id() == lightId.toInt() && light->bridgeId() == device->id()) { if (light->id() == lightId.toInt() && light->bridgeId() == device->id()) {
//qCDebug(dcPhilipsHue) << "update light" << light->id() << light->name();
light->updateStates(lightMap.value("state").toMap()); light->updateStates(lightMap.value("state").toMap());
} }
} }
} }
if (!m_remotes.isEmpty())
refreshSensors(m_bridges.key(device));
} }
void DevicePluginPhilipsHue::processSensorsRefreshResponse(Device *device, const QByteArray &data) void DevicePluginPhilipsHue::processSensorsRefreshResponse(Device *device, const QByteArray &data)