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>
Fix daemon autostart issue caused by sync pipewire retry loop (#43 )
2026-04-28 06:21:23 +00:00 · 2026-03-27 15:46:06 +03:00 · 2026-03-22 17:05:26 +03:00 · 2026-03-21 21:03:48 +03:00 · 2026-03-21 21:03:30 +03:00 · 2026-03-08 02:40:39 +03:00
39 changed files with 1965 additions and 855 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,2 +1,4 @@
 /target
 .idea
+packages/aur/bin/.git
+packages/aur/standart/.git
@@ -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
@@ -1,6 +1,6 @@
 [package]
 name = "pwsp"
-version = "1.6.0"
+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.58", default-features = false, features = [
+clap = { version = "4.6.0", default-features = false, features = [
    "std",
    "suggestions",
    "help",
@@ -29,7 +29,7 @@ clap = { version = "4.5.58", default-features = false, features = [
 dirs = "6.0.0"
 itertools = "0.14.0"

-rodio = { version = "0.21.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_dnd = "0.14.0"
+egui_material_icons = "0.6.0"
+egui_dnd = "0.15.0"

 [[bin]]
 name = "pwsp-daemon"
@@ -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
@@ -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/
@@ -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"
+}
@@ -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
@@ -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/
@@ -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"
+}
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+
+import argparse
+import subprocess
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        prog="PWSP Flatpak",
+        add_help=True,
+        exit_on_error=True
+    )
+    subparsers = parser.add_subparsers(dest="command")
+
+    cli_parser = subparsers.add_parser("cli", add_help=False, prefix_chars=" ")
+    cli_parser.add_argument("args", nargs=argparse.REMAINDER, help="Arguments for pwsp-cli")
+
+    daemon_parser = subparsers.add_parser("daemon", add_help=True)
+    daemon_group = daemon_parser.add_mutually_exclusive_group(required=True)
+    daemon_group.add_argument("--start", action="store_true", help="Start pwps-daemon")
+    daemon_group.add_argument("--kill", action="store_true", help="Kill pwsp-daemon")
+
+    args = parser.parse_args()
+
+    command = args.command
+    if not command:
+        subprocess.Popen("pwsp-daemon")
+        subprocess.Popen("pwsp-gui")
+    else:
+        if command == "cli":
+            subprocess.Popen(["pwsp-cli"] + args.args)
+        elif command == "daemon":
+            if args.start:
+                subprocess.Popen("pwsp-daemon")
+            elif args.kill:
+                subprocess.Popen(["pwsp-cli", "action", "kill"])
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-pwsp-daemon &
-exec pwsp-gui "$@"
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=PWSP (Soundpad)
 Comment=Let's you play audio files through you microphone
-Exec=pwsp-wrapper.sh %u
+Exec=pwsp-wrapper.py %u
 Icon=ru.arabianq.pwsp
 Terminal=false
 Type=Application
@@ -1,11 +1,11 @@
 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
  - org.freedesktop.Sdk.Extension.llvm20
-command: pwsp-wrapper.sh
+command: pwsp-wrapper.py
 finish-args:
  - --share=ipc
  - --socket=fallback-x11
@@ -38,7 +38,7 @@ modules:
      - install -Dm755 target/release/pwsp-daemon /app/bin/pwsp-daemon
      - install -Dm755 target/release/pwsp-cli /app/bin/pwsp-cli
      - install -Dm755 target/release/pwsp-gui /app/bin/pwsp-gui
-      - install -Dm755 packages/flatpak/pwsp-wrapper.sh /app/bin/pwsp-wrapper.sh
+      - install -Dm755 packages/flatpak/pwsp-wrapper.py /app/bin/pwsp-wrapper.py
      - install -Dm644 assets/icon.png /app/share/icons/hicolor/256x256/apps/ru.arabianq.pwsp.png
      - install -Dm644 packages/flatpak/ru.arabianq.pwsp.desktop /app/share/applications/ru.arabianq.pwsp.desktop
      - install -Dm644 packages/flatpak/ru.arabianq.pwsp.metainfo.xml /app/share/metainfo/ru.arabianq.pwsp.metainfo.xml
@@ -4,7 +4,7 @@
 %global cargo_install_lib 0

 Name:            pwsp
-Version:         1.6.0
+Version:         1.6.3
 Release:         %autorelease
 Summary:         Lets you play audio files through your microphone

@@ -35,6 +35,8 @@ enum Commands {
 enum Actions {
    /// Ping the daemon
    Ping,
+    /// Kill the daemon
+    Kill,
    /// Pause audio playback
    Pause {
        #[clap(short, long)]
@@ -73,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)]
@@ -131,6 +136,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
    let request = match cli.command {
        Commands::Action { action } => match action {
            Actions::Ping => Request::ping(),
+            Actions::Kill => Request::kill(),
            Actions::Pause { id } => Request::pause(id),
            Actions::Resume { id } => Request::resume(id),
            Actions::TogglePause { id } => Request::toggle_pause(id),
@@ -138,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(),
@@ -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
-    link_player_to_virtual_mic().await?;
+    if let Err(err) = get_audio_player().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() {
-        fs::remove_file(&socket_path)?;
+    if let Err(e) = 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() {
@@ -111,15 +160,27 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
                return;
            }
            // ---------- Send response (end) ----------
+
+            if response.status && response.message.eq("killed") {
+                std::process::exit(0);
+            }
        });
    }
 }

 async fn player_loop() {
    loop {
-        let mut audio_player = get_audio_player().await.lock().await;
-
-        audio_player.update().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;
    }
@@ -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)> =
-                self.audio_player_state.all_inputs.iter().collect();
-            mics.sort_by_key(|(k, _)| *k);
+            let mics = &self.audio_player_state.all_inputs_sorted;

            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);
                    }
                });

