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
change version to 1.6.2 (#20 )
2026-04-28 14:31:23 +00:00 · 2026-03-07 15:34:19 +03:00 · 2026-03-07 15:28:10 +03:00 · 2026-03-06 23:02:07 +03:00 · 2026-03-06 23:00:56 +03:00 · 2026-03-06 22:59:13 +03:00
33 changed files with 2091 additions and 481 deletions
@@ -0,0 +1 @@
+custom: ['https://boosty.to/arabian']
@@ -0,0 +1,119 @@
+name: Build
+
+permissions:
+  contents: write
+  packages: write
+
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+  workflow_dispatch:
+
+jobs:
+  linux-build:
+    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: Extract all binary names
+        id: cargo-meta
+        run: |
+          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
+
+      - name: Build all release binaries
+        run: cargo build --release --locked
+
+      - name: Package all binaries into one archive
+        shell: bash
+        run: |
+          set -euo pipefail
+          COMMIT_SHA="${{ github.sha }}"
+          ARCHIVE_NAME="pwsp-${COMMIT_SHA}-linux-x64.zip"
+          echo "Creating archive: $ARCHIVE_NAME"
+
+          FILES=()
+          while IFS= read -r BIN; do
+            [ -z "$BIN" ] && continue
+            FILES+=("target/release/$BIN")
+          done <<< "${{ steps.cargo-meta.outputs.bin_names }}"
+
+          if [ "${#FILES[@]}" -eq 0 ]; then
+            echo "Error: no binaries were discovered via cargo metadata." >&2
+            exit 1
+          fi
+
+          for f in "${FILES[@]}"; do
+            if [ ! -f "$f" ]; then
+              echo "Error: expected binary not found: $f" >&2
+              exit 1
+            fi
+            echo "Will add: $f"
+          done
+
+          zip -j "$ARCHIVE_NAME" "${FILES[@]}"
+
+      - name: Upload archive as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          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: 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,4 +1,4 @@
-name: Release archive
+name: Release

 permissions:
  contents: write
@@ -10,29 +10,20 @@ on:
  workflow_dispatch:
    inputs:
      tag:
-        description: 'Tag to attach assets to (e.g. v1.0.0)'
+        description: "Tag to attach assets to (e.g. v1.0.0)"
        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: |
          set -euo pipefail

-          # приоритет 1: входной параметр workflow_dispatch
          INPUT_TAG="${{ github.event.inputs.tag || '' }}"
          if [ -n "$INPUT_TAG" ]; then
            echo "Using input tag: $INPUT_TAG"
@@ -40,7 +31,6 @@ jobs:
            exit 0
          fi

-          # приоритет 2: если запущено событием release
          EVENT_TAG="${{ github.event.release.tag_name || '' }}"
          if [ -n "$EVENT_TAG" ]; then
            echo "Using event tag: $EVENT_TAG"
@@ -48,16 +38,14 @@ jobs:
            exit 0
          fi

-          # приоритет 3: если GITHUB_REF — refs/tags/...
          if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
            echo "Using GITHUB_REF tag: ${BASH_REMATCH[1]}"
            echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
            exit 0
          fi

-          # приоритет 4: пробуем получить последний релиз через API
          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"
@@ -74,10 +62,24 @@ 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
@@ -91,7 +93,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
@@ -103,11 +104,10 @@ 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"

-          # читаем построчно список бинарников и формируем массив файлов
          FILES=()
          while IFS= read -r BIN; do
            [ -z "$BIN" ] && continue
@@ -119,7 +119,6 @@ jobs:
            exit 1
          fi

-          # проверим, что все бинарники действительно есть
          for f in "${FILES[@]}"; do
            if [ ! -f "$f" ]; then
              echo "Error: expected binary not found: $f" >&2
@@ -128,13 +127,57 @@ jobs:
            echo "Will add: $f"
          done

-          # создаём архив с бинарниками внутри как просто pwsp-gui, pwsp-daemon, pwsp-cli
          zip -j "$ARCHIVE_NAME" "${FILES[@]}"

      - name: Upload release archive
        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: bilelmoussaoui/flatpak-github-actions:freedesktop-24.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,6 +1,6 @@
 [package]
 name = "pwsp"
-version = "1.5.0"
+version = "1.6.2"
 edition = "2024"
 authors = ["arabian"]
 description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
@@ -12,22 +12,43 @@ 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.55", default-features = false, features = ["std", "suggestions", "help", "usage", "error-context", "derive"] }
+clap = { version = "4.5.60", default-features = false, features = [
+    "std",
+    "suggestions",
+    "help",
+    "usage",
+    "error-context",
+    "derive",
+] }
 dirs = "6.0.0"
 itertools = "0.14.0"

-rodio = { version = "0.21.1", default-features = false, features = ["symphonia-all", "playback"] }
+rodio = { version = "0.22.2", default-features = false, features = [
+    "symphonia-all",
+    "playback",
+] }
 pipewire = "0.9.2"
-rfd = { version = "0.17.2", default-features = false, features = ["xdg-portal"]}
+rfd = { version = "0.17.2", default-features = false, features = [
+    "xdg-portal",
+] }
+opener = { version = "0.8.4", features = ["reveal"] }

-egui = { version = "0.33.3", default-features = false, features = ["default_fonts", "rayon"] }
-eframe = { version = "0.33.3", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] }
+egui = { version = "0.33.3", default-features = false, features = [
+    "default_fonts",
+    "rayon",
+] }
+eframe = { version = "0.33.3", default-features = false, features = [
+    "default_fonts",
+    "glow",
+    "x11",
+    "wayland",
+] }
 egui_material_icons = "0.5.0"
 egui_dnd = "0.14.0"

