diff --git a/libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp b/libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp index 5a7299dc..ed86dc82 100644 --- a/libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp +++ b/libnymea-core/hardware/network/networkdevicediscoveryimpl.cpp @@ -250,6 +250,11 @@ bool NetworkDeviceDiscoveryImpl::sendArpRequest(const QHostAddress &address) return false; } +QHash NetworkDeviceDiscoveryImpl::cache() const +{ + return m_networkInfoCache; +} + void NetworkDeviceDiscoveryImpl::setEnabled(bool enabled) { m_enabled = enabled; @@ -373,6 +378,8 @@ void NetworkDeviceDiscoveryImpl::loadNetworkDeviceCache() } m_cacheSettings->endGroup(); // NetworkDeviceInfos + qCInfo(dcNetworkDeviceDiscovery()) << "Loaded" << m_networkInfoCache.count() << "network device infos from cache."; + // We just did some housekeeping while loading from the cache m_lastCacheHousekeeping = QDateTime::currentDateTime(); } @@ -598,7 +605,7 @@ void NetworkDeviceDiscoveryImpl::finishDiscovery() m_running = false; emit runningChanged(m_running); - emit networkDeviceInfoCacheUpdated(); + emit cacheUpdated(); m_lastDiscovery = QDateTime::currentDateTime(); diff --git a/libnymea-core/hardware/network/networkdevicediscoveryimpl.h b/libnymea-core/hardware/network/networkdevicediscoveryimpl.h index b0243ab4..d5ce9cb5 100644 --- a/libnymea-core/hardware/network/networkdevicediscoveryimpl.h +++ b/libnymea-core/hardware/network/networkdevicediscoveryimpl.h @@ -78,6 +78,8 @@ public: bool sendArpRequest(const QHostAddress &address) override; + QHash cache() const override; + protected: void setEnabled(bool enabled) override; diff --git a/libnymea/network/networkdevicediscovery.h b/libnymea/network/networkdevicediscovery.h index c09cae55..422ae79f 100644 --- a/libnymea/network/networkdevicediscovery.h +++ b/libnymea/network/networkdevicediscovery.h @@ -67,9 +67,11 @@ public: virtual bool sendArpRequest(const QHostAddress &address) = 0; + virtual QHash cache() const = 0; + signals: void runningChanged(bool running); - void networkDeviceInfoCacheUpdated(); + void cacheUpdated(); };