@@ -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) {
-                self.app_state.force_focus_search = true;
+                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() {
-                let path = &self.app_state.selected_file.clone().unwrap();
-                if modifiers.ctrl {
-                    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);
-                } else {
-                    self.play_file(path, false);
+            if self.key_pressed(ctx, Key::Enter) {
+                if let Some(path) = self.app_state.selected_file.clone() {
+                    if modifiers.ctrl {
+                        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);
+                    } else {
+                        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;
-                    if let Some(current_dir) = &self.app_state.current_dir {
-                        if let Some(index) = dirs.iter().position(|x| x == current_dir) {
-                            current_dir_index = index as i8;
-                        } else {
-                            current_dir_index = -1;
-                        }
-                    } else {
-                        current_dir_index = -1;
-                    }
+                    let current_dir_index = self
+                        .app_state
+                        .current_dir
+                        .as_ref()
+                        .and_then(|cd| dirs.iter().position(|x| x == cd));

-                    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 =
-                        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]);
+                    self.open_dir(&dirs[new_dir_index]);
                } 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))
-                        .map(|i| i as i64)
-                        .unwrap_or(-1);
+                        .and_then(|f| files.iter().position(|x| x == f));

-                    let mut new_files_index =
-                        current_files_index - arrow_up_pressed as i64 + arrow_down_pressed as i64;
+                    let new_files_index =
+                        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 {
-                        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());
+                    self.app_state.selected_file = Some(files[new_files_index].clone());
                }
            }
        }
@@ -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) {
@@ -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);
    }
 }
@@ -5,7 +5,7 @@ use crate::{
        pipewire::{create_link, get_device},
    },
 };