@@ -52,10 +73,34 @@ panic = "abort"

 [package.metadata.deb]
 assets = [
-    ["target/release/pwsp-daemon", "usr/bin/", "755"],
-    ["target/release/pwsp-cli", "usr/bin/", "755"],
-    ["target/release/pwsp-gui", "usr/bin/", "755"],
-    ["assets/pwsp-gui.desktop", "usr/share/applications/pwsp.desktop", "644"],
-    ["assets/icon.png", "usr/share/icons/hicolor/256x256/apps/pwsp.png", "644"],
-    ["assets/pwsp-daemon.service", "usr/lib/systemd/user/pwsp-daemon.service", "644"],
+    [
+        "target/release/pwsp-daemon",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "target/release/pwsp-cli",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "target/release/pwsp-gui",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "assets/pwsp-gui.desktop",
+        "usr/share/applications/pwsp.desktop",
+        "644",
+    ],
+    [
+        "assets/icon.png",
+        "usr/share/icons/hicolor/256x256/apps/pwsp.png",
+        "644",
+    ],
+    [
+        "assets/pwsp-daemon.service",
+        "usr/lib/systemd/user/pwsp-daemon.service",
+        "644",
+    ],
 ]
@@ -76,7 +76,7 @@ sudo dnf install pwsp
 There is pwsp package in AUR.
 You can install it using yay, paru or any other AUR helper.
 ```bash
-paru pwsp
+paru pwsp-bin # or paru pwsp to build it locally
 ```

 ## **Installing using cargo**
