merge dev

* cargo fmt

* deps: bump clap to 4.6.0

* deps: cargo update

* Fix daemon autostart issue caused by sync pipewire retry loop (#43) (#44)

At boot time, PipeWire takes some time to register the `pwsp-daemon` and `pwsp-virtual-mic` devices. Previously, the daemon's retry loop for `link_player_to_virtual_mic()` was synchronous and limited to 5 attempts (1.5 seconds total). This caused systemd autostarts to fail with a code 1 if the devices were not yet available.

This change replaces the synchronous wait with an asynchronous `tokio::spawn` task. It will retry the link attempt up to 60 times with a 1-second delay without blocking the startup of the rest of the daemon. This prevents it from exiting abruptly during autostart.

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>

* deps: bump egui & eframe version to 0.34.1

* feat: replaced App::update with new App::logic and App::ui

* deps: bump egui_material_icons to 0.6.0

* deps: bump egui_dnd to 0.15.0

* fix: use .codepoint for icons

* refactor

* refactor: replaced deprecated CentralPanel::show with CentralPanel::show_inside

* refactor

* change version to 1.6.3

* update rust toolchain in github actions

* update freedesktop platform version to 25.08 for flaptak

* update github actions for flatpak builds

* add flatpak-builder installation inside actions

* add flathub configuration to actions

* add --user flag to flathub configuration

* remove sudo from flatpak actions

* Fix/dev flatpak actions 6082245116761610541 (#47)

* remove sudo

* remove steps

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Git archive
+name: Build
 
 permissions:
   contents: write
@@ -7,10 +7,12 @@ permissions:
 on:
   push:
     branches: [main, master]
+  pull_request:
+    branches: [main, master]
   workflow_dispatch:
 
 jobs:
-  build-and-upload:
+  linux-build:
     runs-on: ubuntu-latest
 
     steps:
@@ -31,7 +33,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.94.1
 
       - name: Extract all binary names
         id: cargo-meta
@@ -39,7 +41,6 @@ jobs:
           set -euo pipefail
           BIN_NAMES=$(cargo metadata --no-deps --format-version 1 \
             | jq -r '.packages[0].targets[] | select(.kind[] | contains("bin")) | .name')
-          # сохраним построчно в выход
           echo "bin_names<<EOF" >> $GITHUB_OUTPUT
           echo "$BIN_NAMES" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
@@ -82,3 +83,37 @@ jobs:
           name: archive
           path: pwsp-*.zip
           retention-days: 7
+
+      - name: Install cargo-deb and create .deb
+        shell: bash
+        run: |
+          set -euo pipefail
+          cargo install --locked cargo-deb
+          export PATH="$HOME/.cargo/bin:$PATH"
+
+          cargo-deb
+
+      - name: Upload .deb(s) as artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: deb-packages
+          path: target/debian/*.deb
+          retention-days: 7
+
+  flatpak-build:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-25.08
+      options: --privileged
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build Flatpak
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: ru.arabianq.pwsp.flatpak
+          manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
+          cache: true
+          branch: master
+          build-bundle: true

.github/workflows/git-deb.yml

@@ -1,53 +0,0 @@
-name: Git deb
-
-permissions:
-  contents: write
-  packages: write
-
-on:
-  push:
-    branches: [main, master]
-  workflow_dispatch:
-
-jobs:
-  build-and-upload:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install apt deps (jq/zip + dev-libs)
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            zip jq \
-            libpipewire-0.3-dev \
-            libclang-dev \
-            libasound2-dev
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Build all release binaries
-        run: cargo build --release --locked
-
-      - name: Install cargo-deb and create .deb
-        shell: bash
-        run: |
-          set -euo pipefail
-          cargo install --locked cargo-deb
-          export PATH="$HOME/.cargo/bin:$PATH"
-
-          cargo-deb
-
-      - name: Upload .deb(s) as artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: deb-packages
-          path: target/debian/*.deb
-          retention-days: 7

.github/workflows/git-flatpak.yml

@@ -1,27 +0,0 @@
-name: Git Flatpak
-
-on:
-    push:
-        branches: [main, master]
-    pull_request:
-        branches: [main, master]
-    workflow_dispatch:
-
-jobs:
-    flatpak-build:
-        runs-on: ubuntu-latest
-        container:
-            image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
-            options: --privileged
-
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Build Flatpak
-              uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-              with:
-                  bundle: ru.arabianq.pwsp.flatpak
-                  manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
-                  cache: true
-                  branch: master
-                  build-bundle: true

.github/workflows/release-deb.yml

@@ -1,102 +0,0 @@
-name: Release deb
-
-permissions:
-  contents: write
-  packages: write
-
-on:
-  release:
-    types: [created]
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: "Tag to attach assets to (e.g. v1.0.0)"
-        required: false
-
-jobs:
-  build-and-release:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install apt deps (jq/zip + dev-libs)
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            zip jq \
-            libpipewire-0.3-dev \
-            libclang-dev \
-            libasound2-dev
-
-      - name: Determine tag to use
-        id: tag
-        run: |
-          set -euo pipefail
-
-          INPUT_TAG="${{ github.event.inputs.tag || '' }}"
-          if [ -n "$INPUT_TAG" ]; then
-            echo "Using input tag: $INPUT_TAG"
-            echo "tag=$INPUT_TAG" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          EVENT_TAG="${{ github.event.release.tag_name || '' }}"
-          if [ -n "$EVENT_TAG" ]; then
-            echo "Using event tag: $EVENT_TAG"
-            echo "tag=$EVENT_TAG" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
-            echo "Using GITHUB_REF tag: ${BASH_REMATCH[1]}"
-            echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "No tag in input/event/GITHUB_REF — querying latest release via API..."
-          LATEST_JSON=$(curl -sSf -H "Authorization: Bearer $GITHUB_TOKEN" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/${{ github.repository }}/releases/latest" || true)
-          TAG_NAME=$(echo "$LATEST_JSON" | jq -r '.tag_name // empty')
-          if [ -n "$TAG_NAME" ]; then
-            echo "Found latest release tag: $TAG_NAME"
-            echo "tag=$TAG_NAME" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          echo "No tag found"
-          echo "tag=" >> $GITHUB_OUTPUT
-
-      - name: Fail if no tag determined
-        if: ${{ steps.tag.outputs.tag == '' }}
-        run: |
-          echo "ERROR: No tag determined. Provide a tag when running manually or ensure a release exists."
-          exit 1
-
-      - name: Checkout code at tag
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ steps.tag.outputs.tag || github.ref }}
-          fetch-depth: 0
-
-      - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Build all release binaries
-        run: cargo build --release --locked
-
-      - name: Install cargo-deb and create .deb
-        shell: bash
-        run: |
-          set -euo pipefail
-          cargo install --locked cargo-deb
-          export PATH="$HOME/.cargo/bin:$PATH"
-
-          cargo-deb
-
-      - name: Upload .deb(s) to release
-        uses: softprops/action-gh-release@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag_name: ${{ steps.tag.outputs.tag }}
-          files: |
-            target/debian/*.deb

.github/workflows/release-flatpak.yml

@@ -1,72 +0,0 @@
-name: Release Flatpak
-
-permissions:
-    contents: write
-
-on:
-    release:
-        types: [created]
-    workflow_dispatch:
-        inputs:
-            tag:
-                description: "Tag to attach assets to (e.g. v1.0.0)"
-                required: false
-
-jobs:
-    flatpak-release:
-        runs-on: ubuntu-latest
-        container:
-            image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
-            options: --privileged
-
-        steps:
-            - name: Determine tag to use
-              id: tag
-              run: |
-                  set -euo pipefail
-
-                  INPUT_TAG="${{ github.event.inputs.tag || '' }}"
-                  if [ -n "$INPUT_TAG" ]; then
-                    echo "tag=$INPUT_TAG" >> $GITHUB_OUTPUT
-                    exit 0
-                  fi
-
-                  EVENT_TAG="${{ github.event.release.tag_name || '' }}"
-                  if [ -n "$EVENT_TAG" ]; then
-                    echo "tag=$EVENT_TAG" >> $GITHUB_OUTPUT
-                    exit 0
-                  fi
-
-                  if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
-                    echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
-                    exit 0
-                  fi
-
-                  echo "No tag found"
-                  echo "tag=" >> $GITHUB_OUTPUT
-
-            - name: Fail if no tag determined
-              if: ${{ steps.tag.outputs.tag == '' }}
-              run: |
-                  echo "ERROR: No tag determined."
-                  exit 1
-
-            - uses: actions/checkout@v4
-              with:
-                  ref: ${{ steps.tag.outputs.tag }}
-
-            - name: Build Flatpak
-              uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-              with:
-                  bundle: ru.arabianq.pwsp.flatpak
-                  manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
-                  cache: true
-                  branch: master
-                  build-bundle: true
-
-            - name: Upload Flatpak to release
-              uses: softprops/action-gh-release@v2
-              with:
-                  token: ${{ secrets.GITHUB_TOKEN }}
-                  tag_name: ${{ steps.tag.outputs.tag }}
-                  files: ru.arabianq.pwsp.flatpak

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release archive
+name: Release
 
 permissions:
   contents: write
@@ -14,19 +14,11 @@ on:
         required: false
 
 jobs:
-  build-and-release:
+  prepare:
     runs-on: ubuntu-latest
-
+    outputs:
+      tag: ${{ steps.tag.outputs.tag }}
     steps:
-      - name: Install apt deps (jq/zip + dev-libs)
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            zip jq \
-            libpipewire-0.3-dev \
-            libclang-dev \
-            libasound2-dev
-
       - name: Determine tag to use
         id: tag
         run: |
@@ -53,7 +45,7 @@ jobs:
           fi
 
           echo "No tag in input/event/GITHUB_REF — querying latest release via API..."
-          LATEST_JSON=$(curl -sSf -H "Authorization: Bearer $GITHUB_TOKEN" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/${{ github.repository }}/releases/latest" || true)
+          LATEST_JSON=$(curl -sSf -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/${{ github.repository }}/releases/latest" || true)
           TAG_NAME=$(echo "$LATEST_JSON" | jq -r '.tag_name // empty')
           if [ -n "$TAG_NAME" ]; then
             echo "Found latest release tag: $TAG_NAME"
@@ -70,16 +62,30 @@ jobs:
           echo "ERROR: No tag determined. Provide a tag when running manually or ensure a release exists."
           exit 1
 
+  linux-release:
+    needs: prepare
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install apt deps (jq/zip + dev-libs)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            zip jq \
+            libpipewire-0.3-dev \
+            libclang-dev \
+            libasound2-dev
+
       - name: Checkout code at tag
         uses: actions/checkout@v4
         with:
-          ref: ${{ steps.tag.outputs.tag || github.ref }}
+          ref: ${{ needs.prepare.outputs.tag }}
           fetch-depth: 0
 
       - name: Setup Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.94.1
 
       - name: Extract all binary names
         id: cargo-meta
@@ -98,7 +104,7 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          TAG="${{ steps.tag.outputs.tag }}"
+          TAG="${{ needs.prepare.outputs.tag }}"
           ARCHIVE_NAME="pwsp-${TAG}-linux-x64.zip"
           echo "Creating archive: $ARCHIVE_NAME"
 
@@ -127,6 +133,51 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          tag_name: ${{ steps.tag.outputs.tag }}
+          tag_name: ${{ needs.prepare.outputs.tag }}
           files: |
             pwsp-*.zip
+
+      - name: Install cargo-deb and create .deb
+        shell: bash
+        run: |
+          set -euo pipefail
+          cargo install --locked cargo-deb
+          export PATH="$HOME/.cargo/bin:$PATH"
+
+          cargo-deb
+
+      - name: Upload .deb(s) to release
+        uses: softprops/action-gh-release@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag_name: ${{ needs.prepare.outputs.tag }}
+          files: |
+            target/debian/*.deb
+
+  flatpak-release:
+    needs: prepare
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-25.08
+      options: --privileged
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.prepare.outputs.tag }}
+        
+      - name: Build Flatpak
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: ru.arabianq.pwsp.flatpak
+          manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
+          cache: true
+          branch: master
+          build-bundle: true
+
+      - name: Upload Flatpak to release
+        uses: softprops/action-gh-release@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag_name: ${{ needs.prepare.outputs.tag }}
+          files: ru.arabianq.pwsp.flatpak

.gitignore

@@ -1,2 +1,4 @@
 /target
 .idea
+packages/aur/bin/.git
+packages/aur/standart/.git

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "packages/aur"]
-	path = packages/aur
-	url = ssh://aur@aur.archlinux.org/pwsp.git
-[submodule "packages/aur/standart"]
-	path = packages/aur/standart
-	url = ssh://aur@aur.archlinux.org/pwsp.git
-[submodule "packages/aur/bin"]
-	path = packages/aur/bin
-	url = ssh://aur@aur.archlinux.org/pwsp-bin.git

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pwsp"
-version = "1.6.1"
+version = "1.6.3"
 edition = "2024"
 authors = ["arabian"]
 description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
@@ -12,13 +12,13 @@ keywords = ["soundpad", "pipewire", "linux", "cli", "gui"]
 
 
 [dependencies]
-tokio = { version = "1.49.0", features = ["full"] }
+tokio = { version = "1.50.0", features = ["full"] }
 async-trait = "0.1.89"
 
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 
-clap = { version = "4.5.60", default-features = false, features = [
+clap = { version = "4.6.0", default-features = false, features = [
     "std",
     "suggestions",
     "help",
@@ -29,7 +29,7 @@ clap = { version = "4.5.60", default-features = false, features = [
 dirs = "6.0.0"
 itertools = "0.14.0"
 
-rodio = { version = "0.22.1", default-features = false, features = [
+rodio = { version = "0.22.2", default-features = false, features = [
     "symphonia-all",
     "playback",
 ] }
@@ -39,18 +39,18 @@ rfd = { version = "0.17.2", default-features = false, features = [
 ] }
 opener = { version = "0.8.4", features = ["reveal"] }
 
-egui = { version = "0.33.3", default-features = false, features = [
+egui = { version = "0.34.1", default-features = false, features = [
     "default_fonts",
     "rayon",
 ] }
-eframe = { version = "0.33.3", default-features = false, features = [
+eframe = { version = "0.34.1", default-features = false, features = [
     "default_fonts",
     "glow",
     "x11",
     "wayland",
 ] }
-egui_material_icons = "0.5.0"
+egui_material_icons = "0.6.0"
-egui_dnd = "0.14.0"
+egui_dnd = "0.15.0"
 
 [[bin]]
 name = "pwsp-daemon"

packages/aur/bin/.SRCINFO

@@ -0,0 +1,17 @@
+pkgbase = pwsp-bin
+pkgdesc = Lets you play audio files through your microphone (Pre-built binaries)
+pkgver = 1.6.3
+pkgrel = 2
+url = https://github.com/arabianq/pipewire-soundpad
+arch = x86_64
+license = MIT
+depends = pipewire
+depends = alsa-lib
+provides = pwsp
+conflicts = pwsp
+source = pwsp-bin-1.6.3.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.6.3/pwsp-v1.6.3-linux-x64.zip
+source = pipewire-soundpad-1.6.3.tar.gz :: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.6.3.tar.gz
+sha256sums = SKIP
+sha256sums = SKIP
+
+pkgname = pwsp-bin

packages/aur/bin/.gitignore

@@ -0,0 +1,163 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+*.db
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+poetry.lock
+
+.poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cythikaaryhon_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+#.vscode/

packages/aur/bin/PKGBUILD

@@ -0,0 +1,32 @@
+# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
+pkgname=pwsp-bin
+_pkgname=pipewire-soundpad
+pkgver=1.6.3
+pkgrel=2
+pkgdesc="Lets you play audio files through your microphone (Pre-built binaries)"
+arch=('x86_64')
+url="https://github.com/arabianq/pipewire-soundpad"
+license=('MIT')
+depends=('pipewire' 'alsa-lib')
+provides=('pwsp')
+conflicts=('pwsp')
+
+source=("${pkgname}-${pkgver}.zip::https://github.com/arabianq/$_pkgname/releases/download/v$pkgver/pwsp-v$pkgver-linux-x64.zip"
+        "${_pkgname}-${pkgver}.tar.gz::https://github.com/arabianq/$_pkgname/archive/refs/tags/v$pkgver.tar.gz")
+
+sha256sums=('SKIP'
+            'SKIP')
+
+package() {
+  _srcsrc="${srcdir}/${_pkgname}-${pkgver}"
+
+  install -Dm755 "${srcdir}/pwsp-cli" "${pkgdir}/usr/bin/pwsp-cli"
+  install -Dm755 "${srcdir}/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon"
+  install -Dm755 "${srcdir}/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui"
+
+  install -Dm644 "$_srcsrc/assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop"
+  install -Dm644 "$_srcsrc/assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/icon.png"
+  install -Dm644 "$_srcsrc/assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
+  
+  install -Dm644 "$_srcsrc/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

packages/aur/standart/.SRCINFO

@@ -0,0 +1,16 @@
+pkgbase = pwsp
+	pkgdesc = Lets you play audio files through your microphone
+	pkgver = 1.6.3
+	pkgrel = 1
+	url = https://github.com/arabianq/pipewire-soundpad
+	arch = any
+	license = MIT
+	makedepends = clang
+	makedepends = rust
+	makedepends = cargo
+	makedepends = pipewire
+	makedepends = alsa-lib
+	source = https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.6.3.tar.gz
+	sha256sums = SKIP
+
+pkgname = pwsp

packages/aur/standart/.gitignore

@@ -0,0 +1,163 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+*.db
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+poetry.lock
+
+.poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cythikaaryhon_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+#.vscode/

packages/aur/standart/PKGBUILD

@@ -0,0 +1,47 @@
+# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
+pkgsubn=pwsp
+pkgname=pwsp
+pkgver=1.6.3
+pkgrel=1
+pkgdesc="Lets you play audio files through your microphone"
+arch=('any')
+url="https://github.com/arabianq/pipewire-soundpad"
+license=('MIT')
+makedepends=(clang rust cargo pipewire alsa-lib)
+source=("$url/archive/refs/tags/v$pkgver.tar.gz")
+sha256sums=('SKIP')
+
+
+prepare() {
+  cd "${srcdir}/pipewire-soundpad-${pkgver}"
+  
+  export CARGO_HOME="${srcdir}/${pkgname%}/.cargo"    # Download all to src directory, not in ~/.cargo
+
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+}
+
+build() {
+  cd "${srcdir}/pipewire-soundpad-${pkgver}"
+
+  export CARGO_ENCODED_RUSTFLAGS="--remap-path-prefix=${srcdir}=/"    # Prevent warning: 'Package contains reference to $srcdir'
+  [[ -n "${_sccache}" ]] && export RUSTC_WRAPPER=sccache  # If $_sccache not empty, build using binary cache
+
+  export CARGO_HOME="${srcdir}/${pkgname%}/.cargo"    # Use downloaded earlier from src directory, not from ~/.cargo
+  export CARGO_TARGET_DIR=target                        # Place the output in target relative to the current directory
+
+  cargo build --frozen --release
+}
+
+
+package() {
+  cd "${srcdir}/pipewire-soundpad-${pkgver}"
+  
+  install -Dm755 "target/release/pwsp-cli" "${pkgdir}/usr/bin/pwsp-cli"
+  install -Dm755 "target/release/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon"
+  install -Dm755 "target/release/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui"
+
+  install -Dm644 "assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop"
+  install -Dm644 "assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/icon.png"
+
+  install -Dm644 "assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
+}

packages/flatpak/ru.arabianq.pwsp.yaml

@@ -1,6 +1,6 @@
 app-id: ru.arabianq.pwsp
 runtime: org.freedesktop.Platform
-runtime-version: "24.08"
+runtime-version: "25.08"
 sdk: org.freedesktop.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.rust-stable

packages/rpm/pwsp.spec

@@ -4,7 +4,7 @@
 %global cargo_install_lib 0
 
 Name:            pwsp
-Version:         1.6.1
+Version:         1.6.3
 Release:         %autorelease
 Summary:         Lets you play audio files through your microphone
 

src/bin/cli.rs

@@ -75,7 +75,10 @@ enum GetCommands {
     /// Check if the player is paused
     IsPaused,
     /// Playback volume
-    Volume,
+    Volume {
+        #[clap(short, long)]
+        id: Option<u32>,
+    },
     /// Playback position (in seconds)
     Position {
         #[clap(short, long)]
@@ -141,12 +144,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
             Actions::Play {
                 file_path,
                 concurrent,
-            } => Request::play(file_path.to_str().unwrap(), concurrent),
+            } => Request::play(&file_path.to_string_lossy(), concurrent),
             Actions::ToggleLoop { id } => Request::toggle_loop(id),
         },
         Commands::Get { parameter } => match parameter {
             GetCommands::IsPaused => Request::get_is_paused(),
-            GetCommands::Volume => Request::get_volume(),
+            GetCommands::Volume { id } => Request::get_volume(id),
             GetCommands::Position { id } => Request::get_position(id),
             GetCommands::Duration { id } => Request::get_duration(id),
             GetCommands::State => Request::get_state(),

src/bin/daemon.rs

@@ -9,6 +9,7 @@ use pwsp::{
         pipewire::create_virtual_mic,
     },
 };
+use std::os::unix::fs::PermissionsExt;
 use std::{error::Error, fs, time::Duration};
 use tokio::{
     io::{AsyncReadExt, AsyncWriteExt},
@@ -26,8 +27,24 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     get_daemon_config(); // Initialize daemon config
     create_virtual_mic()?;
-    get_audio_player().await; // Initialize audio player
+    if let Err(err) = get_audio_player().await {
-    link_player_to_virtual_mic().await?;
+        eprintln!("Failed to initialize audio player: {}", err);
+    } // Initialize audio player
+
+    tokio::spawn(async {
+        let max_retries = 60;
+        for i in 0..=max_retries {
+            match link_player_to_virtual_mic().await {
+                Ok(_) => {
+                    println!("Successfully linked player to virtual mic.");
+                    break;
+                }
+                Err(e) => println!("{e}\t{i}/{max_retries}"),
+            }
+
+            sleep(Duration::from_millis(1000)).await;
+        }
+    });
 
     let runtime_dir = get_runtime_dir();
 
@@ -35,11 +52,15 @@ async fn main() -> Result<(), Box<dyn Error>> {
     lock_file.lock()?;
 
     let socket_path = runtime_dir.join("daemon.sock");
-    if fs::metadata(&socket_path).is_ok() {
+    if let Err(e) = fs::remove_file(&socket_path) {
-        fs::remove_file(&socket_path)?;
+        if e.kind() != std::io::ErrorKind::NotFound {
+            return Err(e.into());
+        }
     }
 
     let listener = UnixListener::bind(&socket_path)?;
+    fs::set_permissions(&socket_path, fs::Permissions::from_mode(0o600))?;
+
     println!(
         "Daemon started. Listening on {}",
         socket_path.to_str().unwrap_or_default()
@@ -79,13 +100,35 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
 
             let request_len = u32::from_le_bytes(len_bytes) as usize;
 
+            if request_len > 10 * 1024 * 1024 {
+                eprintln!(
+                    "Failed to read message from client: request too large ({} bytes)!",
+                    request_len
+                );
+                return;
+            }
+
             let mut buffer = vec![0u8; request_len];
             if stream.read_exact(&mut buffer).await.is_err() {
                 eprintln!("Failed to read message from client!");
                 return;
             }
 
-            let request: Request = serde_json::from_slice(&buffer).unwrap();
+            let request: Request = match serde_json::from_slice(&buffer) {
+                Ok(req) => req,
+                Err(err) => {
+                    let response =
+                        Response::new(false, format!("Failed to parse request: {}", err));
+                    let response_data = match serde_json::to_vec(&response) {
+                        Ok(data) => data,
+                        Err(_) => return, // Should not happen with this simple Response
+                    };
+                    let response_len = response_data.len() as u32;
+                    let _ = stream.write_all(&response_len.to_le_bytes()).await;
+                    let _ = stream.write_all(&response_data).await;
+                    return;
+                }
+            };
             // ---------- Read request (end) ----------
 
             // ---------- Generate response (start) ----------
@@ -99,7 +142,13 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
             // ---------- Generate response (end) ----------
 
             // ---------- Send response (start) ----------
-            let response_data = serde_json::to_vec(&response).unwrap();
+            let response_data = match serde_json::to_vec(&response) {
+                Ok(data) => data,
+                Err(err) => {
+                    eprintln!("Failed to serialize response: {}", err);
+                    return;
+                }
+            };
             let response_len = response_data.len() as u32;
 
             if stream.write_all(&response_len.to_le_bytes()).await.is_err() {
@@ -121,9 +170,17 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
 
 async fn player_loop() {
     loop {
-        let mut audio_player = get_audio_player().await.lock().await;
+        match get_audio_player().await {
-
+            Ok(player_mutex) => {
+                let mut audio_player = player_mutex.lock().await;
                 audio_player.update().await;
+            }
+            Err(_err) => {
+                // To avoid spamming logs every 100ms when audio player fails to init
+                // we can just sleep, or you might prefer to print the error.
+                // Assuming it failed to initialize, no player update is possible.
+            }
+        }
 
         sleep(Duration::from_millis(100)).await;
     }

src/gui/draw.rs

@@ -19,13 +19,13 @@ enum TrackAction {
 impl SoundpadGui {
     fn get_volume_icon(volume: f32) -> &'static str {
         if volume > 0.7 {
-            ICON_VOLUME_UP
+            ICON_VOLUME_UP.codepoint
         } else if volume <= 0.0 {
-            ICON_VOLUME_OFF
+            ICON_VOLUME_OFF.codepoint
         } else if volume < 0.3 {
-            ICON_VOLUME_MUTE
+            ICON_VOLUME_MUTE.codepoint
         } else {
-            ICON_VOLUME_DOWN
+            ICON_VOLUME_DOWN.codepoint
         }
     }
 
@@ -313,7 +313,7 @@ impl SoundpadGui {
                     let path = item.clone();
                     ui.horizontal(|ui| {
                         handle.ui(ui, |ui| {
-                            ui.label(ICON_DRAG_INDICATOR);
+                            ui.label(ICON_DRAG_INDICATOR.codepoint);
                         });
                         let name = path
                             .file_name()
@@ -345,7 +345,7 @@ impl SoundpadGui {
                         // Context menu
                         dir_button_response.context_menu(|ui| {
                             if ui
-                                .button(format!("{} {}", ICON_OPEN_IN_NEW, "Show"))
+                                .button(format!("{} {}", ICON_OPEN_IN_NEW.codepoint, "Show"))
                                 .clicked()
                             {
                                 self.open_dir(&path);
@@ -354,7 +354,7 @@ impl SoundpadGui {
                             if ui
                                 .button(format!(
                                     "{} {}",
-                                    ICON_OPEN_IN_BROWSER, "Open in File Manager"
+                                    ICON_OPEN_IN_BROWSER.codepoint, "Open in File Manager"
                                 ))
                                 .clicked()
                             {
@@ -365,7 +365,10 @@ impl SoundpadGui {
 
                             ui.separator();
 
-                            if ui.button(format!("{} {}", ICON_DELETE, "Remove")).clicked() {
+                            if ui
+                                .button(format!("{} {}", ICON_DELETE.codepoint, "Remove"))
+                                .clicked()
+                            {
                                 self.app_state.dirs_to_remove.insert(path.clone());
                             }
                         });
@@ -452,20 +455,23 @@ impl SoundpadGui {
                         // Context menu
                         file_button_response.context_menu(|ui| {
                             if ui
-                                .button(format!("{} {}", ICON_BOLT, "Play Solo"))
+                                .button(format!("{} {}", ICON_BOLT.codepoint, "Play Solo"))
                                 .clicked()
                             {
                                 self.play_file(&entry_path, false);
                                 self.app_state.selected_file = Some(entry_path.clone());
                             }
 
-                            if ui.button(format!("{} {}", ICON_ADD, "Add New")).clicked() {
+                            if ui
+                                .button(format!("{} {}", ICON_ADD.codepoint, "Add New"))
+                                .clicked()
+                            {
                                 self.play_file(&entry_path, true);
                                 self.app_state.selected_file = Some(entry_path.clone());
                             }
 
                             if ui
-                                .button(format!("{} {}", ICON_SWAP_HORIZ, "Replace Last"))
+                                .button(format!("{} {}", ICON_SWAP_HORIZ.codepoint, "Replace Last"))
                                 .clicked()
                                 && let Some(last_track) = self.audio_player_state.tracks.last()
                             {
@@ -479,7 +485,7 @@ impl SoundpadGui {
                             if ui
                                 .button(format!(
                                     "{} {}",
-                                    ICON_OPEN_IN_BROWSER, "Show in File Manager"
+                                    ICON_OPEN_IN_BROWSER.codepoint, "Show in File Manager"
                                 ))
                                 .clicked()
                             {
@@ -498,9 +504,7 @@ impl SoundpadGui {
         ui.add_space(5.0);
         ui.horizontal(|ui| {
             // ---------- Microphone selection ----------
-            let mut mics: Vec<(&String, &String)> =
+            let mics = &self.audio_player_state.all_inputs_sorted;
-                self.audio_player_state.all_inputs.iter().collect();
-            mics.sort_by_key(|(k, _)| *k);
 
             let mut selected_input = self.audio_player_state.current_input.to_owned();
             let prev_input = selected_input.to_owned();
@@ -514,7 +518,7 @@ impl SoundpadGui {
                 )
                 .show_ui(ui, |ui| {
                     for (name, nick) in mics {
-                        ui.selectable_value(&mut selected_input, name.to_owned(), nick);
+                        ui.selectable_value(&mut selected_input, name.clone(), nick);
                     }
                 });
 

src/gui/input.rs

@@ -1,5 +1,5 @@
 use crate::gui::SoundpadGui;
-use egui::{Context, Key, Modifiers};
+use egui::{Context, Id, Key, Modifiers};
 
 use std::path::PathBuf;
 
@@ -12,42 +12,63 @@ impl SoundpadGui {
         ctx.input(|i| i.modifiers)
     }
 
+    fn get_focused(&self, ctx: &Context) -> Option<Id> {
+        ctx.memory(|m| m.focused())
+    }
+
     pub fn handle_input(&mut self, ctx: &Context) {
         let modifiers = self.modifiers(ctx);
+        let search_focused = {
+            if let Some(focused_id) = self.get_focused(ctx)
+                && let Some(search_id) = self.app_state.search_field_id
+                && focused_id.eq(&search_id)
+            {
+                true
+            } else {
+                false
+            }
+        };
 
         // Open/close settings
-        if self.key_pressed(ctx, Key::I) {
+        if !search_focused && self.key_pressed(ctx, Key::I) {
             self.app_state.show_settings = !self.app_state.show_settings;
         }
 
         if !self.app_state.show_settings {
             // Pause / resume audio on space
-            if self.key_pressed(ctx, Key::Space) {
+            if !search_focused && self.key_pressed(ctx, Key::Space) {
                 self.play_toggle();
             }
 
             // Stop all audio tracks on backspace
-            if self.key_pressed(ctx, Key::Backspace) {
+            if !search_focused && self.key_pressed(ctx, Key::Backspace) {
                 self.stop(None);
             }
 
             // Focus search field
             if self.key_pressed(ctx, Key::Slash) {
+                if search_focused {
+                    ctx.memory_mut(|m| {
+                        m.request_focus(Id::NULL);
+                    });
+                } else {
                     self.app_state.force_focus_search = true;
                 }
+            }
 
             // Play selected file on Enter
-            if self.key_pressed(ctx, Key::Enter) && self.app_state.selected_file.is_some() {
+            if self.key_pressed(ctx, Key::Enter) {
-                let path = &self.app_state.selected_file.clone().unwrap();
+                if let Some(path) = self.app_state.selected_file.clone() {
                     if modifiers.ctrl {
-                    self.play_file(path, true);
+                        self.play_file(&path, true);
                     } else if modifiers.shift
                         && let Some(last_track) = self.audio_player_state.tracks.last()
                     {
                         self.stop(Some(last_track.id));
-                    self.play_file(path, true);
+                        self.play_file(&path, true);
                     } else {
-                    self.play_file(path, false);
+                        self.play_file(&path, false);
+                    }
                 }
             }
 
@@ -59,29 +80,23 @@ impl SoundpadGui {
                     let mut dirs: Vec<PathBuf> = self.app_state.dirs.iter().cloned().collect();
                     dirs.sort();
 
-                    let current_dir_index: i8;
+                    let current_dir_index = self
-                    if let Some(current_dir) = &self.app_state.current_dir {
+                        .app_state
-                        if let Some(index) = dirs.iter().position(|x| x == current_dir) {
+                        .current_dir
-                            current_dir_index = index as i8;
+                        .as_ref()
-                        } else {
+                        .and_then(|cd| dirs.iter().position(|x| x == cd));
-                            current_dir_index = -1;
-                        }
-                    } else {
-                        current_dir_index = -1;
-                    }
 
-                    let mut new_dir_index: i8;
+                    let new_dir_index =
+                        match (current_dir_index, arrow_up_pressed, arrow_down_pressed) {
+                            (Some(i), true, false) => (i + dirs.len() - 1) % dirs.len(),
+                            (Some(i), false, true) => (i + 1) % dirs.len(),
+                            (Some(i), true, true) => i,
+                            (None, true, _) => dirs.len() - 1,
+                            (None, false, true) => 0,
+                            _ => return,
+                        };
 
-                    new_dir_index =
+                    self.open_dir(&dirs[new_dir_index]);
-                        current_dir_index - arrow_up_pressed as i8 + arrow_down_pressed as i8;
-
-                    if new_dir_index < 0 {
-                        new_dir_index = (dirs.len() - 1) as i8;
-                    } else if new_dir_index >= dirs.len() as i8 {
-                        new_dir_index = 0;
-                    }
-
-                    self.open_dir(&dirs[new_dir_index as usize]);
                 } else if self.app_state.current_dir.is_some() {
                     let files = self.get_filtered_files();
 
@@ -93,20 +108,19 @@ impl SoundpadGui {
                         .app_state
                         .selected_file
                         .as_ref()
-                        .and_then(|f| files.iter().position(|x| x == f))
+                        .and_then(|f| files.iter().position(|x| x == f));
-                        .map(|i| i as i64)
-                        .unwrap_or(-1);
 
-                    let mut new_files_index =
+                    let new_files_index =
-                        current_files_index - arrow_up_pressed as i64 + arrow_down_pressed as i64;
+                        match (current_files_index, arrow_up_pressed, arrow_down_pressed) {
+                            (Some(i), true, false) => (i + files.len() - 1) % files.len(),
+                            (Some(i), false, true) => (i + 1) % files.len(),
+                            (Some(i), true, true) => i,
+                            (None, true, _) => files.len() - 1,
+                            (None, false, true) => 0,
+                            _ => return,
+                        };
 
-                    if new_files_index < 0 {
+                    self.app_state.selected_file = Some(files[new_files_index].clone());
-                        new_files_index = (files.len() - 1) as i64;
-                    } else if new_files_index >= files.len() as i64 {
-                        new_files_index = 0;
-                    }
-
-                    self.app_state.selected_file = Some(files[new_files_index as usize].clone());
                 }
             }
         }

src/gui/mod.rs

@@ -58,7 +58,10 @@ impl SoundpadGui {
 
     pub fn play_toggle(&mut self) {
         let (new_state, request) = {
-            let guard = self.audio_player_state_shared.lock().unwrap();
+            let guard = self
+                .audio_player_state_shared
+                .lock()
+                .unwrap_or_else(|e| e.into_inner());
             match guard.state {
                 PlayerState::Playing => (Some(PlayerState::Paused), Some(Request::pause(None))),
                 PlayerState::Paused => (Some(PlayerState::Playing), Some(Request::resume(None))),
@@ -71,7 +74,10 @@ impl SoundpadGui {
         }
 
         if let Some(state) = new_state {
-            let mut guard = self.audio_player_state_shared.lock().unwrap();
+            let mut guard = self
+                .audio_player_state_shared
+                .lock()
+                .unwrap_or_else(|e| e.into_inner());
             guard.new_state = Some(state.clone());
             guard.state = state;
         }
@@ -113,7 +119,7 @@ impl SoundpadGui {
     }
 
     pub fn play_file(&mut self, path: &PathBuf, concurrent: bool) {
-        make_request_async(Request::play(path.to_str().unwrap(), concurrent));
+        make_request_async(Request::play(&path.to_string_lossy(), concurrent));
     }
 
     pub fn set_input(&mut self, name: String) {

src/gui/update.rs

@@ -8,7 +8,7 @@ use pwsp::{
 use std::time::{Duration, Instant};
 
 impl App for SoundpadGui {
-    fn update(&mut self, ctx: &Context, _frame: &mut EFrame) {
+    fn logic(&mut self, ctx: &Context, _frame: &mut EFrame) {
         // Remove directories
         for path in self.app_state.dirs_to_remove.drain() {
             self.app_state.dirs.retain(|x| x != &path);
@@ -77,7 +77,10 @@ impl App for SoundpadGui {
 
         // Sync audio player state
         {
-            let guard = self.audio_player_state_shared.lock().unwrap();
+            let guard = self
+                .audio_player_state_shared
+                .lock()
+                .unwrap_or_else(|e| e.into_inner());
             self.audio_player_state = guard.clone();
         }
 
@@ -94,9 +97,11 @@ impl App for SoundpadGui {
 
         // Handle input
         self.handle_input(ctx);
+    }
 
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut EFrame) {
         // Draw UI
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             if !self.audio_player_state.is_daemon_running {
                 self.draw_waiting_for_daemon(ui);
                 return;
@@ -111,6 +116,6 @@ impl App for SoundpadGui {
         });
 
         // Request repaint
-        ctx.request_repaint_after_secs(1.0 / 60.0);
+        ui.request_repaint_after_secs(1.0 / 60.0);
     }
 }

src/types/audio_player.rs

@@ -208,6 +208,18 @@ impl AudioPlayer {
         PlayerState::Stopped
     }
 
+    pub fn get_volume(&mut self, id: Option<u32>) -> Option<f32> {
+        if let Some(id) = id {
+            if let Some(sound) = self.tracks.get_mut(&id) {
+                return Some(sound.sink.volume());
+            } else {
+                return None;
+            }
+        } else {
+            return Some(self.volume);
+        }
+    }
+
     pub fn set_volume(&mut self, volume: f32, id: Option<u32>) {
         if let Some(id) = id {
             if let Some(sound) = self.tracks.get_mut(&id) {
@@ -266,12 +278,22 @@ impl AudioPlayer {
         file_path: &Path,
         concurrent: bool,
     ) -> Result<u32, Box<dyn Error>> {
-        if !file_path.exists() {
+        let path_buf = file_path.to_path_buf();
-            return Err(format!("File does not exist: {}", file_path.display()).into());
+
+        let decoder_result =
+            tokio::task::spawn_blocking(move || -> Result<_, Box<dyn Error + Send + Sync>> {
+                if !path_buf.exists() {
+                    return Err(format!("File does not exist: {}", path_buf.display()).into());
                 }
 
-        let file = fs::File::open(file_path)?;
+                let file = fs::File::open(&path_buf)?;
-        match Decoder::try_from(file) {
+                let decoder = Decoder::try_from(file)
+                    .map_err(|e| Box::new(e) as Box<dyn Error + Send + Sync>)?;
+                Ok(decoder)
+            })
+            .await?;
+
+        match decoder_result {
             Ok(source) => {
                 if !concurrent {
                     self.tracks.clear();
@@ -300,7 +322,7 @@ impl AudioPlayer {
 
                 Ok(id)
             }
-            Err(err) => Err(err.into()),
+            Err(err) => Err(err as Box<dyn Error>),
         }
     }
 
@@ -362,16 +384,31 @@ impl AudioPlayer {
             }
         }
 
+        let mut restart_futures = vec![];
+
         for id in restarts {
-            if let Some(sound) = self.tracks.get_mut(&id) {
+            if let Some(sound) = self.tracks.get(&id) {
-                if let Ok(file) = fs::File::open(&sound.path) {
+                let path = sound.path.clone();
+                let handle = tokio::task::spawn_blocking(move || {
+                    if let Ok(file) = fs::File::open(&path) {
                         if let Ok(source) = Decoder::try_from(file) {
+                            return Some((id, source));
+                        }
+                    }
+                    None
+                });
+                restart_futures.push(handle);
+            }
+        }
+
+        for handle in restart_futures {
+            if let Ok(Some((id, source))) = handle.await {
+                if let Some(sound) = self.tracks.get_mut(&id) {
                     sound.sink.append(source);
                     sound.sink.play();
                 }
             }
         }
-        }
 
         self.tracks
             .retain(|_, sound| !sound.sink.empty() || sound.looped);

src/types/commands.rs

@@ -40,7 +40,9 @@ pub struct IsPausedCommand {}
 
 pub struct GetStateCommand {}
 
-pub struct GetVolumeCommand {}
+pub struct GetVolumeCommand {
+    pub id: Option<u32>,
+}
 
 pub struct SetVolumeCommand {
     pub volume: Option<f32>,
@@ -105,7 +107,10 @@ impl Executable for KillCommand {
 #[async_trait]
 impl Executable for PauseCommand {
     async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         audio_player.pause(self.id);
         Response::new(true, "Audio was paused")
     }
@@ -114,7 +119,10 @@ impl Executable for PauseCommand {
 #[async_trait]
 impl Executable for ResumeCommand {
     async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         audio_player.resume(self.id);
         Response::new(true, "Audio was resumed")
     }
@@ -123,7 +131,10 @@ impl Executable for ResumeCommand {
 #[async_trait]
 impl Executable for TogglePauseCommand {
     async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
 
         if audio_player.get_state() == PlayerState::Stopped {
             return Response::new(false, "Audio is not playing");
@@ -161,7 +172,10 @@ impl Executable for TogglePauseCommand {
 #[async_trait]
 impl Executable for StopCommand {
     async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         audio_player.stop(self.id);
         Response::new(true, "Audio was stopped")
     }
@@ -170,7 +184,10 @@ impl Executable for StopCommand {
 #[async_trait]
 impl Executable for IsPausedCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         let is_paused = audio_player.is_paused().to_string();
         Response::new(true, is_paused)
     }
@@ -179,18 +196,32 @@ impl Executable for IsPausedCommand {
 #[async_trait]
 impl Executable for GetStateCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         let state = audio_player.get_state();
-        Response::new(true, serde_json::to_string(&state).unwrap())
+        match serde_json::to_string(&state) {
+            Ok(json) => Response::new(true, json),
+            Err(err) => Response::new(false, format!("Failed to serialize state: {}", err)),
+        }
     }
 }
 
 #[async_trait]
 impl Executable for GetVolumeCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = match get_audio_player().await {
-        let volume = audio_player.volume;
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
+        let volume = audio_player.get_volume(self.id);
+
+        if let Some(volume) = volume {
             Response::new(true, volume.to_string())
+        } else {
+            Response::new(false, "Failed to get volume")
+        }
     }
 }
 
@@ -198,7 +229,10 @@ impl Executable for GetVolumeCommand {
 impl Executable for SetVolumeCommand {
     async fn execute(&self) -> Response {
         if let Some(volume) = self.volume {
-            let mut audio_player = get_audio_player().await.lock().await;
+            let mut audio_player = match get_audio_player().await {
+                Ok(player) => player.lock().await,
+                Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+            };
             audio_player.set_volume(volume, self.id);
             Response::new(true, format!("Audio volume was set to {}", volume))
         } else {
@@ -210,7 +244,10 @@ impl Executable for SetVolumeCommand {
 #[async_trait]
 impl Executable for GetPositionCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         let position = audio_player.get_position(self.id);
         Response::new(true, position.to_string())
     }
@@ -220,7 +257,10 @@ impl Executable for GetPositionCommand {
 impl Executable for SeekCommand {
     async fn execute(&self) -> Response {
         if let Some(position) = self.position {
-            let mut audio_player = get_audio_player().await.lock().await;
+            let mut audio_player = match get_audio_player().await {
+                Ok(player) => player.lock().await,
+                Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+            };
             match audio_player.seek(position, self.id) {
                 Ok(_) => Response::new(true, format!("Audio position was set to {}", position)),
                 Err(err) => Response::new(false, err.to_string()),
@@ -234,7 +274,10 @@ impl Executable for SeekCommand {
 #[async_trait]
 impl Executable for GetDurationCommand {
     async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         match audio_player.get_duration(self.id) {
             Ok(duration) => Response::new(true, duration.to_string()),
             Err(err) => Response::new(false, err.to_string()),
@@ -246,7 +289,10 @@ impl Executable for GetDurationCommand {
 impl Executable for PlayCommand {
     async fn execute(&self) -> Response {
         if let Some(file_path) = &self.file_path {
-            let mut audio_player = get_audio_player().await.lock().await;
+            let mut audio_player = match get_audio_player().await {
+                Ok(player) => player.lock().await,
+                Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+            };
             match audio_player
                 .play(file_path, self.concurrent.unwrap_or(false))
                 .await
@@ -263,16 +309,25 @@ impl Executable for PlayCommand {
 #[async_trait]
 impl Executable for GetTracksCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         let tracks = audio_player.get_tracks();
-        Response::new(true, serde_json::to_string(&tracks).unwrap())
+        match serde_json::to_string(&tracks) {
+            Ok(json) => Response::new(true, json),
+            Err(err) => Response::new(false, format!("Failed to serialize tracks: {}", err)),
+        }
     }
 }
 
 #[async_trait]
 impl Executable for GetCurrentInputCommand {
     async fn execute(&self) -> Response {
-        let audio_player = get_audio_player().await.lock().await;
+        let audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         if let Some(input_device_name) = &audio_player.input_device_name {
             if let Ok(input_device) = get_device(input_device_name).await {
                 Response::new(
@@ -291,7 +346,10 @@ impl Executable for GetCurrentInputCommand {
 #[async_trait]
 impl Executable for GetAllInputsCommand {
     async fn execute(&self) -> Response {
-        let (input_devices, _output_devices) = get_all_devices().await.unwrap();
+        let (input_devices, _output_devices) = match get_all_devices().await {
+            Ok(devices) => devices,
+            Err(err) => return Response::new(false, format!("Failed to get devices: {}", err)),
+        };
         let mut input_devices_strings = vec![];
         for device in input_devices {
             if device.name == "pwsp-virtual-mic" {
@@ -311,7 +369,10 @@ impl Executable for GetAllInputsCommand {
 impl Executable for SetCurrentInputCommand {
     async fn execute(&self) -> Response {
         if let Some(name) = &self.name {
-            let mut audio_player = get_audio_player().await.lock().await;
+            let mut audio_player = match get_audio_player().await {
+                Ok(player) => player.lock().await,
+                Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+            };
             match audio_player.set_current_input_device(name).await {
                 Ok(_) => Response::new(true, "Input device was set"),
                 Err(err) => Response::new(false, err.to_string()),
@@ -325,7 +386,10 @@ impl Executable for SetCurrentInputCommand {
 #[async_trait]
 impl Executable for SetLoopCommand {
     async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
 
         match self.enabled {
             Some(enabled) => {
@@ -340,7 +404,10 @@ impl Executable for SetLoopCommand {
 #[async_trait]
 impl Executable for ToggleLoopCommand {
     async fn execute(&self) -> Response {
-        let mut audio_player = get_audio_player().await.lock().await;
+        let mut audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
         if let Some(id) = self.id {
             if let Some(track) = audio_player.tracks.get_mut(&id) {
                 track.looped = !track.looped;
@@ -368,33 +435,49 @@ impl Executable for GetDaemonVersionCommand {
 #[async_trait]
 impl Executable for GetFullStateCommand {
     async fn execute(&self) -> Response {
-        let (input_devices, _output_devices) = get_all_devices().await.unwrap();
+        let (input_devices, _output_devices) = match get_all_devices().await {
+            Ok(devices) => devices,
+            Err(err) => return Response::new(false, format!("Failed to get devices: {}", err)),
+        };
         let mut all_inputs = HashMap::new();
         let mut current_input_nick = String::new();
 
-        let audio_player = get_audio_player().await.lock().await;
+        let audio_player = match get_audio_player().await {
+            Ok(player) => player.lock().await,
+            Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
+        };
+        if let Some(current_input_name) = &audio_player.input_device_name {
+            for device in input_devices {
+                if device.name == "pwsp-virtual-mic" {
+                    continue;
+                }
+                if device.name == *current_input_name {
+                    current_input_nick = format!("{} - {}", device.name, device.nick);
+                }
+
+                all_inputs.insert(device.name, device.nick);
+            }
+        } else {
             for device in input_devices {
                 if device.name == "pwsp-virtual-mic" {
                     continue;
                 }
 
-            if let Some(current_input_name) = &audio_player.input_device_name {
-                if device.name == *current_input_name {
-                    current_input_nick = format!("{} - {}", device.name, device.nick);
-                }
-            }
-
                 all_inputs.insert(device.name, device.nick);
             }
+        }
 
         let full_state = FullState {
             state: audio_player.get_state(),
             tracks: audio_player.get_tracks(),
             volume: audio_player.volume,
             current_input: current_input_nick,
-            all_inputs: all_inputs,
+            all_inputs,
         };
 
-        Response::new(true, serde_json::to_string(&full_state).unwrap())
+        match serde_json::to_string(&full_state) {
+            Ok(json) => Response::new(true, json),
+            Err(err) => Response::new(false, format!("Failed to serialize full state: {}", err)),
+        }
     }
 }

src/types/config.rs

@@ -12,11 +12,12 @@ pub struct DaemonConfig {
 impl DaemonConfig {
     pub fn save_to_file(&self) -> Result<(), Box<dyn Error>> {
         let config_path = get_config_path()?.join("daemon.json");
-        let config_dir = config_path.parent().unwrap();
 
+        if let Some(config_dir) = config_path.parent() {
             if !config_path.exists() {
                 fs::create_dir_all(config_dir)?;
             }
+        }
 
         let config_json = serde_json::to_string_pretty(self)?;
         fs::write(config_path, config_json.as_bytes())?;
@@ -26,7 +27,10 @@ impl DaemonConfig {
     pub fn load_from_file() -> Result<DaemonConfig, Box<dyn Error>> {
         let config_path = get_config_path()?.join("daemon.json");
         let bytes = fs::read(config_path)?;
-        Ok(serde_json::from_slice::<DaemonConfig>(&bytes)?)
+        match serde_json::from_slice::<DaemonConfig>(&bytes) {
+            Ok(config) => Ok(config),
+            Err(_) => Ok(DaemonConfig::default()),
+        }
     }
 }
 
@@ -63,11 +67,12 @@ impl Default for GuiConfig {
 impl GuiConfig {
     pub fn save_to_file(&mut self) -> Result<(), Box<dyn Error>> {
         let config_path = get_config_path()?.join("gui.json");
-        let config_dir = config_path.parent().unwrap();
 
+        if let Some(config_dir) = config_path.parent() {
             if !config_path.exists() {
                 fs::create_dir_all(config_dir)?;
             }
+        }
 
         // Do not save scale factor if user does not want to
         if !self.save_scale_factor {
@@ -82,6 +87,9 @@ impl GuiConfig {
     pub fn load_from_file() -> Result<GuiConfig, Box<dyn Error>> {
         let config_path = get_config_path()?.join("gui.json");
         let bytes = fs::read(config_path)?;
-        Ok(serde_json::from_slice::<GuiConfig>(&bytes)?)
+        match serde_json::from_slice::<GuiConfig>(&bytes) {
+            Ok(config) => Ok(config),
+            Err(_) => Ok(GuiConfig::default()),
+        }
     }
 }

src/types/gui.rs

@@ -55,6 +55,7 @@ pub struct AudioPlayerState {
 
     pub current_input: String,
     pub all_inputs: HashMap<String, String>,
+    pub all_inputs_sorted: Vec<(String, String)>,
 
     pub is_daemon_running: bool,
 }

src/types/socket.rs

@@ -82,8 +82,14 @@ impl Request {
         Request::new("is_paused", vec![])
     }
 
-    pub fn get_volume() -> Self {
+    pub fn get_volume(id: Option<u32>) -> Self {
-        Request::new("get_volume", vec![])
+        let mut args = vec![];
+        let id_str;
+        if let Some(id) = id {
+            id_str = id.to_string();
+            args.push(("id", id_str.as_str()));
+        }
+        Request::new("get_volume", args)
     }
 
     pub fn get_position(id: Option<u32>) -> Self {

src/utils/commands.rs

@@ -14,7 +14,7 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
         "stop" => Some(Box::new(StopCommand { id })),
         "is_paused" => Some(Box::new(IsPausedCommand {})),
         "get_state" => Some(Box::new(GetStateCommand {})),
-        "get_volume" => Some(Box::new(GetVolumeCommand {})),
+        "get_volume" => Some(Box::new(GetVolumeCommand { id })),
         "set_volume" => {
             let volume = request
                 .args

src/utils/daemon.rs

@@ -6,6 +6,7 @@ use crate::{
     },
     utils::pipewire::{create_link, get_device},
 };
+use std::os::unix::fs::PermissionsExt;
 use std::path::PathBuf;
 use std::{error::Error, fs};
 use tokio::{
@@ -17,11 +18,14 @@ use tokio::{
 
 static AUDIO_PLAYER: OnceCell<Mutex<AudioPlayer>> = OnceCell::const_new();
 
-pub async fn get_audio_player() -> &'static Mutex<AudioPlayer> {
+pub async fn get_audio_player() -> Result<&'static Mutex<AudioPlayer>, String> {
     AUDIO_PLAYER
-        .get_or_init(|| async {
+        .get_or_try_init(|| async {
             println!("Initializing audio player");
-            Mutex::new(AudioPlayer::new().await.unwrap())
+            match AudioPlayer::new().await {
+                Ok(player) => Ok(Mutex::new(player)),
+                Err(err) => Err(err.to_string()),
+            }
         })
         .await
 }
@@ -39,16 +43,16 @@ pub async fn link_player_to_virtual_mic() -> Result<(), Box<dyn Error>> {
     if let Ok(device) = get_device("pwsp-daemon").await {
         pwsp_daemon_output = device;
     } else {
-        eprintln!("Could not find alsa_playback.pwsp-daemon device, skipping device linking");
+        return Err(
-        return Ok(());
+            "Could not find alsa_playback.pwsp-daemon device, skipping device linking".into(),
+        );
     }
 
     let pwsp_daemon_input;
     if let Ok(device) = get_device("pwsp-virtual-mic").await {
         pwsp_daemon_input = device;
     } else {
-        eprintln!("Could not find pwsp-virtual-mic device, skipping device linking");
+        return Err("Could not find pwsp-virtual-mic device, skipping device linking".into());
-        return Ok(());
     }
 
     let output_fl = pwsp_daemon_output
@@ -81,6 +85,7 @@ pub fn create_runtime_dir() -> Result<(), Box<dyn Error>> {
     if !runtime_dir.exists() {
         fs::create_dir_all(&runtime_dir)?;
     }
+    fs::set_permissions(&runtime_dir, fs::Permissions::from_mode(0o700))?;
 
     Ok(())
 }

src/utils/gui.rs

@@ -55,7 +55,9 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
 
             if !is_running {
                 {
-                    let mut guard = audio_player_state_shared.lock().unwrap();
+                    let mut guard = audio_player_state_shared
+                        .lock()
+                        .unwrap_or_else(|e| e.into_inner());
                     guard.is_daemon_running = false;
                 }
                 sleep(Duration::from_millis(500)).await;
@@ -69,7 +71,9 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
                 let full_state: FullState =
                     serde_json::from_str(&full_state_res.message).unwrap_or_default();
 
-                let mut guard = audio_player_state_shared.lock().unwrap();
+                let mut guard = audio_player_state_shared
+                    .lock()
+                    .unwrap_or_else(|e| e.into_inner());
 
                 guard.state = match guard.new_state.clone() {
                     Some(new_state) => {
@@ -86,7 +90,18 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
                     .next()
                     .unwrap_or_default()
                     .to_string();
+
+                if guard.all_inputs != full_state.all_inputs {
                     guard.all_inputs = full_state.all_inputs;
+                    let mut sorted: Vec<(String, String)> = guard
+                        .all_inputs
+                        .iter()
+                        .map(|(k, v)| (k.clone(), v.clone()))
+                        .collect();
+                    sorted.sort_by(|a, b| a.0.cmp(&b.0));
+                    guard.all_inputs_sorted = sorted;
+                }
+
                 guard.is_daemon_running = true;
             }
 

src/utils/pipewire.rs

@@ -57,10 +57,11 @@ fn parse_global_object(
             };
             // Check if the object is a port
         } else if props.get("port.direction").is_some() {
-            let node_id = props.get("node.id").unwrap().parse::<u32>().unwrap();
+            if let (Some(node_id), Some(port_id), Some(port_name)) = (
-            let port_id = props.get("port.id").unwrap().parse::<u32>().unwrap();
+                props.get("node.id").and_then(|id| id.parse::<u32>().ok()),
-            let port_name = props.get("port.name").unwrap();
+                props.get("port.id").and_then(|id| id.parse::<u32>().ok()),
-
+                props.get("port.name"),
+            ) {
                 let port = Port {
                     node_id,
                     port_id,
@@ -70,6 +71,7 @@ fn parse_global_object(
                 return (None, Some(port));
             }
         }
+    }
     (None, None)
 }
 
@@ -151,8 +153,7 @@ pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>), B
                 for port in ports {
                     let node_id = port.node_id;
 
-                    if input_devices.contains_key(&node_id) {
+                    if let Some(input_device) = input_devices.get_mut(&node_id) {
-                        let input_device = input_devices.get_mut(&node_id).unwrap();
                         match port.name.as_str() {
                             "input_FL" => input_device.input_fl = Some(port),
                             "input_FR" => input_device.input_fr = Some(port),
@@ -170,8 +171,7 @@ pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>), B
                             }
                             _ => {}
                         }
-                    } else if output_devices.contains_key(&node_id) {
+                    } else if let Some(output_device) = output_devices.get_mut(&node_id) {
-                        let output_device = output_devices.get_mut(&node_id).unwrap();
                         match port.name.as_str() {
                             "input_FL" => output_device.input_fl = Some(port),
                             "input_FR" => output_device.input_fr = Some(port),
@@ -206,20 +206,18 @@ pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>), B
 }
 
 pub async fn get_device(device_name: &str) -> Result<AudioDevice, Box<dyn Error>> {
-    let (mut input_devices, output_devices) = get_all_devices().await?;
+    let (input_devices, output_devices) = get_all_devices().await?;
-    input_devices.extend(output_devices);
 
-    for device in input_devices {
+    input_devices
-        if device.name == device_name
+        .into_iter()
+        .chain(output_devices)
+        .find(|device| {
+            device.name == device_name
                 || device.nick == device_name
                 || device.name.contains(device_name)
                 || device.nick.contains(device_name)
-        {
+        })
-            return Ok(device);
+        .ok_or_else(|| "Device not found".into())
-        }
-    }
-
-    Err("Device not found".into())
 }
 
 pub fn create_virtual_mic() -> Result<pipewire::channel::Sender<Terminate>, Box<dyn Error>> {

tests/perf_play.rs

@@ -0,0 +1,113 @@
+use rodio::{DeviceSinkBuilder, MixerDeviceSink};
+use std::fs;
+use std::path::Path;
+use std::sync::Arc;
+use std::time::Instant;
+use tokio::sync::Mutex;
+
+// A mock of AudioPlayer to isolate the play method's blocking behavior.
+// We only implement the relevant part of the logic that needs optimizing.
+pub struct AudioPlayerMock {
+    pub tracks: std::collections::HashMap<u32, ()>,
+    pub next_id: u32,
+    pub volume: f32,
+}
+
+impl AudioPlayerMock {
+    pub fn new() -> Self {
+        AudioPlayerMock {
+            tracks: std::collections::HashMap::new(),
+            next_id: 1,
+            volume: 1.0,
+        }
+    }
+
+    pub async fn play(
+        &mut self,
+        file_path: &Path,
+        concurrent: bool,
+    ) -> Result<u32, Box<dyn std::error::Error + Send + Sync>> {
+        if !file_path.exists() {
+            return Err(format!("File does not exist: {}", file_path.display()).into());
+        }
+
+        let path_buf = file_path.to_path_buf();
+        let _file = tokio::task::spawn_blocking(move || {
+            // Simulate some blocking work like Decoder::try_from which reads file headers
+            let _f = fs::File::open(&path_buf).unwrap();
+
+            // Emulate the actual time spent reading file and decoding header (which is what Decoder::try_from does)
+            std::thread::sleep(std::time::Duration::from_millis(100)); // Simulate slow disk/decode
+            _f
+        })
+        .await?;
+
+        if !concurrent {
+            self.tracks.clear();
+        }
+
+        let id = self.next_id;
+        self.next_id += 1;
+        self.tracks.insert(id, ());
+
+        Ok(id)
+    }
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_performance_blocking() {
+    println!("Setting up mock environment...");
+
+    // Create a dummy file to read
+    let test_file = Path::new("test_dummy.wav");
+    fs::write(test_file, "dummy content").unwrap();
+
+    let player = Arc::new(Mutex::new(AudioPlayerMock::new()));
+
+    println!("Starting benchmark for synchronous behavior in async fn...");
+
+    // We launch a background task that measures event loop latency.
+    // If the main tasks block the executor, this task will suffer high latency.
+    let latency_task = tokio::spawn(async {
+        let mut max_latency = std::time::Duration::from_secs(0);
+        for _ in 0..50 {
+            let start = Instant::now();
+            tokio::task::yield_now().await;
+            let elapsed = start.elapsed();
+            if elapsed > max_latency {
+                max_latency = elapsed;
+            }
+            tokio::time::sleep(std::time::Duration::from_millis(5)).await;
+        }
+        max_latency
+    });
+
+    // Launch multiple play operations
+    let mut tasks = vec![];
+    let start_time = Instant::now();
+    for _ in 0..10 {
+        let player_clone = Arc::clone(&player);
+        let file_path = test_file.to_path_buf();
+        tasks.push(tokio::spawn(async move {
+            let mut p = player_clone.lock().await;
+            let _ = p.play(&file_path, true).await;
+        }));
+    }
+
+    // Wait for all tasks to finish
+    for t in tasks {
+        let _ = t.await;
+    }
+    let total_time = start_time.elapsed();
+
+    let max_latency = latency_task.await.unwrap();
+
+    println!("Total execution time: {:?}", total_time);
+    println!(
+        "Max event loop latency (blocking indicator): {:?}",
+        max_latency
+    );
+
+    // Cleanup
+    fs::remove_file(test_file).unwrap();
+}