-use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink, Source};
+use rodio::{Decoder, DeviceSinkBuilder, MixerDeviceSink, Player, Source};
 use serde::{Deserialize, Serialize};
 use std::{
    collections::HashMap,
@@ -45,7 +45,7 @@ pub struct FullState {

 pub struct PlayingSound {
    pub id: u32,
-    pub sink: Sink,
+    pub sink: Player,
    pub path: PathBuf,
    pub duration: Option<f32>,
    pub looped: bool,
@@ -53,7 +53,7 @@ pub struct PlayingSound {
 }

 pub struct AudioPlayer {
-    pub stream_handle: OutputStream,
+    pub stream_handle: MixerDeviceSink,
    pub tracks: HashMap<u32, PlayingSound>,
    pub next_id: u32,

@@ -68,7 +68,7 @@ impl AudioPlayer {
        let daemon_config = get_daemon_config();
        let default_volume = daemon_config.default_volume.unwrap_or(1.0);

-        let stream_handle = OutputStreamBuilder::open_default_stream()?;
+        let stream_handle = DeviceSinkBuilder::open_default_sink()?;

        let mut audio_player = AudioPlayer {
            stream_handle,
@@ -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() {
-            return Err(format!("File does not exist: {}", file_path.display()).into());
-        }
+        let path_buf = file_path.to_path_buf();

-        let file = fs::File::open(file_path)?;
-        match Decoder::try_from(file) {
+        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(&path_buf)?;
+                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();
@@ -282,7 +304,7 @@ impl AudioPlayer {

                let duration = source.total_duration().map(|d| d.as_secs_f32());

-                let sink = Sink::connect_new(self.stream_handle.mixer());
+                let sink = Player::connect_new(self.stream_handle.mixer());
                sink.set_volume(self.volume); // Default volume is 1.0 * master
                sink.append(source);
                sink.play();
@@ -300,7 +322,7 @@ impl AudioPlayer {

                Ok(id)
            }
-            Err(err) => Err(err.into()),
+            Err(err) => Err(err as Box<dyn Error>),
        }
    }

@@ -362,13 +384,28 @@ impl AudioPlayer {
            }
        }

+        let mut restart_futures = vec![];
+
        for id in restarts {
-            if let Some(sound) = self.tracks.get_mut(&id) {
-                if let Ok(file) = fs::File::open(&sound.path) {
-                    if let Ok(source) = Decoder::try_from(file) {
-                        sound.sink.append(source);
-                        sound.sink.play();
+            if let Some(sound) = self.tracks.get(&id) {
+                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();
                }
            }
        }
@@ -18,6 +18,8 @@ pub trait Executable {

 pub struct PingCommand {}

+pub struct KillCommand {}
+
 pub struct PauseCommand {
    pub id: Option<u32>,
 }
@@ -38,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>,
@@ -93,10 +97,20 @@ impl Executable for PingCommand {
    }
 }

+#[async_trait]
+impl Executable for KillCommand {
+    async fn execute(&self) -> Response {
+        Response::new(true, "killed")
+    }
+}
+
 #[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")
    }
@@ -105,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")
    }
@@ -114,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");
@@ -152,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")
    }
@@ -161,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)
    }
@@ -170,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 volume = audio_player.volume;
-        Response::new(true, volume.to_string())
+        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)),
+        };
+        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")
+        }
    }
 }

@@ -189,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 {
@@ -201,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())
    }
@@ -211,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()),
@@ -225,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()),
@@ -237,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
@@ -254,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(
@@ -282,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" {
@@ -302,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()),
@@ -316,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) => {
@@ -331,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;
@@ -359,23 +435,36 @@ 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;
-        for device in input_devices {
-            if device.name == "pwsp-virtual-mic" {
-                continue;
-            }
-
-            if let Some(current_input_name) = &audio_player.input_device_name {
+        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);
+                all_inputs.insert(device.name, device.nick);
+            }
+        } else {
+            for device in input_devices {
+                if device.name == "pwsp-virtual-mic" {
+                    continue;
+                }
+
+                all_inputs.insert(device.name, device.nick);
+            }
        }

        let full_state = FullState {
@@ -383,9 +472,12 @@ impl Executable for GetFullStateCommand {
            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)),
+        }
    }
 }
@@ -12,10 +12,11 @@ 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 !config_path.exists() {
-            fs::create_dir_all(config_dir)?;
+        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)?;
@@ -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,10 +67,11 @@ 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 !config_path.exists() {
-            fs::create_dir_all(config_dir)?;
+        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
@@ -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()),
+        }
    }
 }
@@ -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,
 }
@@ -24,6 +24,10 @@ impl Request {
        Request::new("ping", vec![])
    }

