feat: state, working subdevices

Author: cpwrs

src/network/CMakeLists.txt

@@ -31,8 +31,8 @@ qt_add_dbus_interface(NM_DBUS_INTERFACES
 
 qt_add_library(quickshell-network STATIC
 	api.cpp
-	nm/backend.cpp
-	nm/adapters.cpp
+	nm_backend.cpp
+	nm_adapters.cpp
 	${NM_DBUS_INTERFACES}
 )
 

src/network/api.cpp

@@ -8,7 +8,7 @@
 #include <qdbusservicewatcher.h>
 #include <qlogging.h>
 
-#include "nm/backend.hpp"
+#include "nm_backend.hpp"
 
 namespace qs::network {
 
@@ -17,6 +17,18 @@ Q_LOGGING_CATEGORY(logNetwork, "quickshell.network", QtWarningMsg);
 }
 
 Device::Device(QObject* parent): QObject(parent) {};
+WirelessDevice::WirelessDevice(QObject* parent): Device(parent) {};
+
+QString DeviceState::toString(DeviceState::Enum state) {
+	switch (state) {
+	case DeviceState::Unknown: return QStringLiteral("Unknown");
+	case DeviceState::Disconnected: return QStringLiteral("Disconnected");
+	case DeviceState::Connecting: return QStringLiteral("Connecting");
+	case DeviceState::Connected: return QStringLiteral("Connected");
+	case DeviceState::Disconnecting: return QStringLiteral("Disconnecting");
+	default: return QStringLiteral("Unknown");
+	}
+}
 
 void Device::setName(const QString& name) {
 	if (name != this->bName) {
@@ -30,12 +42,18 @@ void Device::setAddress(const QString& address) {
 	}
 }
 
-void WirelessDevice::setState(WirelessState::Enum state) {
+void Device::setState(DeviceState::Enum state) {
 	if (state != this->bState) {
 		this->bState = state;
 	}
 }
 
+void WirelessDevice::setLastScan(qint64 lastScan) {
+	if (lastScan != this->bLastScan) {
+		this->bLastScan = lastScan;
+	}
+}
+
 Network::Network(QObject* parent): QObject(parent) {
 	// Try each backend
 

src/network/api.hpp

@@ -16,6 +16,23 @@ namespace qs::network {
 
 // -- Device --
 
+class DeviceState: public QObject {
+	Q_OBJECT;
+	QML_ELEMENT;
+	QML_SINGLETON;
+
+public:
+	enum Enum : quint8 {
+		Unknown = 0,
+		Disconnected = 10,
+		Connecting = 20,
+		Connected = 30,
+		Disconnecting = 40,
+	};
+	Q_ENUM(Enum);
+	Q_INVOKABLE static QString toString(DeviceState::Enum state);
+};
+
 class Device: public QObject {
 	Q_OBJECT;
 	QML_ELEMENT;
@@ -24,79 +41,57 @@ class Device: public QObject {
 	// clang-format off
 	Q_PROPERTY(QString name READ default NOTIFY nameChanged BINDABLE bindableName);
 	Q_PROPERTY(QString address READ default NOTIFY addressChanged BINDABLE bindableAddress);
+	Q_PROPERTY(DeviceState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
 	// clang-format on
 
 signals:
 	void nameChanged();
 	void addressChanged();
+	void stateChanged();
 
 public slots:
 	void setName(const QString& name);
 	void setAddress(const QString& address);
+	void setState(DeviceState::Enum state);
 
 public:
 	explicit Device(QObject* parent = nullptr);
 	[[nodiscard]] QBindable<QString> bindableName() const { return &this->bName; };
 	[[nodiscard]] QBindable<QString> bindableAddress() const { return &this->bAddress; };
+	[[nodiscard]] QBindable<DeviceState::Enum> bindableState() const { return &this->bState; };
 
 private:
 	Q_OBJECT_BINDABLE_PROPERTY(Device, QString, bName, &Device::nameChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(Device, QString, bAddress, &Device::addressChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(Device, DeviceState::Enum, bState, &Device::stateChanged);
 };
 
 // -- Wireless Device --
-
-class WirelessState: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		Unknown = 0,
-		Disconnected = 10,
-		Connecting = 20,
-		Connected = 30,
-		Disconnecting = 40,
-	};
-	Q_ENUM(Enum);
-};
-
 class WirelessDevice: public Device {
 	Q_OBJECT;
 
 	// clang-format off
-	Q_PROPERTY(bool powered READ powered WRITE setPowered NOTIFY poweredChanged);
-	Q_PROPERTY(WirelessState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
+	Q_PROPERTY(qint64 lastScan READ default NOTIFY lastScanChanged BINDABLE bindableLastScan);
 	//clang-format on
 
 signals:
-	void poweredChanged();
-	void stateChanged();
+	void lastScanChanged();
 
-private slots:
-	void setState(WirelessState::Enum state);
+public slots:
+	void setLastScan(qint64 lastScan);
 
 public:
 	explicit WirelessDevice(QObject* parent = nullptr);
 
-	Q_INVOKABLE virtual void disconnect() = 0;
-	Q_INVOKABLE virtual void scan() = 0;
+	// Q_INVOKABLE void disconnect();
+	// Q_INVOKABLE void scan();
 
-	[[nodiscard]] bool powered() const { return this->bPowered; };
-	virtual void setPowered(bool powered) = 0;
-
-	[[nodiscard]] QBindable<bool> bindablePowered() { return &this->bPowered; };
-	[[nodiscard]] QBindable<WirelessState::Enum> bindableState() const { return &this->bState; };
+	[[nodiscard]] QBindable<qint64> bindableLastScan() { return &this->bLastScan; };
 
 private:
-	Q_OBJECT_BINDABLE_PROPERTY(WirelessDevice, bool, bPowered, &WirelessDevice::poweredChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(
-	    WirelessDevice,
-	    WirelessState::Enum,
-	    bState,
-	    &WirelessDevice::stateChanged
-	);
+	// clang-format off
+	Q_OBJECT_BINDABLE_PROPERTY(WirelessDevice, qint64, bLastScan, &WirelessDevice::lastScanChanged);
+	// clang-format on
 };
 
 // -- Network --
@@ -106,8 +101,8 @@ class NetworkBackend: public QObject {
 
 public:
 	[[nodiscard]] virtual bool isAvailable() const = 0;
-	// virtual WirelessDevice* wifiDevice() = 0;
 	virtual UntypedObjectModel* devices() = 0;
+	virtual WirelessDevice* defaultWifiDevice() = 0;
 
 protected:
 	explicit NetworkBackend(QObject* parent = nullptr): QObject(parent) {};
@@ -118,13 +113,15 @@ class Network: public QObject {
 	QML_NAMED_ELEMENT(Network);
 	QML_SINGLETON;
 
-	// Q_PROPERTY(WirelessDevice* wifi READ wifiDevice CONSTANT);
+	Q_PROPERTY(WirelessDevice* defaultWifiDevice READ defaultWifiDevice CONSTANT);
 	Q_PROPERTY(UntypedObjectModel* devices READ devices CONSTANT);
 
 public:
 	explicit Network(QObject* parent = nullptr);
-	// [[nodiscard]] WirelessDevice* wifi() { return backend ? backend->wifiDevice() : nullptr; }
-	[[nodiscard]] UntypedObjectModel* devices() { return backend ? backend->devices() : nullptr; }
+	[[nodiscard]] UntypedObjectModel* devices() { return backend ? backend->devices() : nullptr; };
+	[[nodiscard]] WirelessDevice* defaultWifiDevice() {
+		return backend ? backend->defaultWifiDevice() : nullptr;
+	};
 
 private:
 	class NetworkBackend* backend = nullptr;