fixed n-upnp discovery

This commit is contained in:
bernhard.trinnes 2020-06-09 10:42:38 +02:00
parent 14f0519547
commit 1071bcb34b

View File

@ -87,9 +87,10 @@ void IntegrationPluginPhilipsHue::init()
QString thingId = thing->paramValue(bridgeThingIdParamTypeId).toString(); QString thingId = thing->paramValue(bridgeThingIdParamTypeId).toString();
if (entry.protocol() == QAbstractSocket::IPv4Protocol) { if (entry.protocol() == QAbstractSocket::IPv4Protocol) {
foreach (const QString &txtEntry, entry.txt()) { QString name = entry.name().split(" - ").first();
QStringList parts = txtEntry.split('='); QString id = entry.name().split(" - ").last();
if (parts.length() == 2 && parts.first() == "uuid" && parts.last() == thingId) {
if (thingId.contains(id)) {
thing->setParamValue(bridgeThingHostParamTypeId, entry.hostAddress().toString()); thing->setParamValue(bridgeThingHostParamTypeId, entry.hostAddress().toString());
HueBridge *bridge = m_bridges.key(thing); HueBridge *bridge = m_bridges.key(thing);
bridge->setHostAddress(entry.hostAddress()); bridge->setHostAddress(entry.hostAddress());
@ -97,7 +98,6 @@ void IntegrationPluginPhilipsHue::init()
} }
} }
} }
}
}); });
} }
@ -192,7 +192,7 @@ void IntegrationPluginPhilipsHue::discoverThings(ThingDiscoveryInfo *info)
qCDebug(dcPhilipsHue) << "Starting N-UPNP discovery..."; qCDebug(dcPhilipsHue) << "Starting N-UPNP discovery...";
QNetworkRequest request(QUrl(" https://discovery.meethue.com ")); QNetworkRequest request(QUrl("https://discovery.meethue.com"));
QNetworkReply *nUpnpReply = hardwareManager()->networkManager()->get(request); QNetworkReply *nUpnpReply = hardwareManager()->networkManager()->get(request);
discovery->nUpnpReply = nUpnpReply; discovery->nUpnpReply = nUpnpReply;
@ -1424,9 +1424,9 @@ void IntegrationPluginPhilipsHue::processBridgeSensorDiscoveryResponse(Thing *th
QString uuid = sensorMap.value("uniqueid").toString(); QString uuid = sensorMap.value("uniqueid").toString();
QString model = sensorMap.value("modelid").toString(); QString model = sensorMap.value("modelid").toString();
// qCDebug(dcPhilipsHue()) << "Found sensor on bridge:" << model << uuid; // qCDebug(dcPhilipsHue()) << "Found sensor on bridge:" << model << uuid;
foreach (HueRemote* remote, remotesToRemove) { foreach (HueRemote* remote, remotesToRemove) {
// qCDebug(dcPhilipsHue()) << " - Checking remote to remove" << remote->modelId() << remote->uuid(); // qCDebug(dcPhilipsHue()) << " - Checking remote to remove" << remote->modelId() << remote->uuid();
if (remote->uuid() == uuid) { if (remote->uuid() == uuid) {
remotesToRemove.removeAll(remote); remotesToRemove.removeAll(remote);
break; break;