From 511e248a19503f0b01dfc9b47d2cd8819ba9b693 Mon Sep 17 00:00:00 2001
From: Naveen Prashanth <gnpaone@localhost.localdomain>
Date: Tue, 5 May 2026 09:26:39 +0530
Subject: [PATCH] Clippy issues and meson CI fix

---
 .gitlab-ci.yml                 | 9 ++++-----
 src/graph_manager.rs           | 8 ++------
 src/pipewire_connection/mod.rs | 2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 317a9cd..936b704 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,11 +19,9 @@ 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//25.08
+    - flatpak install -y --user flathub org.freedesktop.Sdk.Extension.rust-stable//24.08
     - flatpak info org.gnome.Platform
     - flatpak info org.gnome.Sdk
-    - flatpak info org.freedesktop.Sdk.Extension.llvm22
-    - flatpak info org.freedesktop.Sdk.Extension.rust-stable
     - flatpak-builder --version
 
 build:
@@ -35,7 +33,8 @@ build:
     when: always
     paths:
       - ${FLATPAK_BUILD_DIR}
-    expire_in: 1 week
+      - .flatpak-builder/build/${APP_FLATPAK_MODULE}-1/_flatpak_build
+    expire_in: 1 day
 
 meson-test:
   stage: test
@@ -43,7 +42,7 @@ meson-test:
   script:
     - >-
       flatpak-builder --run ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
-      meson test -C ${FLATPAK_BUILD_DIR}/build/${APP_FLATPAK_MODULE}
+      meson test -C .flatpak-builder/build/${APP_FLATPAK_MODULE}-1/_flatpak_build
   needs: ["build"]
 
 clippy:
diff --git a/src/graph_manager.rs b/src/graph_manager.rs
index e7fa473..6b9e3be 100644
--- a/src/graph_manager.rs
+++ b/src/graph_manager.rs
@@ -54,10 +54,8 @@ mod imp {
         pub fn attach_receiver(&self, receiver: async_channel::Receiver<crate::PipewireMessage>) {
             let obj = self.obj().clone();
             glib::MainContext::default().spawn_local(async move {
-                loop {
-                    match receiver.recv().await {
-                        Ok(msg) => {
-                            let imp = obj.imp();
+                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),
@@ -84,8 +82,6 @@ mod imp {
                                 }
                             }
                         }
-                        Err(_) => break, // channel closed
-                    }
                 }
             });
         }
diff --git a/src/pipewire_connection/mod.rs b/src/pipewire_connection/mod.rs
index de40b73..be47258 100644
--- a/src/pipewire_connection/mod.rs
+++ b/src/pipewire_connection/mod.rs
@@ -179,7 +179,7 @@ pub(super) fn thread_main(
                 if let Some(item) = state_remove.borrow_mut().remove(id) {
                     gtk_sender4
                         .send_blocking(match item {
-                            Item::Node { .. } => PipewireMessage::NodeRemoved { id },
+                            Item::Node => PipewireMessage::NodeRemoved { id },
                             Item::Port { node_id } => PipewireMessage::PortRemoved { id, node_id },
                             Item::Link { .. } => PipewireMessage::LinkRemoved { id },
                         })