@@ -208,3 +208,6 @@ a [pull request](https://github.com/arabianq/pipewire-soundpad/pulls).

 This project is licensed under
 the [MIT License](https://github.com/arabianq/pipewire-soundpad/blob/main/LICENSE).
+
+# **🤖 AI Wiki**
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/arabianq/pipewire-soundpad)
@@ -0,0 +1,17 @@
+pkgbase = pwsp-bin
+pkgdesc = Lets you play audio files through your microphone (Pre-built binaries)
+pkgver = 1.6.2
+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.2.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.6.2/pwsp-v1.6.2-linux-x64.zip
+source = pipewire-soundpad-1.6.2.tar.gz :: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.6.2.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.2
+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.2
+	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.2.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.2
+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"])
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=PWSP (Soundpad)
+Comment=Let's you play audio files through you microphone
+Exec=pwsp-wrapper.py %u
+Icon=ru.arabianq.pwsp
+Terminal=false
+Type=Application
+Categories=Audio;Utility;
+Keywords=soundpad;pipewire;audio;
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>ru.arabianq.pwsp</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>MIT</project_license>
+    <name>PWSP</name>
+    <summary>Play audio files through your microphone using PipeWire</summary>
+    <description>
+        <p>
+            PWSP (PipeWire Soundpad) is a tool that allows you to play audio files through your
+            microphone.
+            It features both a graphical user interface and a command-line interface.
+        </p>
+    </description>
+    <launchable type="desktop-id">ru.arabianq.pwsp.desktop</launchable>
+    <screenshots>
+        <screenshot type="default">
+            <image>
+                https://raw.githubusercontent.com/arabianq/pipewire-soundpad/master/assets/screenshot.png</image>
+        </screenshot>
+    </screenshots>
+    <url type="homepage">https://pwsp.arabianq.ru</url>
+    <developer_name>arabian</developer_name>
+    <content_rating type="oars-1.1" />
+</component>
@@ -0,0 +1,47 @@
+app-id: ru.arabianq.pwsp
+runtime: org.freedesktop.Platform
+runtime-version: "24.08"
+sdk: org.freedesktop.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.rust-stable
+  - org.freedesktop.Sdk.Extension.llvm20
+command: pwsp-wrapper.py
+finish-args:
+  - --share=ipc
+  - --socket=fallback-x11
+  - --socket=wayland
+  - --socket=pulseaudio
+  - --filesystem=xdg-run/pipewire-0
+  - --filesystem=xdg-run/pwsp:create
+  - --filesystem=xdg-run/app/ru.arabianq.pwsp:create
+  - --filesystem=host
+  - --device=all
+  - --device=dri
+  - --share=network
+  - --talk-name=org.freedesktop.portal.Desktop
+  - --talk-name=org.freedesktop.portal.Documents
+
+build-options:
+  append-path: /usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm20/bin
+  env:
+    CARGO_HOME: /run/build/pwsp/cargo
+    LIBCLANG_PATH: /usr/lib/sdk/llvm20/lib
+
+modules:
+  - name: pwsp
+    buildsystem: simple
+    build-options:
+      build-args:
+        - --share=network
+    build-commands:
+      - cargo build --release
+      - 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.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
+    sources:
+      - type: dir
+        path: ../../
@@ -4,7 +4,7 @@
 %global cargo_install_lib 0

 Name:            pwsp
-Version:         1.5.0
+Version:         1.6.2
 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)]
@@ -92,6 +97,8 @@ enum GetCommands {
    Input,
    /// All audio inputs
    Inputs,
+    /// Version of the daemon
+    DaemonVersion,
    /// Full player state
    FullState,
 }
@@ -129,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),
@@ -136,18 +144,19 @@ 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(),
            GetCommands::Tracks => Request::get_tracks(),
            GetCommands::Input => Request::get_input(),
            GetCommands::Inputs => Request::get_inputs(),
+            GetCommands::DaemonVersion => Request::get_daemon_version(),
            GetCommands::FullState => Request::get_full_state(),
        },
        Commands::Set { parameter } => match parameter {
@@ -27,6 +27,16 @@ async fn main() -> Result<(), Box<dyn Error>> {
    get_daemon_config(); // Initialize daemon config
    create_virtual_mic()?;
    get_audio_player().await; // Initialize audio player
+
+    let max_retries = 5;
+    for i in 0..=max_retries {
+        match link_player_to_virtual_mic().await {
+            Ok(_) => break,
+            Err(e) => println!("{e}\t{i}/{max_retries}"),
+        }
+
+        sleep(Duration::from_millis(300 * i)).await;
+    }
    link_player_to_virtual_mic().await?;

    let runtime_dir = get_runtime_dir();
@@ -85,7 +95,21 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
                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 +123,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,6 +141,10 @@ 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);
+            }
        });
    }
 }
@@ -4,13 +4,11 @@ use egui::{
    Layout, RichText, ScrollArea, Sense, Slider, TextEdit, Ui, Vec2,
 };
 use egui_dnd::dnd;
-use egui_material_icons::icons;
-use pwsp::types::audio_player::TrackInfo;
+use egui_material_icons::icons::*;
+use pwsp::types::{audio_player::TrackInfo, gui::AppState};
 use pwsp::utils::gui::format_time_pair;
 use std::{error::Error, time::Instant};

