From 7fcfca3c1df84de59c81fddeba04daa008383a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sat, 5 Jun 2021 00:26:10 +0200 Subject: [PATCH 1/6] Add device discovery for wol plugin --- wakeonlan/integrationpluginwakeonlan.cpp | 40 +++++++++++++++++++++-- wakeonlan/integrationpluginwakeonlan.h | 4 ++- wakeonlan/integrationpluginwakeonlan.json | 2 +- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/wakeonlan/integrationpluginwakeonlan.cpp b/wakeonlan/integrationpluginwakeonlan.cpp index 5b85d3c4..f454bf40 100644 --- a/wakeonlan/integrationpluginwakeonlan.cpp +++ b/wakeonlan/integrationpluginwakeonlan.cpp @@ -33,6 +33,8 @@ #include "integrations/thing.h" #include "plugininfo.h" +#include "network/networkdevicediscovery.h" + #include #include #include @@ -41,6 +43,40 @@ IntegrationPluginWakeOnLan::IntegrationPluginWakeOnLan() { } +void IntegrationPluginWakeOnLan::discoverThings(ThingDiscoveryInfo *info) +{ + if (!hardwareManager()->networkDeviceDiscovery()->available()) { + qCWarning(dcWakeOnLan()) << "Failed to discover network devices. The network device discovery is not available."; + info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("The discovery is not available.")); + return; + } + + qCDebug(dcWakeOnLan()) << "Start discovering network devices..."; + NetworkDeviceDiscoveryReply *discoveryReply = hardwareManager()->networkDeviceDiscovery()->discover(); + connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, this, [=](){ + ThingDescriptors descriptors; + qCDebug(dcWakeOnLan()) << "Discovery finished. Found" << discoveryReply->networkDevices().count() << "devices"; + foreach (const NetworkDevice &networkDevice, discoveryReply->networkDevices()) { + // We need the mac address... + if (networkDevice.macAddress().isEmpty()) + continue; + + // Filter out already added network devices, rediscovery is in this case no option + if (myThings().filterByParam(wolThingMacParamTypeId, networkDevice.macAddress()).count() != 0) + continue; + + QString title = networkDevice.address().toString() + " (" + networkDevice.hostName() + ")"; + ThingDescriptor descriptor(wolThingClassId, title, networkDevice.macAddress()); + ParamList params; + params.append(Param(wolThingMacParamTypeId, networkDevice.macAddress())); + descriptor.setParams(params); + descriptors.append(descriptor); + } + info->addThingDescriptors(descriptors); + info->finish(Thing::ThingErrorNoError); + }); +} + void IntegrationPluginWakeOnLan::executeAction(ThingActionInfo *info) { qCDebug(dcWakeOnLan) << "Wake up" << info->thing()->name(); @@ -48,12 +84,12 @@ void IntegrationPluginWakeOnLan::executeAction(ThingActionInfo *info) return info->finish(Thing::ThingErrorNoError); } -void IntegrationPluginWakeOnLan::wakeup(QString mac) +void IntegrationPluginWakeOnLan::wakeup(const QString &macAddress) { const char header[] = {char(0xff), char(0xff), char(0xff), char(0xff), char(0xff), char(0xff)}; QByteArray packet = QByteArray::fromRawData(header, sizeof(header)); for(int i = 0; i < 16; ++i) { - packet.append(QByteArray::fromHex(mac.remove(':').toLocal8Bit())); + packet.append(QByteArray::fromHex(QString(macAddress).remove(':').toLocal8Bit())); } qCDebug(dcWakeOnLan) << "Created magic packet:" << packet.toHex(); QUdpSocket udpSocket; diff --git a/wakeonlan/integrationpluginwakeonlan.h b/wakeonlan/integrationpluginwakeonlan.h index fb63302c..8116612a 100644 --- a/wakeonlan/integrationpluginwakeonlan.h +++ b/wakeonlan/integrationpluginwakeonlan.h @@ -45,10 +45,12 @@ class IntegrationPluginWakeOnLan : public IntegrationPlugin public: explicit IntegrationPluginWakeOnLan(); + void discoverThings(ThingDiscoveryInfo *info) override; + void executeAction(ThingActionInfo *info) override; private slots: - void wakeup(QString mac); + void wakeup(const QString &macAddress); }; diff --git a/wakeonlan/integrationpluginwakeonlan.json b/wakeonlan/integrationpluginwakeonlan.json index d79ca7ff..88ca3373 100644 --- a/wakeonlan/integrationpluginwakeonlan.json +++ b/wakeonlan/integrationpluginwakeonlan.json @@ -12,7 +12,7 @@ "id": "3c8f2447-dcd0-4882-8c09-99e579e4d24c", "name": "wol", "displayName": "Wake On Lan", - "createMethods": ["user"], + "createMethods": ["user", "discovery"], "interfaces": ["outputtrigger"], "paramTypes": [ { From 9b01f61467415a3601347c84cbdd911e98ffe31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sat, 5 Jun 2021 00:27:37 +0200 Subject: [PATCH 2/6] Update translation strings --- .../b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts | 18 +++++++++++++----- .../b5a87848-de56-451e-84a6-edd26ad4958f-da.ts | 18 +++++++++++++----- .../b5a87848-de56-451e-84a6-edd26ad4958f-de.ts | 18 +++++++++++++----- ...a87848-de56-451e-84a6-edd26ad4958f-en_US.ts | 18 +++++++++++++----- .../b5a87848-de56-451e-84a6-edd26ad4958f-es.ts | 18 +++++++++++++----- .../b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts | 18 +++++++++++++----- .../b5a87848-de56-451e-84a6-edd26ad4958f-it.ts | 18 +++++++++++++----- .../b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts | 18 +++++++++++++----- .../b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts | 18 +++++++++++++----- 9 files changed, 117 insertions(+), 45 deletions(-) diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts index 3bd7e693..e29ac3fa 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) Wake on Lan - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) Wake on Lan - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) mac - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol probudit zařízení diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts index 7074c58e..bb3f10e6 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) Wake on Lan - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) Wake On Lan - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) MAC adresse - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol vækningsservice diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts index 7e90bd0e..528d9e0a 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) Wake on LAN - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) Wake On Lan - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) MAC Adresse - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol Gerät aufwecken diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts index 6ed08e2c..6f85af70 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts index e8476ec0..878fc9dc 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) Wake on Lan - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) Wake On Lan - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) Dirección MAC - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol dispositivo para levantarse diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts index 03a8dd0e..01cb5193 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) Wake on LAN - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) Wake on LAN - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) Adresse Mac - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol Réveiller l'appareil diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts index f5300150..8a82d173 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) Wake on Lan - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) Wake On Lan - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) Indirizzo MAC - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol dispositivo wake up diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts index f51fbb9c..7e415c2f 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) Wake on Lan - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) Wake on Lan - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) Mac adres - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol ontwaak-apparaat diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts index 6573c1fa..8268daa3 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts @@ -1,34 +1,42 @@ + + IntegrationPluginWakeOnLan + + + The discovery is not available. + + + WakeOnLan - + Wake on Lan The name of the plugin WakeOnLan ({b5a87848-de56-451e-84a6-edd26ad4958f}) Wake on Lan - + nymea The name of the vendor ({2062d64d-3232-433c-88bc-0d33c0ba2ba6}) nymea - + Wake On Lan The name of the ThingClass ({3c8f2447-dcd0-4882-8c09-99e579e4d24c}) Wake On Lan - + MAC address The name of the ParamType (ThingClass: wol, Type: thing, ID: {e2ba04ac-9fe1-4f9d-8152-024c27030cde}) Endereço MAC - + Wake up device The name of the ActionType ({fb9b9d87-218f-4f0d-9e16-39f8a105029a}) of ThingClass wol dispositivo de acordar From bae410388a3d90029f1e17d3275c41b67a344af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sun, 6 Jun 2021 00:07:34 +0200 Subject: [PATCH 3/6] Update discovery and make use of mac manufacturer information --- wakeonlan/integrationpluginwakeonlan.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/wakeonlan/integrationpluginwakeonlan.cpp b/wakeonlan/integrationpluginwakeonlan.cpp index f454bf40..0f2fb10e 100644 --- a/wakeonlan/integrationpluginwakeonlan.cpp +++ b/wakeonlan/integrationpluginwakeonlan.cpp @@ -65,8 +65,19 @@ void IntegrationPluginWakeOnLan::discoverThings(ThingDiscoveryInfo *info) if (myThings().filterByParam(wolThingMacParamTypeId, networkDevice.macAddress()).count() != 0) continue; - QString title = networkDevice.address().toString() + " (" + networkDevice.hostName() + ")"; - ThingDescriptor descriptor(wolThingClassId, title, networkDevice.macAddress()); + QString title; + if (networkDevice.hostName().isEmpty()) { + title = networkDevice.address().toString(); + } else { + title = networkDevice.address().toString() + " (" + networkDevice.hostName() + ")"; + } + QString description; + if (networkDevice.macAddressManufacturer().isEmpty()) { + description = networkDevice.macAddress(); + } else { + description = networkDevice.macAddress() + " (" + networkDevice.macAddressManufacturer() + ")"; + } + ThingDescriptor descriptor(wolThingClassId, title, description); ParamList params; params.append(Param(wolThingMacParamTypeId, networkDevice.macAddress())); descriptor.setParams(params); From 2945c474dac1cfbd52812d79e8f48dae3cdc5514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 8 Jun 2021 13:24:19 +0200 Subject: [PATCH 4/6] Update discovery result look of wol network devices --- wakeonlan/integrationpluginwakeonlan.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wakeonlan/integrationpluginwakeonlan.cpp b/wakeonlan/integrationpluginwakeonlan.cpp index 0f2fb10e..c2f1f685 100644 --- a/wakeonlan/integrationpluginwakeonlan.cpp +++ b/wakeonlan/integrationpluginwakeonlan.cpp @@ -69,7 +69,7 @@ void IntegrationPluginWakeOnLan::discoverThings(ThingDiscoveryInfo *info) if (networkDevice.hostName().isEmpty()) { title = networkDevice.address().toString(); } else { - title = networkDevice.address().toString() + " (" + networkDevice.hostName() + ")"; + title = networkDevice.hostName() + " (" + networkDevice.address().toString() + ")"; } QString description; if (networkDevice.macAddressManufacturer().isEmpty()) { From 0944fe422aa5462d235465bf48a18a60fbe8cef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 11 Jun 2021 11:08:52 +0200 Subject: [PATCH 5/6] Update discovery to renamed network device --- wakeonlan/integrationpluginwakeonlan.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/wakeonlan/integrationpluginwakeonlan.cpp b/wakeonlan/integrationpluginwakeonlan.cpp index c2f1f685..705f830f 100644 --- a/wakeonlan/integrationpluginwakeonlan.cpp +++ b/wakeonlan/integrationpluginwakeonlan.cpp @@ -55,31 +55,31 @@ void IntegrationPluginWakeOnLan::discoverThings(ThingDiscoveryInfo *info) NetworkDeviceDiscoveryReply *discoveryReply = hardwareManager()->networkDeviceDiscovery()->discover(); connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, this, [=](){ ThingDescriptors descriptors; - qCDebug(dcWakeOnLan()) << "Discovery finished. Found" << discoveryReply->networkDevices().count() << "devices"; - foreach (const NetworkDevice &networkDevice, discoveryReply->networkDevices()) { + qCDebug(dcWakeOnLan()) << "Discovery finished. Found" << discoveryReply->networkDeviceInfos().count() << "devices"; + foreach (const NetworkDeviceInfo &networkDeviceInfo, discoveryReply->networkDeviceInfos()) { // We need the mac address... - if (networkDevice.macAddress().isEmpty()) + if (networkDeviceInfo.macAddress().isEmpty()) continue; // Filter out already added network devices, rediscovery is in this case no option - if (myThings().filterByParam(wolThingMacParamTypeId, networkDevice.macAddress()).count() != 0) + if (myThings().filterByParam(wolThingMacParamTypeId, networkDeviceInfo.macAddress()).count() != 0) continue; QString title; - if (networkDevice.hostName().isEmpty()) { - title = networkDevice.address().toString(); + if (networkDeviceInfo.hostName().isEmpty()) { + title = networkDeviceInfo.address().toString(); } else { - title = networkDevice.hostName() + " (" + networkDevice.address().toString() + ")"; + title = networkDeviceInfo.hostName() + " (" + networkDeviceInfo.address().toString() + ")"; } QString description; - if (networkDevice.macAddressManufacturer().isEmpty()) { - description = networkDevice.macAddress(); + if (networkDeviceInfo.macAddressManufacturer().isEmpty()) { + description = networkDeviceInfo.macAddress(); } else { - description = networkDevice.macAddress() + " (" + networkDevice.macAddressManufacturer() + ")"; + description = networkDeviceInfo.macAddress() + " (" + networkDeviceInfo.macAddressManufacturer() + ")"; } ThingDescriptor descriptor(wolThingClassId, title, description); ParamList params; - params.append(Param(wolThingMacParamTypeId, networkDevice.macAddress())); + params.append(Param(wolThingMacParamTypeId, networkDeviceInfo.macAddress())); descriptor.setParams(params); descriptors.append(descriptor); } From 9255528440e7a917967d82f3f34a8458a9619c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 28 Jun 2021 09:56:02 +0200 Subject: [PATCH 6/6] Update error message, translations and improve debug message --- wakeonlan/integrationpluginwakeonlan.cpp | 4 ++-- .../translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts | 2 +- .../translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts | 2 +- .../translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts | 2 +- .../b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts | 2 +- .../translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts | 2 +- .../translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts | 2 +- .../translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts | 2 +- .../translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts | 2 +- .../translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wakeonlan/integrationpluginwakeonlan.cpp b/wakeonlan/integrationpluginwakeonlan.cpp index 705f830f..f4b1bf0b 100644 --- a/wakeonlan/integrationpluginwakeonlan.cpp +++ b/wakeonlan/integrationpluginwakeonlan.cpp @@ -47,11 +47,11 @@ void IntegrationPluginWakeOnLan::discoverThings(ThingDiscoveryInfo *info) { if (!hardwareManager()->networkDeviceDiscovery()->available()) { qCWarning(dcWakeOnLan()) << "Failed to discover network devices. The network device discovery is not available."; - info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("The discovery is not available.")); + info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Unable to discovery devices in your network.")); return; } - qCDebug(dcWakeOnLan()) << "Start discovering network devices..."; + qCDebug(dcWakeOnLan()) << "Starting network discovery..."; NetworkDeviceDiscoveryReply *discoveryReply = hardwareManager()->networkDeviceDiscovery()->discover(); connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, this, [=](){ ThingDescriptors descriptors; diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts index e29ac3fa..7e72cad0 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network. diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts index bb3f10e6..113513e7 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network. diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts index 528d9e0a..eff0fea8 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network. diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts index 6f85af70..6bc8bb3d 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network. diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts index 878fc9dc..0768b74f 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network. diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts index 01cb5193..1d19ac54 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network. diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts index 8a82d173..5fa7167d 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network. diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts index 7e415c2f..09ae35e9 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network. diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts index 8268daa3..656c24a0 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts @@ -5,7 +5,7 @@ IntegrationPluginWakeOnLan - The discovery is not available. + Unable to discovery devices in your network.