view: Node,Port: Store pipewire Id as property on node, and make its name a property too.

src/application.rs

@@ -145,7 +145,7 @@ impl Application {
 
         imp::Application::from_instance(self).graphview.add_node(
             id,
-            view::Node::new(name),
+            view::Node::new(name, id),
             node_type,
         );
     }

src/view/node.rs

@@ -20,11 +20,15 @@ use pipewire::spa::Direction;
 use std::collections::HashMap;
 
 mod imp {
+    use glib::ParamFlags;
+    use once_cell::sync::Lazy;
+
     use super::*;
 
     use std::cell::{Cell, RefCell};
 
     pub struct Node {
+        pub(super) pipewire_id: Cell<u32>,
         pub(super) grid: gtk::Grid,
         pub(super) label: gtk::Label,
         pub(super) ports: RefCell<HashMap<u32, crate::view::port::Port>>,
@@ -34,7 +38,7 @@ mod imp {
 
     #[glib::object_subclass]
     impl ObjectSubclass for Node {
-        const NAME: &'static str = "Node";
+        const NAME: &'static str = "HelvumNode";
         type Type = super::Node;
         type ParentType = gtk::Widget;
 
@@ -52,6 +56,7 @@ mod imp {
             label.set_cursor(gtk::gdk::Cursor::from_name("grab", None).as_ref());
 
             Self {
+                pipewire_id: Cell::new(0),
                 grid,
                 label,
                 ports: RefCell::new(HashMap::new()),
@@ -67,6 +72,47 @@ mod imp {
             self.grid.set_parent(obj);
         }
 
+        fn properties() -> &'static [glib::ParamSpec] {
+            static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
+                vec![
+                    glib::ParamSpecUInt::new(
+                        "pipewire-id",
+                        "pipewire-id",
+                        "pipewire-id",
+                        u32::MIN,
+                        u32::MAX,
+                        0,
+                        ParamFlags::READWRITE | ParamFlags::CONSTRUCT_ONLY,
+                    ),
+                    glib::ParamSpecString::new("name", "name", "name", None, ParamFlags::READWRITE),
+                ]
+            });
+
+            PROPERTIES.as_ref()
+        }
+
+        fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            match pspec.name() {
+                "pipewire-id" => self.pipewire_id.get().to_value(),
+                "name" => self.label.text().to_value(),
+                _ => unimplemented!(),
+            }
+        }
+
+        fn set_property(
+            &self,
+            _obj: &Self::Type,
+            _id: usize,
+            value: &glib::Value,
+            pspec: &glib::ParamSpec,
+        ) {
+            match pspec.name() {
+                "name" => self.label.set_text(value.get().unwrap()),
+                "pipewire-id" => self.pipewire_id.set(value.get().unwrap()),
+                _ => unimplemented!(),
+            }
+        }
+
         fn dispose(&self, _obj: &Self::Type) {
             self.grid.unparent();
         }
@@ -81,13 +127,23 @@ glib::wrapper! {
 }
 
 impl Node {
-    pub fn new(name: &str) -> Self {
+    pub fn new(name: &str, pipewire_id: u32) -> Self {
-        let res: Self = glib::Object::new(&[]).expect("Failed to create Node");
+        glib::Object::new(&[("name", &name), ("pipewire-id", &pipewire_id)])
-        let private = imp::Node::from_instance(&res);
+            .expect("Failed to create Node")
+    }
 
-        private.label.set_text(name);
+    pub fn pipewire_id(&self) -> u32 {
+        self.property("pipewire-id")
+    }
 
-        res
+    /// Get the nodes `name` property, which represents the displayed name.
+    pub fn name(&self) -> String {
+        self.property("name")
+    }
+
+    /// Set the nodes `name` property, which represents the displayed name.
+    pub fn set_name(&self, name: &str) {
+        self.set_property("name", name);
     }
 
     pub fn add_port(&mut self, id: u32, port: super::port::Port) {

src/view/port.rs

@@ -38,6 +38,7 @@ struct ForwardLink(u32);
 struct ReversedLink(u32);
 
 mod imp {
+    use glib::ParamFlags;
     use once_cell::{sync::Lazy, unsync::OnceCell};
     use pipewire::spa::Direction;
 
@@ -46,14 +47,14 @@ mod imp {
     /// Graphical representation of a pipewire port.
     #[derive(Default)]
     pub struct Port {
-        pub(super) label: OnceCell<gtk::Label>,
+        pub(super) pipewire_id: OnceCell<u32>,
-        pub(super) id: OnceCell<u32>,
+        pub(super) label: gtk::Label,
         pub(super) direction: OnceCell<Direction>,
     }
 
     #[glib::object_subclass]
     impl ObjectSubclass for Port {
-        const NAME: &'static str = "Port";
+        const NAME: &'static str = "HelvumPort";
         type Type = super::Port;
         type ParentType = gtk::Widget;
 
@@ -66,9 +67,53 @@ mod imp {
     }
 
     impl ObjectImpl for Port {
+        fn constructed(&self, obj: &Self::Type) {
+            self.parent_constructed(obj);
+            self.label.set_parent(obj);
+        }
+
         fn dispose(&self, _obj: &Self::Type) {
-            if let Some(label) = self.label.get() {
+            self.label.unparent()
-                label.unparent()
+        }
+
+        fn properties() -> &'static [glib::ParamSpec] {
+            static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
+                vec![
+                    glib::ParamSpecUInt::new(
+                        "pipewire-id",
+                        "pipewire-id",
+                        "pipewire-id",
+                        u32::MIN,
+                        u32::MAX,
+                        0,
+                        ParamFlags::READWRITE | ParamFlags::CONSTRUCT_ONLY,
+                    ),
+                    glib::ParamSpecString::new("name", "name", "name", None, ParamFlags::READWRITE),
+                ]
+            });
+
+            PROPERTIES.as_ref()
+        }
+
+        fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            match pspec.name() {
+                "pipewire-id" => self.pipewire_id.get().unwrap().to_value(),
+                "name" => self.label.text().to_value(),
+                _ => unimplemented!(),
+            }
+        }
+
+        fn set_property(
+            &self,
+            _obj: &Self::Type,
+            _id: usize,
+            value: &glib::Value,
+            pspec: &glib::ParamSpec,
+        ) {
+            match pspec.name() {
+                "name" => self.label.set_text(value.get().unwrap()),
+                "pipewire-id" => self.pipewire_id.set(value.get().unwrap()).unwrap(),
+                _ => unimplemented!(),
             }
         }
 
@@ -98,22 +143,16 @@ glib::wrapper! {
 impl Port {
     pub fn new(id: u32, name: &str, direction: Direction, media_type: Option<MediaType>) -> Self {
         // Create the widget and initialize needed fields
-        let res: Self = glib::Object::new(&[]).expect("Failed to create Port");
+        let res: Self = glib::Object::new(&[("pipewire-id", &id), ("name", &name)])
+            .expect("Failed to create Port");
 
         let private = imp::Port::from_instance(&res);
-        private.id.set(id).expect("Port id already set");
+
         private
             .direction
             .set(direction)
             .expect("Port direction already set");
 
-        let label = gtk::Label::new(Some(name));
-        label.set_parent(&res);
-        private
-            .label
-            .set(label)
-            .expect("Port label was already set");
-
         // Add a drag source and drop target controller with the type depending on direction,
         // they will be responsible for link creation by dragging an output port onto an input port or the other way around.
 
@@ -152,7 +191,7 @@ impl Port {
                             // Get the callback registered in the widget and call it
                             drop_target
                                 .widget()
-                                .emit_by_name::<()>("port-toggled", &[&source_id, &this.id()]);
+                                .emit_by_name::<()>("port-toggled", &[&source_id, &this.pipewire_id()]);
                         } else {
                             warn!("Invalid type dropped on ingoing port");
                         }
@@ -168,7 +207,7 @@ impl Port {
                             // Get the callback registered in the widget and call it
                             drop_target
                                 .widget()
-                                .emit_by_name::<()>("port-toggled", &[&this.id(), &target_id]);
+                                .emit_by_name::<()>("port-toggled", &[&this.pipewire_id(), &target_id]);
                         } else {
                             warn!("Invalid type dropped on outgoing port");
                         }
@@ -194,9 +233,18 @@ impl Port {
         res
     }
 
-    pub fn id(&self) -> u32 {
+    pub fn pipewire_id(&self) -> u32 {
-        let private = imp::Port::from_instance(self);
+        self.property("pipewire-id")
-        private.id.get().copied().expect("Port id is not set")
+    }
+
+    /// Get the nodes `name` property, which represents the displayed name.
+    pub fn name(&self) -> String {
+        self.property("name")
+    }
+
+    /// Set the nodes `name` property, which represents the displayed name.
+    pub fn set_name(&self, name: &str) {
+        self.set_property("name", name);
     }
 
     pub fn direction(&self) -> &Direction {