-use pwsp::types::gui::AppState;
-
 enum TrackAction {
    Pause(u32),
    Resume(u32),
@@ -21,13 +19,13 @@ enum TrackAction {
 impl SoundpadGui {
    fn get_volume_icon(volume: f32) -> &'static str {
        if volume > 0.7 {
-            icons::ICON_VOLUME_UP
+            ICON_VOLUME_UP
        } else if volume <= 0.0 {
-            icons::ICON_VOLUME_OFF
+            ICON_VOLUME_OFF
        } else if volume < 0.3 {
-            icons::ICON_VOLUME_MUTE
+            ICON_VOLUME_MUTE
        } else {
-            icons::ICON_VOLUME_DOWN
+            ICON_VOLUME_DOWN
        }
    }

@@ -46,7 +44,7 @@ impl SoundpadGui {
            ui.spacing_mut().item_spacing.y = 5.0;
            // --------- Back Button and Title ----------
            ui.horizontal_top(|ui| {
-                let back_button = Button::new(icons::ICON_ARROW_BACK).frame(false);
+                let back_button = Button::new(ICON_ARROW_BACK).frame(false);
                let back_button_response = ui.add(back_button);
                if back_button_response.clicked() {
                    self.app_state.show_settings = false;
@@ -83,6 +81,10 @@ impl SoundpadGui {
                self.config.save_to_file().ok();
            }
            // --------------------------------
+
+            ui.with_layout(Layout::bottom_up(Align::Min), |ui| {
+                ui.label(format!("GUI version: {}", env!("CARGO_PKG_VERSION")));
+            });
        });
    }

@@ -169,9 +171,9 @@ impl SoundpadGui {
        ui.horizontal_top(|ui| {
            // ---------- Play Button ----------
            let play_button = Button::new(if track.paused {
-                icons::ICON_PLAY_ARROW
+                ICON_PLAY_ARROW
            } else {
-                icons::ICON_PAUSE
+                ICON_PAUSE
            })
            .corner_radius(15.0);

@@ -188,9 +190,9 @@ impl SoundpadGui {
            // ---------- Loop Button ----------
            let loop_button = Button::new(
                RichText::new(if track.looped {
-                    icons::ICON_REPEAT_ONE
+                    ICON_REPEAT_ONE
                } else {
-                    icons::ICON_REPEAT
+                    ICON_REPEAT
                })
                .size(18.0),
            )
@@ -248,7 +250,7 @@ impl SoundpadGui {
            // --------------------------------

            // ---------- Stop Button ---------
-            let stop_button = Button::new(icons::ICON_CLOSE).frame(false);
+            let stop_button = Button::new(ICON_CLOSE).frame(false);
            let stop_button_response = ui.add_sized([30.0, 30.0], stop_button);
            if stop_button_response.clicked() {
                action = Some(TrackAction::Stop(track.id));
@@ -311,7 +313,7 @@ impl SoundpadGui {
                    let path = item.clone();
                    ui.horizontal(|ui| {
                        handle.ui(ui, |ui| {
-                            ui.label(icons::ICON_DRAG_INDICATOR);
+                            ui.label(ICON_DRAG_INDICATOR);
                        });
                        let name = path
                            .file_name()
@@ -333,18 +335,46 @@ impl SoundpadGui {
                            self.open_dir(&path);
                        }

-                        let delete_dir_button = Button::new(icons::ICON_DELETE).frame(false);
+                        let delete_dir_button = Button::new(ICON_DELETE).frame(false);
                        let delete_dir_button_response =
                            ui.add_sized([18.0, 18.0], delete_dir_button);
                        if delete_dir_button_response.clicked() {
-                            self.remove_dir(&path.clone());
+                            self.app_state.dirs_to_remove.insert(path.clone());
                        }
+
+                        // Context menu
+                        dir_button_response.context_menu(|ui| {
+                            if ui
+                                .button(format!("{} {}", ICON_OPEN_IN_NEW, "Show"))
+                                .clicked()
+                            {
+                                self.open_dir(&path);
+                            }
+
+                            if ui
+                                .button(format!(
+                                    "{} {}",
+                                    ICON_OPEN_IN_BROWSER, "Open in File Manager"
+                                ))
+                                .clicked()
+                            {
+                                if let Err(e) = opener::open(&path) {
+                                    eprintln!("Failed to open file manager: {}", e);
+                                }
+                            }
+
+                            ui.separator();
+
+                            if ui.button(format!("{} {}", ICON_DELETE, "Remove")).clicked() {
+                                self.app_state.dirs_to_remove.insert(path.clone());
+                            }
+                        });
                    });
                });
                self.app_state.dirs = dirs;

                ui.horizontal(|ui| {
-                    let add_dirs_button = Button::new(icons::ICON_ADD).frame(false);
+                    let add_dirs_button = Button::new(ICON_ADD).frame(false);
                    let add_dirs_button_response = ui.add_sized([18.0, 18.0], add_dirs_button);
                    if add_dirs_button_response.clicked() {
                        self.add_dirs();
@@ -416,8 +446,48 @@ impl SoundpadGui {
                                    self.play_file(&entry_path, false);
                                }
                            });
-                            self.app_state.selected_file = Some(entry_path);
+                            self.app_state.selected_file = Some(entry_path.clone());
                        }
+
+                        // Context menu
+                        file_button_response.context_menu(|ui| {
+                            if ui
+                                .button(format!("{} {}", ICON_BOLT, "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() {
+                                self.play_file(&entry_path, true);
+                                self.app_state.selected_file = Some(entry_path.clone());
+                            }
+
+                            if ui
+                                .button(format!("{} {}", ICON_SWAP_HORIZ, "Replace Last"))
+                                .clicked()
+                                && let Some(last_track) = self.audio_player_state.tracks.last()
+                            {
+                                self.stop(Some(last_track.id));
+                                self.play_file(&entry_path, true);
+                                self.app_state.selected_file = Some(entry_path.clone());
+                            }
+
+                            ui.separator();
+
+                            if ui
+                                .button(format!(
+                                    "{} {}",
+                                    ICON_OPEN_IN_BROWSER, "Show in File Manager"
+                                ))
+                                .clicked()
+                            {
+                                if let Err(e) = opener::reveal(&entry_path) {
+                                    eprintln!("Failed to open file manager: {}", e);
+                                }
+                            }
+                        });
                    }
                });
            });
@@ -486,7 +556,7 @@ impl SoundpadGui {

            // ---------- Settings button ----------
            let settings_button =
-                Button::new(icons::ICON_SETTINGS.atom_size(Vec2::new(18.0, 18.0))).frame(false);
+                Button::new(ICON_SETTINGS.atom_size(Vec2::new(18.0, 18.0))).frame(false);
            let settings_button_response = ui.add_sized([18.0, 18.0], settings_button);
            if settings_button_response.clicked() {
                self.app_state.show_settings = true;
@@ -1,5 +1,5 @@
 use crate::gui::SoundpadGui;
-use egui::{Context, Key, Modifiers};
+use egui::{Context, Id, Key, Modifiers};

 use std::path::PathBuf;

@@ -12,29 +12,49 @@ impl SoundpadGui {
        ctx.input(|i| i.modifiers)
    }

+    fn get_focused(&self, ctx: &Context) -> Option<Id> {
+        ctx.memory(|m| m.focused())
+    }
+
    pub fn handle_input(&mut self, ctx: &Context) {
        let modifiers = self.modifiers(ctx);
+        let search_focused = {
+            if let Some(focused_id) = self.get_focused(ctx)
+                && let Some(search_id) = self.app_state.search_field_id
+                && focused_id.eq(&search_id)
+            {
+                true
+            } else {
+                false
+            }
+        };

        // Open/close settings
-        if self.key_pressed(ctx, Key::I) {
+        if !search_focused && self.key_pressed(ctx, Key::I) {
            self.app_state.show_settings = !self.app_state.show_settings;
        }

        if !self.app_state.show_settings {
            // Pause / resume audio on space
-            if self.key_pressed(ctx, Key::Space) {
+            if !search_focused && self.key_pressed(ctx, Key::Space) {
                self.play_toggle();
            }

            // Stop all audio tracks on backspace
-            if self.key_pressed(ctx, Key::Backspace) {
+            if !search_focused && self.key_pressed(ctx, Key::Backspace) {
                self.stop(None);
            }

            // Focus search field
            if self.key_pressed(ctx, Key::Slash) {
+                if search_focused {
+                    ctx.memory_mut(|m| {
+                        m.request_focus(Id::NULL);
+                    });
+                } else {
                    self.app_state.force_focus_search = true;
                }
+            }

            // Play selected file on Enter
            if self.key_pressed(ctx, Key::Enter) && self.app_state.selected_file.is_some() {
@@ -96,30 +96,24 @@ impl SoundpadGui {
        }
    }

-    pub fn remove_dir(&mut self, path: &PathBuf) {
-        self.app_state.dirs.retain(|x| x != path);
-        if let Some(current_dir) = &self.app_state.current_dir
-            && current_dir == path
-        {
-            self.app_state.current_dir = None;
-            self.app_state.files.clear();
-        }
-        self.config.dirs = self.app_state.dirs.clone();
-        self.config.save_to_file().ok();
-    }
-
    pub fn open_dir(&mut self, path: &PathBuf) {
        self.app_state.current_dir = Some(path.clone());
-        self.app_state.files = path
-            .read_dir()
-            .unwrap()
+        match path.read_dir() {
+            Ok(read_dir) => {
+                self.app_state.files = read_dir
                    .filter_map(|res| res.ok())
                    .map(|entry| entry.path())
                    .collect();
            }
+            Err(e) => {
+                eprintln!("Failed to read directory {:?}: {}", path, e);
+                self.app_state.files.clear();
+            }
+        }
+    }

    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) {
@@ -9,6 +9,17 @@ use std::time::{Duration, Instant};

 impl App for SoundpadGui {
    fn update(&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);
+            if let Some(current_dir) = &self.app_state.current_dir
+                && current_dir == &path
+            {
+                self.app_state.current_dir = None;
+                self.app_state.files.clear();
+            }
+        }
+
        // Save directories if changed
        if !self.config.dirs.eq(&self.app_state.dirs) {
            self.config.dirs = self.app_state.dirs.clone();
@@ -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) {
@@ -282,7 +294,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();
@@ -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>,
@@ -82,6 +86,8 @@ pub struct ToggleLoopCommand {
    pub id: Option<u32>,
 }

+pub struct GetDaemonVersionCommand {}
+
 pub struct GetFullStateCommand {}

 #[async_trait]
@@ -91,6 +97,13 @@ 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 {
@@ -170,16 +183,24 @@ impl Executable for GetStateCommand {
    async fn execute(&self) -> Response {
        let audio_player = get_audio_player().await.lock().await;
        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;
+        let mut audio_player = get_audio_player().await.lock().await;
+        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")
+        }
    }
 }

@@ -254,7 +275,10 @@ impl Executable for GetTracksCommand {
    async fn execute(&self) -> Response {
        let audio_player = get_audio_player().await.lock().await;
        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)),
+        }
    }
 }

@@ -280,7 +304,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" {
@@ -347,21 +374,32 @@ impl Executable for ToggleLoopCommand {
    }
 }

+#[async_trait]
+impl Executable for GetDaemonVersionCommand {
+    async fn execute(&self) -> Response {
+        Response::new(true, env!("CARGO_PKG_VERSION"))
+    }
+}
+
 #[async_trait]
 impl Executable for GetFullStateCommand {
    async fn execute(&self) -> Response {
-        let (input_devices, _output_devices) = get_all_devices().await.unwrap();
+        let (input_devices, _output_devices) = match get_all_devices().await {
+            Ok(devices) => devices,
+            Err(err) => return Response::new(false, format!("Failed to get devices: {}", err)),
+        };
        let mut all_inputs = HashMap::new();
        let mut current_input_nick = String::new();

        let audio_player = get_audio_player().await.lock().await;
+        let current_input_name = audio_player.input_device_name.as_deref();
        for device in input_devices {
            if device.name == "pwsp-virtual-mic" {
                continue;
            }

-            if let Some(current_input_name) = &audio_player.input_device_name {
-                if device.name == *current_input_name {
+            if let Some(name) = current_input_name {
+                if device.name == name {
                    current_input_nick = format!("{} - {}", device.name, device.nick);
                }
            }
@@ -377,6 +415,9 @@ impl Executable for GetFullStateCommand {
            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)),
+        }
    }
 }
@@ -38,6 +38,7 @@ pub struct AppState {

    pub current_dir: Option<PathBuf>,
    pub dirs: Vec<PathBuf>,
+    pub dirs_to_remove: HashSet<PathBuf>,

    pub selected_file: Option<PathBuf>,
    pub files: HashSet<PathBuf>,
@@ -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 {
@@ -156,6 +166,10 @@ impl Request {
        Request::new("toggle_loop", args)
    }

+    pub fn get_daemon_version() -> Self {
+        Request::new("get_daemon_version", vec![])
+    }
+
    pub fn get_full_state() -> Self {
        Request::new("get_full_state", vec![])
    }
@@ -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
@@ -69,6 +70,7 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
            Some(Box::new(SetLoopCommand { enabled, id }))
        }
        "toggle_loop" => Some(Box::new(ToggleLoopCommand { id })),
+        "get_daemon_version" => Some(Box::new(GetDaemonVersionCommand {})),
        "get_full_state" => Some(Box::new(GetFullStateCommand {})),
        _ => None,
    }
@@ -36,19 +36,19 @@ pub fn get_daemon_config() -> DaemonConfig {

 pub async fn link_player_to_virtual_mic() -> Result<(), Box<dyn Error>> {
    let pwsp_daemon_output;
-    if let Ok(device) = get_device("alsa_playback.pwsp-daemon").await {
+    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
@@ -210,7 +210,11 @@ pub async fn get_device(device_name: &str) -> Result<AudioDevice, Box<dyn Error>
    input_devices.extend(output_devices);

    for device in input_devices {
-        if device.name == device_name {
+        if device.name == device_name
+            || device.nick == device_name
+            || device.name.contains(device_name)
+            || device.nick.contains(device_name)
+        {
            return Ok(device);
        }
    }
Author	SHA1	Message	Date
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
arabianq	81da36f03c	bump version to 1.6.0	2026-02-14 15:50:06 +03:00
arabianq	8bfa5daf78	feat: show pwsp-gui version in settings	2026-02-14 15:46:56 +03:00
arabianq	b816d2aa88	feat: get daemon's version using pwsp-cli pwsp-cli get daemon-version	2026-02-14 15:43:17 +03:00
arabianq	23ae562849	refactor: better Cargo.toml formatting	2026-02-14 15:20:03 +03:00
arabianq	e3bc1fd55f	deps: cargo update	2026-02-14 15:16:43 +03:00
arabianq	15964f205b	deps: bump clap version to 4.5.58	2026-02-14 15:15:36 +03:00
arabianq	6a0ac61033	refactor: removed icons:: everywhere	2026-02-14 15:14:03 +03:00
arabianq	4b802273f4	Merge branch 'main' of github.com:arabianq/pipewire-soundpad	2026-02-14 15:09:25 +03:00
arabianq	baae7a1ccf	feat: you can now open dirs/files in system's file manager using context menus	2026-02-14 15:09:05 +03:00
arabianq	654694cecf	feat: dirs and files now support context menu (right mouse button)	2026-02-14 14:58:47 +03:00
Tarasov Aleksandr	04ecf66beb	Add custom funding link to FUNDING.yml	2026-02-08 21:55:40 +03:00
Tarasov Aleksandr	0fe94f9112	Update README.md add deepwiki.com badge	2026-02-03 04:33:04 +03:00
arabianq	9fbe42c201	update version to 1.5.1	2026-01-28 23:34:12 +03:00
arabianq	fac04c4533	docs: update AUR installation command to include binary option	2026-01-28 23:32:09 +03:00
arabianq	f93852bf8e	add submodules for aur/standart and aur/bin	2026-01-28 23:31:15 +03:00
arabianq	1bb0aa959a	rename workflow from Flatpak CI to Git Flatpak	2026-01-28 22:56:47 +03:00
arabianq	7a1723fbcb	fix: enable build-bundle option in Flatpak workflows and adjust source path	2026-01-28 22:50:15 +03:00
arabianq	712a0968a7	fix: remove unnecessary file sources from Flatpak manifest	2026-01-28 22:45:33 +03:00
arabianq	e98e6bc2f3	fix: remove submodule checkout option from Flatpak workflows	2026-01-28 22:41:40 +03:00
arabianq	5007b483aa	refactor	2026-01-28 22:38:10 +03:00
arabianq	b936b58e75	add Flatpak CI and release workflows, update paths in manifest	2026-01-28 22:37:36 +03:00
arabianq	502ef2ed89	create wrapper for flatpak, flatpak yaml, desktop entry and metainfo	2026-01-28 22:33:34 +03:00
arabianq	ce5910b9a6	fix: improve device lookup in get_device function and update daemon device name	2026-01-28 22:30:33 +03:00
arabianq	b0c670235e	fix: impossible to remove directories	2026-01-28 22:07:05 +03:00
arabianq	f1d4ffd7fa	fix: handle errors when opening a directory in SoundpadGui	2026-01-28 21:44:00 +03:00
arabianq	6f35ab7b8b	update github workflows	2026-01-28 21:20:56 +03:00
arabianq	9a67f5479a	add submodule for AUR package	2026-01-28 21:16:58 +03:00
arabianq	b727eba988	move pwsp.spec for rpm into packages/rpm directory	2026-01-28 21:15:37 +03:00