+    pub fn kill() -> Self {
+        Request::new("kill", vec![])
+    }
+
    pub fn pause(id: Option<u32>) -> Self {
        let mut args = vec![];
        let id_str;
@@ -78,8 +82,14 @@ impl Request {
        Request::new("is_paused", vec![])
    }

-    pub fn get_volume() -> Self {
-        Request::new("get_volume", vec![])
+    pub fn get_volume(id: Option<u32>) -> Self {
+        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 {
@@ -7,13 +7,14 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {

    match request.name.as_str() {
        "ping" => Some(Box::new(PingCommand {})),
+        "kill" => Some(Box::new(KillCommand {})),
        "pause" => Some(Box::new(PauseCommand { id })),
        "resume" => Some(Box::new(ResumeCommand { id })),
        "toggle_pause" => Some(Box::new(TogglePauseCommand { id })),
        "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
@@ -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 Ok(());
+        return Err(
+            "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 Ok(());
+        return Err("Could not find pwsp-virtual-mic device, skipping device linking".into());
    }

    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(())
 }
@@ -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();
-                guard.all_inputs = full_state.all_inputs;
+
+                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;
            }

@@ -57,17 +57,19 @@ 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();
-            let port_id = props.get("port.id").unwrap().parse::<u32>().unwrap();
-            let port_name = props.get("port.name").unwrap();
+            if let (Some(node_id), Some(port_id), Some(port_name)) = (
+                props.get("node.id").and_then(|id| id.parse::<u32>().ok()),
+                props.get("port.id").and_then(|id| id.parse::<u32>().ok()),
+                props.get("port.name"),
+            ) {
+                let port = Port {
+                    node_id,
+                    port_id,
+                    name: port_name.to_string(),
+                };

-            let port = Port {
-                node_id,
-                port_id,
-                name: port_name.to_string(),
-            };
-
-            return (None, Some(port));
+                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) {
-                        let input_device = input_devices.get_mut(&node_id).unwrap();
+                    if let Some(input_device) = input_devices.get_mut(&node_id) {
                        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) {
-                        let output_device = output_devices.get_mut(&node_id).unwrap();
+                    } else if let Some(output_device) = output_devices.get_mut(&node_id) {
                        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?;
-    input_devices.extend(output_devices);
+    let (input_devices, output_devices) = get_all_devices().await?;

-    for device in input_devices {
-        if device.name == device_name
-            || device.nick == device_name
-            || device.name.contains(device_name)
-            || device.nick.contains(device_name)
-        {
-            return Ok(device);
-        }
-    }
-
-    Err("Device not found".into())
+    input_devices
+        .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)
+        })
+        .ok_or_else(|| "Device not found".into())
 }

 pub fn create_virtual_mic() -> Result<pipewire::channel::Sender<Terminate>, Box<dyn Error>> {
@@ -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();
+}
Author	SHA1	Message	Date
Tarasov Aleksandr	b2b83f5c32	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>	2026-03-27 15:46:06 +03:00
Tarasov Aleksandr	f01a0e656c	Fix daemon autostart issue caused by sync pipewire retry loop (#43 ) 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>	2026-03-22 17:05:26 +03:00
Tarasov Aleksandr	6114b9a7f8	🔒 [security] Set restricted permissions on socket and runtime directory (#40 ) Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-21 21:03:48 +03:00
Tarasov Aleksandr	b8baeb6226	refactor: replace contains_key/unwrap with if let Some in pipewire.rs (#39 ) This commit replaces two instances of `contains_key` followed by `get_mut().unwrap()` with the more idiomatic `if let Some(...)` pattern in `src/utils/pipewire.rs`. This reduces redundant hash map lookups and eliminates potential panics from `unwrap()`. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-21 21:03:30 +03:00
Tarasov Aleksandr	02306b5893	refactor: simplify file and directory navigation logic (#37 ) Refactored the navigation logic in `src/gui/input.rs` to use idiomatic Rust patterns. Replaced clunky manual index calculations and type casting with `match` expressions and modular arithmetic on `usize`. This improvement enhances readability and maintainability by eliminating nested `if/else` blocks and potential overflow issues from integer casts. 🎯 What: The code health issue addressed - Refactored directory and file navigation logic to use `usize` and modular arithmetic. - Replaced manual wrap-around logic with idiomatic `match` expressions. 💡 Why: How this improves maintainability - Eliminates unnecessary and potentially risky type casting (e.g., `i8`, `i64`). - Reduces code nesting and complexity, making it easier to read and extend. - Standardizes the circular navigation pattern across the GUI. ✅ Verification: How you confirmed the change is safe - Manually reviewed and verified the logic for all key combinations (ArrowUp, ArrowDown, both, or none). - Confirmed correct behavior for both initial selection (None) and existing selection (Some) states. ✨ Result: The improvement achieved - Cleaner, more idiomatic Rust code for list navigation. - Reduced potential for index-related bugs. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 02:40:39 +03:00
Tarasov Aleksandr	3add499bd7	⚡ Optimize `get_device` with iterator chaining (#38 ) Replaces manual vector extension and linear search with an iterator chain. This avoids an unnecessary allocation and potential reallocation of the `input_devices` vector and allows for short-circuiting if the device is found early. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 02:40:25 +03:00
Tarasov Aleksandr	3c2e943e18	fix(security): eliminate TOCTOU vulnerability during socket removal (#36 ) Directly attempt to remove the daemon socket file and handle NotFound errors instead of checking for its existence first. This prevents a potential race condition where the file could be replaced between the check and the removal. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 02:13:19 +03:00
Tarasov Aleksandr	261f83efd4	🧹 Code Health: Handle AudioPlayer initialization errors safely (#35 ) * 🧹 Refactor: Replace unsafe unwrap in get_audio_player Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * 🧹 Refactor: Replace unsafe unwrap in get_audio_player Resolved GitHub CI failure where a syntax error was introduced due to a bad automated merge with main. Rebased cleanly to ensure only the get_audio_player code health changes are included. Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * Delete tests/perf_play.rs --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 01:36:25 +03:00
Tarasov Aleksandr	c6577cd5e0	🧹 Replace unsafe unwrap on Mutex lock with unwrap_or_else (#33 ) Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:43:36 +03:00
Tarasov Aleksandr	95761f6a5a	⚡ Optimize `AudioPlayer::play` by offloading sync file I/O to spawn_blocking (#29 ) * perf(audio_player): offload synchronous I/O and decoder init to spawn_blocking Moved synchronous file system operations (`fs::File::open` and `file_path.exists()`) and CPU-bound decoder initialization (`Decoder::try_from`) inside the async `AudioPlayer::play` method to `tokio::task::spawn_blocking`. This prevents starving the Tokio worker threads during disk operations and significantly reduces event loop latency. Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * perf(audio_player): offload synchronous I/O and decoder init to spawn_blocking Moved synchronous file system operations (`fs::File::open` and `file_path.exists()`) and CPU-bound decoder initialization (`Decoder::try_from`) inside the async `AudioPlayer::play` method to `tokio::task::spawn_blocking`. This prevents starving the Tokio worker threads during disk operations and significantly reduces event loop latency. Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:41:34 +03:00
Tarasov Aleksandr	d6effc972e	🧹 refactor: replace unsafe unwraps in pipewire port parsing with safe destructuring (#34 ) Replaced sequential unwraps on pipewire properties ("node.id", "port.id", "port.name") with an `if let` and `and_then()` pattern in `src/utils/pipewire.rs`. This provides safety against daemon crashes when properties are missing or malformed by silently returning instead of panicking. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:41:06 +03:00
Tarasov Aleksandr	498d0d25af	perf: optimize `AudioPlayer::update` to avoid blocking the Tokio executor thread (#32 ) Offload synchronous `fs::File::open` and `Decoder::try_from` operations to `tokio::task::spawn_blocking` in `AudioPlayer::update`. This allows the Tokio runtime to process other asynchronous tasks concurrently without being blocked by file I/O operations and audio header decoding during looped playback. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:36:08 +03:00
Tarasov Aleksandr	c99d0749e3	🔒 Add request size limit to daemon socket IPC to prevent OOM panic (#31 ) The daemon was allocating memory based on an unverified length prefix sent over the unauthenticated Unix socket, potentially allowing a malicious client to cause an Out-Of-Memory panic (DoS). A 10 MB size limit has been introduced. Note: The previously reported `unwrap()` panic on invalid JSON payloads was already fixed and replaced with a safe `match` block in a prior commit. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:34:50 +03:00
Tarasov Aleksandr	151f43f1ab	Optimize value lookup in GetFullStateCommand loop (#30 ) Moves the check `if let Some(current_input_name) = &audio_player.input_device_name` outside the loop over `input_devices` in `GetFullStateCommand::execute`. By creating two separate loops (one for when an input device name is selected, and one for when it is not), we eliminate the overhead of evaluating the `Option` on every single iteration of the `input_devices` array. This effectively unswitches the loop and avoids repeatedly accessing the `audio_player` struct field. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:32:42 +03:00
Tarasov Aleksandr	077518019f	perf: cache and sort microphone inputs once instead of every frame (#27 ) In `draw_footer`, the `all_inputs` HashMap was being collected into a Vec and sorted on every single UI frame (~60 FPS). This caused unnecessary overhead and allocations. This commit introduces a cached `all_inputs_sorted` vector in the `AudioPlayerState` which is populated only when the inputs map changes during the state sync. `draw_footer` now loops over this pre-sorted vector directly. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:28:45 +03:00
Tarasov Aleksandr	968eba80e6	Fix: Prevent panic on invalid configuration files (#26 ) When the user's daemon.json or gui.json configuration files become corrupted or invalid (e.g. invalid JSON), the application panics as the load_from_file function previously bubbled up the error causing a panic. This fix modifies load_from_file for both DaemonConfig and GuiConfig to catch JSON parsing errors using a match statement and return a Default configuration instead. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:28:09 +03:00
Tarasov Aleksandr	aa77a8d212	refactor: replace unsafe `unwrap` with `if let` in config saving (#24 ) Removed the unsafe `.unwrap()` call when attempting to get the parent directory of `config_path` in `DaemonConfig::save_to_file` and `GuiConfig::save_to_file`. Replaced it with an idiomatic `if let Some(config_dir)` check to improve code safety and maintainability. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:26:45 +03:00
Tarasov Aleksandr	4b50645c93	refactor(gui): replace unsafe unwrap on gui thread lock (#23 ) Replaces `audio_player_state_shared.lock().unwrap()` with `.unwrap_or_else(\|e\| e.into_inner())` in `src/utils/gui.rs` to allow safe recovery from poisoned locks and avoid application panics. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:25:42 +03:00
Tarasov Aleksandr	39648f7781	refactor(gui): replace unsafe unwrap with idiomatic `if let Some` in input handling (#22 ) This commit addresses a code health issue in `src/gui/input.rs` where an `.is_some()` check was followed by an unsafe `.unwrap()` on `self.app_state.selected_file`. The logic has been updated to use the idiomatic `if let Some(path) = self.app_state.selected_file.clone()` pattern. The `.clone()` is necessary because the subsequent methods (`self.play_file` and `self.stop`) require a mutable borrow (`&mut self`), which would conflict with an immutable borrow of `self.app_state.selected_file`. This change ensures the code is safe and panic-free while satisfying Rust's borrow checker rules. Behavior remains unchanged. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-08 00:24:25 +03:00
Tarasov Aleksandr	c649ef5410	merge dev (#21 ) * change version to 1.6.2 * deps: bump tokio to 1.50.0 * deps: bump rodio to 0.22.2 * cargo update	2026-03-07 15:34:19 +03:00
Tarasov Aleksandr	0dfd841e6d	change version to 1.6.2 (#20 )	2026-03-07 15:28:10 +03:00
Tarasov Aleksandr	89ce111542	🔒 [security fix] Handle serialization failures in daemon commands and socket communication. (#16 ) - Replaced `.unwrap()` with proper error handling during JSON serialization in `GetStateCommand`, `GetTracksCommand`, and `GetFullStateCommand`. - Added error handling for malformed client requests in the daemon's main loop. - Ensured the daemon stays running even if serialization or deserialization fails. - Handled potential errors from `get_all_devices()`. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-06 23:02:07 +03:00
Tarasov Aleksandr	80a8b1a45f	perf: optimize value lookup in loop in GetFullStateCommand::execute (#18 ) Moved the access of `audio_player.input_device_name` outside the loop in `GetFullStateCommand::execute` to avoid repeated field access and Option checking during iteration. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>	2026-03-06 23:00:56 +03:00
Tarasov Aleksandr	f5c7d9bb2c	Merge pull request #19 from arabianq/fix-unsafe-unwrap-on-file-path-conversion-in-cli-6901726970689342812 🧹 Fix unsafe unwrap on file path conversion in CLI and GUI	2026-03-06 22:59:13 +03:00
Tarasov Aleksandr	bcd39eb6a2	Merge pull request #17 from arabianq/fix/github-actions-8199872172158141449 chore: consolidate and optimize github actions workflows	2026-03-06 22:56:37 +03:00
google-labs-jules[bot]	47a7674c14	🧹 Fix unsafe unwrap on file path conversion in CLI and GUI Replaced `.to_str().unwrap()` with `.to_string_lossy()` when converting `PathBuf` to `String` to prevent potential crashes if the path contains invalid Unicode. This change improves the robustness of both the CLI and GUI components when handling file paths. - Modified `src/bin/cli.rs` to safely handle `file_path`. - Modified `src/gui/mod.rs` to safely handle `path` in `play_file`. Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com>	2026-03-06 19:52:30 +00:00
google-labs-jules[bot]	d33ee0c69e	chore: consolidate and optimize github actions workflows Replaced 6 separate, redundant workflow files (`git-archive.yml`, `git-deb.yml`, `git-flatpak.yml`, `release-archive.yml`, `release-deb.yml`, `release-flatpak.yml`) with 2 consolidated workflows (`build.yml` and `release.yml`). - Consolidated `.zip` and `.deb` building into a single `linux-build` and `linux-release` job to avoid running `cargo build --release` multiple times. - Added parallel `flatpak-build` and `flatpak-release` jobs to the respective unified workflows. - Improved `release.yml` with a `prepare` job that correctly queries and passes the release tag to dependent build jobs. - Fixed an issue in the `prepare` job where an undefined bash `$GITHUB_TOKEN` was used instead of `${{ secrets.GITHUB_TOKEN }}`. Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com>	2026-03-06 19:43:38 +00:00
arabianq	624310eae5	feat: convert aur submodules to regular directories	2026-03-06 22:27:02 +03:00
arabianq	92a576de37	fix(pwsp-daemon): added retries to link_player_to_virtual_mic() https://github.com/arabianq/pipewire-soundpad/issues/15	2026-03-06 15:19:06 +03:00
arabianq	ce948ce678	feat: you can now get volume for all sound individually, not only via fullstate	2026-02-25 00:34:05 +03:00
arabianq	e72fc519a0	Merge branch 'main' of github.com:arabianq/pipewire-soundpad	2026-02-25 00:13:49 +03:00
arabianq	8126efe8d9	feat(pwsp-gui): slash now toggles search focus	2026-02-25 00:12:50 +03:00
arabianq	a7dd0b97d1	fix(pwsp-gui): some hotkeys now won't work when search entry is focused	2026-02-25 00:10:55 +03:00
arabianq	5f9aad7fa2	fix(pwsp-gui): some hotkeys now won't work when search entry is focused	2026-02-25 00:09:39 +03:00
arabianq	7e66a9241b	change version to 1.6.1	2026-02-23 14:01:40 +03:00
arabianq	02ad7337a1	cargo update	2026-02-23 13:59:42 +03:00
arabianq	c08898e4f2	deps: bump rodio to 0.22.1	2026-02-23 13:58:08 +03:00
arabianq	ed8b04caa9	deps: bump clap to 4.5.60	2026-02-23 13:53:13 +03:00
arabianq	58e5f039be	feat(cli, flatpak): implemented kill action for pwsp-cli. use it instead of pkill in the flatpak wrapper	2026-02-23 13:40:41 +03:00
arabianq	eb89733715	fix(flatpak): typo in wrapper	2026-02-23 13:17:26 +03:00
arabianq	476fd325ef	fix(flatpak): use pkill -f instead of killall	2026-02-23 12:55:16 +03:00
arabianq	da49c96e53	fix(flatpak): removed color option from wrapper	2026-02-23 12:44:17 +03:00
arabianq	f0e05379f7	fix(flatpak): removed suggest_on_error from wrapper	2026-02-23 12:30:22 +03:00
arabianq	3d3523fd7a	feat(flatpak): new wrapper in python that supports pwsp-daemon, pwsp-cli and pwsp-gui	2026-02-23 12:08:47 +03:00