From abc8bfcc7bce425df4d58c06f56464fc8e59209e Mon Sep 17 00:00:00 2001
From: Naveen Prashanth <gnpaone@localhost.localdomain>
Date: Tue, 5 May 2026 09:45:28 +0530
Subject: [PATCH] Minor fix and Fix meson CI

---
 .gitlab-ci.yml       | 19 ++++++------------
 src/graph_manager.rs | 48 ++++++++++++++++++++++----------------------
 2 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 936b704..cb93247 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 stages:
   - build
-  - test
   - lint
   - deploy
 
@@ -19,7 +18,7 @@ workflow:
   before_script:
     - flatpak --version
     - flatpak install -y --user flathub org.freedesktop.Sdk.Extension.llvm22//25.08
-    - flatpak install -y --user flathub org.freedesktop.Sdk.Extension.rust-stable//24.08
+    - flatpak install -y --user flathub org.freedesktop.Sdk.Extension.rust-stable//25.08
     - flatpak info org.gnome.Platform
     - flatpak info org.gnome.Sdk
     - flatpak-builder --version
@@ -29,21 +28,15 @@ build:
   extends: .flatpak
   script:
     - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
+    # Run tests immediately after build while the sandbox is warm
+    - >-
+      flatpak-builder --run ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
+      meson test -C .flatpak-builder/build/${APP_FLATPAK_MODULE}-1/_flatpak_build
   artifacts:
     when: always
     paths:
       - ${FLATPAK_BUILD_DIR}
-      - .flatpak-builder/build/${APP_FLATPAK_MODULE}-1/_flatpak_build
-    expire_in: 1 day
-
-meson-test:
-  stage: test
-  extends: .flatpak
-  script:
-    - >-
-      flatpak-builder --run ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
-      meson test -C .flatpak-builder/build/${APP_FLATPAK_MODULE}-1/_flatpak_build
-  needs: ["build"]
+    expire_in: 1 week
 
 clippy:
   stage: lint
diff --git a/src/graph_manager.rs b/src/graph_manager.rs
index 36dc14e..57e1a98 100644
--- a/src/graph_manager.rs
+++ b/src/graph_manager.rs
@@ -56,31 +56,31 @@ mod imp {
             glib::MainContext::default().spawn_local(async move {
                 while let Ok(msg) = receiver.recv().await {
                     let imp = obj.imp();
-                            match msg {
-                                PipewireMessage::NodeAdded { id, name, node_type } => imp.add_node(id, name.as_str(), node_type),
-                                PipewireMessage::NodeNameChanged { id, name, media_name } => imp.node_name_changed(id, &name, &media_name),
-                                PipewireMessage::PortAdded { id, node_id, name, direction } => imp.add_port(id, name.as_str(), node_id, direction),
-                                PipewireMessage::PortFormatChanged { id, media_type } => imp.port_media_type_changed(id, media_type),
-                                PipewireMessage::LinkAdded { id, port_from, port_to, active, media_type } => imp.add_link(id, port_from, port_to, active, media_type),
-                                PipewireMessage::LinkStateChanged { id, active } => imp.link_state_changed(id, active),
-                                PipewireMessage::LinkFormatChanged { id, media_type } => imp.link_format_changed(id, media_type),
-                                PipewireMessage::NodeRemoved { id } => imp.remove_node(id),
-                                PipewireMessage::PortRemoved { id, node_id } => imp.remove_port(id, node_id),
-                                PipewireMessage::LinkRemoved { id } => imp.remove_link(id),
-                                PipewireMessage::Connecting => {
-                                    if let Some(banner) = imp.connection_banner.borrow().as_ref() {
-                                        banner.set_revealed(true);
-                                    }
-                                }
-                                PipewireMessage::Connected => {
-                                    if let Some(banner) = imp.connection_banner.borrow().as_ref() {
-                                        banner.set_revealed(false);
-                                    }
-                                }
-                                PipewireMessage::Disconnected => {
-                                    imp.clear();
-                                }
+                    match msg {
+                        PipewireMessage::NodeAdded { id, name, node_type } => imp.add_node(id, name.as_str(), node_type),
+                        PipewireMessage::NodeNameChanged { id, name, media_name } => imp.node_name_changed(id, &name, &media_name),
+                        PipewireMessage::PortAdded { id, node_id, name, direction } => imp.add_port(id, name.as_str(), node_id, direction),
+                        PipewireMessage::PortFormatChanged { id, media_type } => imp.port_media_type_changed(id, media_type),
+                        PipewireMessage::LinkAdded { id, port_from, port_to, active, media_type } => imp.add_link(id, port_from, port_to, active, media_type),
+                        PipewireMessage::LinkStateChanged { id, active } => imp.link_state_changed(id, active),
+                        PipewireMessage::LinkFormatChanged { id, media_type } => imp.link_format_changed(id, media_type),
+                        PipewireMessage::NodeRemoved { id } => imp.remove_node(id),
+                        PipewireMessage::PortRemoved { id, node_id } => imp.remove_port(id, node_id),
+                        PipewireMessage::LinkRemoved { id } => imp.remove_link(id),
+                        PipewireMessage::Connecting => {
+                            if let Some(banner) = imp.connection_banner.borrow().as_ref() {
+                                banner.set_revealed(true);
                             }
+                        }
+                        PipewireMessage::Connected => {
+                            if let Some(banner) = imp.connection_banner.borrow().as_ref() {
+                                banner.set_revealed(false);
+                            }
+                        }
+                        PipewireMessage::Disconnected => {
+                            imp.clear();
+                        }
+                    }
                 }
             });
         }