EthernetDevice

Author: cpwrs

src/network/CMakeLists.txt

@@ -3,6 +3,7 @@ add_subdirectory(nm)
 qt_add_library(quickshell-network STATIC
 	network.cpp
 	device.cpp
+	ethernet.cpp
 	wifi.cpp
 	enums.cpp
 )

src/network/device.hpp

@@ -12,15 +12,16 @@
 namespace qs::network {
 
 ///! A network device.
-/// The @@type property may be used to determine if this device is a @@WifiDevice.
+/// The @@type property may be used to determine if this device is a @@WifiDevice or @@EthernetDevice.
 class NetworkDevice: public QObject {
 	Q_OBJECT;
 	QML_ELEMENT;
 	QML_UNCREATABLE("Devices can only be acquired through Network");
 	// clang-format off
 	/// The device type.
 	///
-	/// When the device type is `Wifi`, the device object is a @@WifiDevice which exposes wifi network
+	/// When the device type is `Wifi`, the device object is a @@WifiDevice which exposes wifi networks.
+	/// When the device type is `Ethernet`, the device object is a @@EthernetDevice. 
 	/// connection and scanning.
 	Q_PROPERTY(DeviceType::Enum type READ type CONSTANT);
 	/// The name of the device's control interface.

src/network/enums.cpp

@@ -50,6 +50,7 @@ QString DeviceType::toString(DeviceType::Enum type) {
 	switch (type) {
 	case None: return QStringLiteral("None");
 	case Wifi: return QStringLiteral("Wifi");
+	case Ethernet: return QStringLiteral("Ethernet");
 	default: return QStringLiteral("Unknown");
 	}
 }

src/network/enums.hpp

@@ -98,6 +98,7 @@ class DeviceType: public QObject {
 	enum Enum : quint8 {
 		None = 0,
 		Wifi = 1,
+		Ethernet = 2,
 	};
 	Q_ENUM(Enum);
 	Q_INVOKABLE static QString toString(DeviceType::Enum type);

src/network/ethernet.cpp

@@ -0,0 +1,15 @@
+#include "ethernet.hpp"
+
+#include <qobject.h>
+
+#include "device.hpp"
+#include "enums.hpp"
+#include "network.hpp"
+
+namespace qs::network {
+
+EthernetDevice::EthernetDevice(Network* net, QObject* parent)
+    : NetworkDevice(DeviceType::Ethernet, parent)
+    , mNetwork(net) {}
+
+} // namespace qs::network

src/network/ethernet.hpp

@@ -0,0 +1,49 @@
+#pragma once
+
+#include <qobject.h>
+#include <qproperty.h>
+#include <qqmlintegration.h>
+#include <qtmetamacros.h>
+#include <qtypes.h>
+
+#include "device.hpp"
+#include "network.hpp"
+
+namespace qs::network {
+
+///! Ethernet variant of a @@NetworkDevice.
+class EthernetDevice: public NetworkDevice {
+	Q_OBJECT;
+	QML_ELEMENT;
+	QML_UNCREATABLE("");
+
+	/// The available wired network for this device.
+	Q_PROPERTY(Network* network READ network CONSTANT)
+	/// The maximum speed of the physical device link, in megabits per second.
+	Q_PROPERTY(quint32 linkSpeed READ default NOTIFY linkSpeedChanged BINDABLE bindableLinkSpeed)
+	/// True if the ethernet device has a physical link (cable plugged in).
+	Q_PROPERTY(bool hasLink READ default NOTIFY hasLinkChanged BINDABLE bindableHasLink)
+
+public:
+	explicit EthernetDevice(Network* net, QObject* parent = nullptr);
+
+	[[nodiscard]] Network* network() { return this->mNetwork; };
+	QBindable<quint32> bindableLinkSpeed() { return &this->bLinkSpeed; }
+	QBindable<bool> bindableHasLink() { return &this->bHasLink; }
+
+signals:
+	void linkSpeedChanged();
+	void hasLinkChanged();
+
+private:
+	Network* mNetwork;
+	Q_OBJECT_BINDABLE_PROPERTY(
+	    EthernetDevice,
+	    quint32,
+	    bLinkSpeed,
+	    &EthernetDevice::linkSpeedChanged
+	);
+	Q_OBJECT_BINDABLE_PROPERTY(EthernetDevice, bool, bHasLink, &EthernetDevice::hasLinkChanged);
+};
+
+} // namespace qs::network

src/network/module.md

@@ -4,6 +4,7 @@ headers = [
 	"network.hpp",
 	"device.hpp",
 	"wifi.hpp",
+	"ethernet.hpp",
 	"enums.hpp",
 	"nm/settings.hpp",
 ]

src/network/network.cpp

@@ -1,5 +1,4 @@
 #include "network.hpp"
-#include <utility>
 
 #include <qdebug.h>
 #include <qlogging.h>
@@ -81,7 +80,7 @@ NetworkingQml::NetworkingQml(QObject* parent): QObject(parent) {
 
 void NetworkingQml::checkConnectivity() { Networking::instance()->checkConnectivity(); }
 
-Network::Network(QString name, QObject* parent): QObject(parent), mName(std::move(name)) {
+Network::Network(QObject* parent): QObject(parent) {
 	this->bStateChanging.setBinding([this] {
 		auto state = this->bState.value();
 		return state == ConnectionState::Connecting || state == ConnectionState::Disconnecting;

src/network/network.hpp

@@ -157,8 +157,6 @@ class Network: public QObject {
 	QML_UNCREATABLE("Network can only be aqcuired through networking devices");
 
 	// clang-format off
-	/// The name of the network.
-	Q_PROPERTY(QString name READ name CONSTANT);
 	/// A list of NetworkManager connnection settings profiles for this network.
 	///
 	/// > [!WARNING] Only valid for the NetworkManager backend. 
@@ -174,7 +172,7 @@ class Network: public QObject {
 	// clang-format on
 
 public:
-	explicit Network(QString name, QObject* parent = nullptr);
+	explicit Network(QObject* parent = nullptr);
 	/// Attempt to connect to the network.
 	///
 	/// > [!NOTE] If the network is a @@WifiNetwork and requires secrets, a @@connectionFailed(s)
@@ -194,7 +192,6 @@ class Network: public QObject {
 	void settingsRemoved(NMSettings* settings);
 
 	// clang-format off
-	[[nodiscard]] QString name() const { return this->mName; }
  	[[nodiscard]] const QList<NMSettings*>& nmSettings() const { return this->bNmSettings; }
 	QBindable<QList<NMSettings*>> bindableNmSettings() const { return &this->bNmSettings; }
 	QBindable<bool> bindableConnected() { return &this->bConnected; }
@@ -219,8 +216,6 @@ class Network: public QObject {
 	QSDOC_HIDE void requestForget();
 
 protected:
-	QString mName;
-
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(Network, bool, bConnected, &Network::connectedChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(Network, bool, bKnown, &Network::knownChanged);

src/network/nm/CMakeLists.txt

@@ -29,6 +29,16 @@ qt_add_dbus_interface(NM_DBUS_INTERFACES
 	dbus_nm_wireless
 )
 
+set_source_files_properties(org.freedesktop.NetworkManager.Device.Wired.xml PROPERTIES
+	CLASSNAME DBusNMWiredProxy
+	NO_NAMESPACE TRUE
+)
+
+qt_add_dbus_interface(NM_DBUS_INTERFACES
+	org.freedesktop.NetworkManager.Device.Wired.xml
+	dbus_nm_wired
+)
+
 set_source_files_properties(org.freedesktop.NetworkManager.AccessPoint.xml PROPERTIES
 	CLASSNAME DBusNMAccessPointProxy
 	NO_NAMESPACE TRUE
@@ -67,6 +77,7 @@ qt_add_library(quickshell-network-nm STATIC
 	settings.cpp
 	accesspoint.cpp
 	wireless.cpp
+	wired.cpp
 	utils.cpp
 	dbus_types.cpp
 	network.cpp
@@ -80,3 +91,4 @@ target_include_directories(quickshell-network-nm PUBLIC
 
 target_link_libraries(quickshell-network-nm PRIVATE Qt::Qml Qt::DBus)
 qs_add_link_dependencies(quickshell-network-nm quickshell-dbus)
+qs_add_link_dependencies(quickshell-network-nm quickshell-network)