disconnect

Author: cpwrs

src/network/api.cpp

@@ -13,6 +13,7 @@
 namespace qs::network {
 
 namespace {
+Q_LOGGING_CATEGORY(logNetworkDevice, "quickshell.network.device", QtWarningMsg);
 Q_LOGGING_CATEGORY(logNetwork, "quickshell.network", QtWarningMsg);
 }
 
@@ -48,6 +49,22 @@ void Device::setState(DeviceState::Enum state) {
 	}
 }
 
+void Device::disconnect() {
+	if (this->bState == DeviceState::Disconnected) {
+		qCCritical(logNetworkDevice) << "Device" << this << "is already disconnected";
+		return;
+	}
+
+	if (this->bState == DeviceState::Disconnecting) {
+		qCCritical(logNetworkDevice) << "Device" << this << "is already disconnecting";
+		return;
+	}
+
+	qCDebug(logNetworkDevice) << "Disconnecting from device" << this;
+	
+	signalDisconnect();
+}
+
 void WirelessDevice::setLastScan(qint64 lastScan) {
 	if (lastScan != this->bLastScan) {
 		this->bLastScan = lastScan;

src/network/api.hpp

@@ -23,39 +23,56 @@ class DeviceState: public QObject {
 
 public:
 	enum Enum : quint8 {
+		/// The device state is unknown.
 		Unknown = 0,
-		Disconnected = 10,
-		Connecting = 20,
-		Connected = 30,
-		Disconnecting = 40,
+		/// The device is not connected.
+		Disconnected = 1,
+		/// The device is connected.
+		Connected = 2,
+		/// The device is disconnecting.
+		Disconnecting = 3,
+		/// The device is connecting.
+		Connecting = 4,
 	};
 	Q_ENUM(Enum);
 	Q_INVOKABLE static QString toString(DeviceState::Enum state);
 };
 
+///! A tracked network device.
 class Device: public QObject {
 	Q_OBJECT;
 	QML_ELEMENT;
 	QML_UNCREATABLE("Devices can only be acquired through Network");
 
 	// clang-format off
+	/// The name of the device's interface.
 	Q_PROPERTY(QString name READ default NOTIFY nameChanged BINDABLE bindableName);
+	/// The hardware address of the device's interface in the XX:XX:XX:XX:XX:XX format.
 	Q_PROPERTY(QString address READ default NOTIFY addressChanged BINDABLE bindableAddress);
+	/// Connection state of the device.
 	Q_PROPERTY(DeviceState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
 	// clang-format on
 
 signals:
+	void signalDisconnect();
+
+	// Frontend-facing signals
 	void nameChanged();
 	void addressChanged();
 	void stateChanged();
 
 public slots:
+	// Slots for the backend to connect signals to
 	void setName(const QString& name);
 	void setAddress(const QString& address);
 	void setState(DeviceState::Enum state);
 
 public:
 	explicit Device(QObject* parent = nullptr);
+
+	/// Disconnects the device and prevents it from automatically activating further connections.
+	Q_INVOKABLE void disconnect();
+
 	[[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; };

src/network/nm_adapters.cpp

@@ -38,6 +38,7 @@ void NMDeviceAdapter::init(const QString& path) {
 	this->deviceProperties.updateAllViaGetAll();
 }
 
+void NMDeviceAdapter::disconnect() { this->proxy->Disconnect(); }
 bool NMDeviceAdapter::isValid() const { return this->proxy && this->proxy->isValid(); }
 QString NMDeviceAdapter::address() const {
 	return this->proxy ? this->proxy->service() : QString();

src/network/nm_adapters.hpp

@@ -120,6 +120,9 @@ class NMDeviceAdapter: public QObject {
 	[[nodiscard]] QString getHwAddress() { return this->bHwAddress; };
 	[[nodiscard]] NMDeviceType::Enum getType() { return this->bType; };
 
+public slots:
+	void disconnect();
+
 signals:
 	void interfaceChanged(const QString& interface);
 	void hwAddressChanged(const QString& hwAddress);

src/network/nm_backend.cpp

@@ -131,7 +131,7 @@ void NetworkManager::registerDevice(
 ) {
 	Device* device = createDeviceVariant(type, path);
 
-	// Bind backend NMDeviceAdapter to frontend Device
+	// deviceAdapter signal -> Device slot
 	deviceAdapter->setParent(device);
 	QObject::connect(deviceAdapter, &NMDeviceAdapter::hwAddressChanged, device, &Device::setAddress);
 	QObject::connect(deviceAdapter, &NMDeviceAdapter::interfaceChanged, device, &Device::setName);
@@ -142,6 +142,10 @@ void NetworkManager::registerDevice(
 	    [device](NMDeviceState::Enum state) { device->setState(NMDeviceState::translate(state)); }
 	);
 
+	// Device signal -> deviceAdapter slot
+	QObject::connect(device, &Device::signalDisconnect, deviceAdapter, &NMDeviceAdapter::disconnect);
+
+	// Track device
 	this->mDeviceHash.insert(path, device);
 	this->mDevices.insertObject(device);
 

src/network/test/network.qml

@@ -32,6 +32,10 @@ FloatingWindow {
 					}
 					Label { text: "Hardware Address: " + modelData.address }
 					Label { text: "State: " + DeviceState.toString(modelData.state) }
+					Button {
+						text: "Disconnect"
+						onClicked: modelData.disconnect()
+					}
 				}
 			}
 		}