Expose DeviceName property to DBus API

Author: nozwock

src/dbus.rs

@@ -10,13 +10,19 @@ use crate::config::{DBUS_API_NAME, DBUS_API_PATH};
 
 #[derive(Debug)]
 pub struct Packet {
+    pub device_name: String,
     pub visibility: bool,
     visibility_tx: Arc<Mutex<Sender<bool>>>,
     pub visibility_rx: Arc<Mutex<Receiver<bool>>>,
 }
 
 #[zbus::interface(name = "io.github.nozwock.Packet1")]
 impl Packet {
+    #[zbus(property)]
+    pub async fn device_name(&self) -> &str {
+        &self.device_name
+    }
+
     #[zbus(property)]
     pub async fn device_visibility(&self) -> bool {
         self.visibility
@@ -42,7 +48,10 @@ pub async fn get_connection() -> Option<Connection> {
     CONNECTION.lock().await.as_ref().cloned()
 }
 
-pub async fn create_connection(visibility: bool) -> anyhow::Result<Connection> {
+pub async fn create_connection(
+    device_name: String,
+    visibility: bool,
+) -> anyhow::Result<Connection> {
     let mut conn_guard = CONNECTION.lock().await;
 
     if let Some(conn) = conn_guard.as_ref() {
@@ -54,7 +63,8 @@ pub async fn create_connection(visibility: bool) -> anyhow::Result<Connection> {
             .serve_at(
                 DBUS_API_PATH,
                 Packet {
-                    visibility: visibility,
+                    device_name,
+                    visibility,
                     visibility_tx: Arc::new(Mutex::new(tx)),
                     visibility_rx: Arc::new(Mutex::new(rx)),
                 },

src/window.rs

@@ -1875,7 +1875,11 @@ impl PacketApplicationWindow {
         let inner = async move || -> anyhow::Result<()> {
             let imp = obj.imp();
 
-            _ = dbus::create_connection(imp.settings.boolean("device-visibility")).await?;
+            _ = dbus::create_connection(
+                obj.get_device_name_state().as_str().to_string(),
+                imp.settings.boolean("device-visibility"),
+            )
+            .await?;
 
             let handle = glib::spawn_future_local(clone!(
                 #[weak]
@@ -1906,21 +1910,37 @@ impl PacketApplicationWindow {
                 .push(LoopingTaskHandle::Glib(handle));
 
             imp.settings
-                .connect_changed(Some("device-visibility"), move |settings, key| {
-                    let key = key.to_string();
-                    glib::spawn_future_local(clone!(
-                        #[weak]
-                        settings,
-                        async move {
-                            let iface_ref = dbus::packet_iface().await;
-                            let mut iface = iface_ref.get_mut().await;
-                            iface.visibility = settings.boolean(&key);
-                            _ = iface
-                                .device_visibility_changed(iface_ref.signal_emitter())
-                                .await
-                                .inspect_err(|err| tracing::warn!(%err));
-                        }
-                    ));
+                .connect_changed(None, move |settings, key| match key {
+                    "device-visibility" | "device-name" => {
+                        let key = key.to_string();
+                        glib::spawn_future_local(clone!(
+                            #[weak]
+                            settings,
+                            async move {
+                                let iface_ref = dbus::packet_iface().await;
+                                let mut iface = iface_ref.get_mut().await;
+                                match key.as_str() {
+                                    "device-name" => {
+                                        iface.device_name =
+                                            settings.string(&key).as_str().to_string();
+                                        _ = iface
+                                            .device_name_changed(iface_ref.signal_emitter())
+                                            .await
+                                            .inspect_err(|err| tracing::warn!(%err));
+                                    }
+                                    "device-visibility" => {
+                                        iface.visibility = settings.boolean(&key);
+                                        _ = iface
+                                            .device_visibility_changed(iface_ref.signal_emitter())
+                                            .await
+                                            .inspect_err(|err| tracing::warn!(%err));
+                                    }
+                                    _ => {}
+                                }
+                            }
+                        ));
+                    }
+                    _ => {}
                 });
 
             Ok(())