mirror of
https://github.com/arabianq/pipewire-soundpad.git
synced 2026-07-27 14:14:13 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1616d80ee9 | ||
|
|
d97d4c60d2 | ||
|
|
0c3d7cbd35 | ||
|
|
6d7abdbf53 | ||
|
|
41bb035b2c | ||
|
|
3873bf4270 | ||
|
|
2b60b47cce | ||
|
|
65ae8589db | ||
|
|
a33d023950 | ||
|
|
5c73bc1bea | ||
|
|
42e305869a | ||
|
|
cb7f4f7f6b | ||
|
|
62821904af | ||
|
|
3a218283db | ||
|
|
02fdfb6ca8 | ||
|
|
a027838d0e | ||
|
|
1828d903a1 | ||
|
|
83ca7a5e34 | ||
|
|
f2aca5e34a | ||
|
|
6130a99c4b | ||
|
|
322b93efa1 | ||
|
|
683f4127a0 | ||
|
|
c873166e21 | ||
|
|
ec4e873071 | ||
|
|
a91252d7fb | ||
|
|
239170df45 | ||
|
|
5fef42a2e2 | ||
|
|
4f8f663f12 | ||
|
|
6ccc55a1d0 | ||
|
|
d266a3f073 | ||
|
|
d2993592be | ||
|
|
1a53ab62dc | ||
|
|
51fcd94a61 | ||
|
|
7f6a122816 | ||
|
|
7ca01ed8cb | ||
|
|
07321afb60 | ||
|
|
8534e516ad | ||
|
|
16ce233f79 | ||
|
|
c2f4658871 | ||
|
|
701bdebc88 | ||
|
|
d4ae78c7b0 | ||
|
|
9e1d50e30c | ||
|
|
85b6c17bd1 | ||
|
|
cfe478b02d | ||
|
|
0b23b3ed51 | ||
|
|
728d14006c | ||
|
|
f8bb84bbcf | ||
|
|
0dbcc771f5 | ||
|
|
b3a786a76c | ||
|
|
972e303bff | ||
|
|
c406704ce5 | ||
|
|
fd4a35e0e1 | ||
|
|
c793d09006 | ||
|
|
e4dd6d8b56 | ||
|
|
457416779a | ||
|
|
b0ac5490cc | ||
|
|
a728671b01 | ||
|
|
08153e4a1c | ||
|
|
c4699002fd | ||
|
|
dbcbf36df0 | ||
|
|
873ed9a6db | ||
|
|
601a5ce336 | ||
|
|
62a851714e | ||
|
|
cc152de59f | ||
|
|
501ff9bd64 | ||
|
|
f83e18b800 | ||
|
|
ba920473c7 | ||
|
|
dfb5985e4a | ||
|
|
52dc0e3a09 | ||
|
|
4ce16d5301 | ||
|
|
48cda995ee | ||
|
|
7950f75c07 | ||
|
|
38ad8d5bc2 | ||
|
|
347dee713c | ||
|
|
e6e6293e20 | ||
|
|
a1e53aa536 | ||
|
|
bff50b99f1 | ||
|
|
09b86dc108 | ||
|
|
30070c439b | ||
|
|
44c3a5e3a7 | ||
|
|
9a0bc92222 | ||
|
|
3f85994f83 | ||
|
|
caf8ac19a1 | ||
|
|
f563680ceb | ||
|
|
78ca2ddf68 | ||
|
|
838fc1ce29 | ||
|
|
622cf39fa2 | ||
|
|
809b1a8490 | ||
|
|
d1a5275173 | ||
|
|
e67f174a59 | ||
|
|
6545431ac2 | ||
|
|
026ef97a72 | ||
|
|
9f833cc30b | ||
|
|
410a2c7959 | ||
|
|
c173e602ad | ||
|
|
3576c634fd | ||
|
|
5747f39ace | ||
|
|
c501033834 | ||
|
|
c0a27e0c3b | ||
|
|
3c2882ef1f | ||
|
|
36aed3f55d | ||
|
|
c48a425bb0 | ||
|
|
9a5436cd35 | ||
|
|
2ce243e896 | ||
|
|
57fb3fd7a3 | ||
|
|
82b02bf520 | ||
|
|
3d4dbbe866 | ||
|
|
70bd3a889a | ||
|
|
a7b5bdd2a9 | ||
|
|
99fef4a167 | ||
|
|
ae08f7ddc3 |
+1
-1
@@ -1 +1 @@
|
||||
custom: ['https://boosty.to/arabian']
|
||||
custom: ['https://dalink.to/arabianq', 'https://boosty.to/arabian', 'https://sponsr.ru/notultranx/']
|
||||
|
||||
@@ -1,6 +1,29 @@
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
|
||||
- package-ecosystem: "cargo"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
groups:
|
||||
egui-stack:
|
||||
patterns:
|
||||
- "egui*"
|
||||
- "eframe"
|
||||
|
||||
serde-stack:
|
||||
patterns:
|
||||
- "serde*"
|
||||
|
||||
tokio-stack:
|
||||
patterns:
|
||||
- "tokio*"
|
||||
- "reqwest"
|
||||
|
||||
clap-stack:
|
||||
patterns:
|
||||
- "clap*"
|
||||
|
||||
+129
-70
@@ -12,7 +12,7 @@ on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
linux-build:
|
||||
build-and-package:
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
@@ -33,29 +33,30 @@ jobs:
|
||||
libclang-dev \
|
||||
libasound2-dev \
|
||||
libdbus-1-dev \
|
||||
libssl-dev \
|
||||
pkg-config
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.96.0
|
||||
toolchain: stable
|
||||
cache: false
|
||||
|
||||
- name: Rust Cache
|
||||
uses: swatinem/rust-cache@v2
|
||||
with:
|
||||
prefix-key: "v3-${{ matrix.runner }}"
|
||||
|
||||
- name: Run tests
|
||||
run: cargo test --locked
|
||||
|
||||
- name: Build all binaries (debug-speed compilation into target/release)
|
||||
env:
|
||||
CARGO_PROFILE_RELEASE_OPT_LEVEL: 0
|
||||
CARGO_PROFILE_RELEASE_DEBUG: "true"
|
||||
CARGO_PROFILE_RELEASE_STRIP: "false"
|
||||
CARGO_PROFILE_RELEASE_LTO: "false"
|
||||
CARGO_PROFILE_RELEASE_CODEGEN_UNITS: 256
|
||||
run: cargo build --release --locked
|
||||
- name: Build all binaries
|
||||
run: cargo build --locked
|
||||
|
||||
- name: Extract all binary names
|
||||
id: cargo-meta
|
||||
@@ -67,7 +68,7 @@ jobs:
|
||||
echo "$BIN_NAMES" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Package all binaries into one archive
|
||||
- name: Package ZIP archive
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
@@ -78,7 +79,7 @@ jobs:
|
||||
FILES=()
|
||||
while IFS= read -r BIN; do
|
||||
[ -z "$BIN" ] && continue
|
||||
FILES+=("target/release/$BIN")
|
||||
FILES+=("target/debug/$BIN")
|
||||
done <<< "${{ steps.cargo-meta.outputs.bin_names }}"
|
||||
|
||||
if [ "${#FILES[@]}" -eq 0 ]; then
|
||||
@@ -86,67 +87,18 @@ jobs:
|
||||
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
|
||||
- name: Upload ZIP artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: archive-${{ matrix.arch }}
|
||||
path: pwsp-*.zip
|
||||
retention-days: 7
|
||||
|
||||
deb-build:
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- arch: x64
|
||||
runner: ubuntu-latest
|
||||
- arch: arm64
|
||||
runner: ubuntu-24.04-arm
|
||||
fail-fast: false
|
||||
runs-on: ${{ matrix.runner }}
|
||||
|
||||
steps:
|
||||
- name: Install apt deps (dev-libs)
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
libpipewire-0.3-dev \
|
||||
libclang-dev \
|
||||
libasound2-dev \
|
||||
libdbus-1-dev \
|
||||
pkg-config
|
||||
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.96.0
|
||||
|
||||
- name: Build all binaries (debug-speed compilation into target/release)
|
||||
env:
|
||||
CARGO_PROFILE_RELEASE_OPT_LEVEL: 0
|
||||
CARGO_PROFILE_RELEASE_DEBUG: "true"
|
||||
CARGO_PROFILE_RELEASE_STRIP: "false"
|
||||
CARGO_PROFILE_RELEASE_LTO: "false"
|
||||
CARGO_PROFILE_RELEASE_CODEGEN_UNITS: 256
|
||||
run: cargo build --release --locked
|
||||
|
||||
- name: Cache cargo-deb
|
||||
id: cache-cargo-deb
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v6
|
||||
with:
|
||||
path: ~/.cargo/bin/cargo-deb
|
||||
key: ${{ runner.os }}-${{ runner.arch }}-cargo-deb-v1
|
||||
@@ -155,20 +107,108 @@ jobs:
|
||||
if: steps.cache-cargo-deb.outputs.cache-hit != 'true'
|
||||
run: cargo install --locked cargo-deb
|
||||
|
||||
- name: Create .deb package (debug binaries from target/release)
|
||||
- name: Create .deb package
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
cargo-deb -p pwsp-gui --no-build --no-strip
|
||||
if [ "${{ github.event_name }}" == "push" ] && [ "${{ github.ref }}" == "refs/heads/main" ]; then
|
||||
BASE_VERSION=$(grep '^version =' Cargo.toml | head -1 | cut -d'"' -f2)
|
||||
GIT_REV=$(git rev-parse --short HEAD)
|
||||
DATE=$(date +%Y%m%d)
|
||||
DEB_VER="${BASE_VERSION}+git${DATE}.${GIT_REV}"
|
||||
echo "Building nightly deb version: $DEB_VER"
|
||||
cargo-deb -p pwsp-gui --no-build --no-strip --profile dev --deb-version "$DEB_VER"
|
||||
else
|
||||
cargo-deb -p pwsp-gui --no-build --no-strip --profile dev
|
||||
fi
|
||||
|
||||
- name: Upload .deb(s) as artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
- name: Upload .deb artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: deb-packages-${{ matrix.arch }}
|
||||
path: target/debian/*.deb
|
||||
retention-days: 7
|
||||
|
||||
deploy-nightly-apt:
|
||||
needs: build-and-package
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
runs-on: ubuntu-latest
|
||||
concurrency: gh-pages-deploy
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Setup GPG
|
||||
id: gpg
|
||||
uses: crazy-max/ghaction-import-gpg@v7
|
||||
with:
|
||||
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
passphrase: ${{ secrets.GPG_PASSPHRASE }}
|
||||
|
||||
- name: Download DEB artifacts
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
pattern: deb-packages-*
|
||||
path: debs
|
||||
merge-multiple: true
|
||||
|
||||
- name: Checkout existing gh-pages
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
ref: gh-pages
|
||||
path: gh-pages-branch
|
||||
continue-on-error: true
|
||||
|
||||
- name: Generate Nightly APT Repository
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y reprepro
|
||||
|
||||
mkdir -p apt-repo
|
||||
if [ -d "gh-pages-branch/apt" ]; then
|
||||
cp -r gh-pages-branch/apt/* apt-repo/ || true
|
||||
fi
|
||||
|
||||
mkdir -p apt-repo/conf
|
||||
cat <<EOF > apt-repo/conf/distributions
|
||||
Origin: arabianq
|
||||
Label: PipeWire Soundpad
|
||||
Codename: stable
|
||||
Architectures: amd64 arm64
|
||||
Components: main
|
||||
Description: APT Repository for PWSP
|
||||
SignWith: ${{ steps.gpg.outputs.fingerprint }}
|
||||
|
||||
Origin: arabianq
|
||||
Label: PipeWire Soundpad
|
||||
Codename: nightly
|
||||
Architectures: amd64 arm64
|
||||
Components: main
|
||||
Description: Nightly APT Repository for PWSP
|
||||
SignWith: ${{ steps.gpg.outputs.fingerprint }}
|
||||
EOF
|
||||
|
||||
gpg --armor --export ${{ steps.gpg.outputs.fingerprint }} > apt-repo/pubkey.gpg
|
||||
|
||||
cd apt-repo
|
||||
for deb in ../debs/*.deb; do
|
||||
if [ -f "$deb" ]; then
|
||||
echo "Adding $deb to nightly APT repository..."
|
||||
reprepro includedeb nightly "$deb"
|
||||
fi
|
||||
done
|
||||
|
||||
- name: Deploy APT Repo to GitHub Pages
|
||||
uses: peaceiris/actions-gh-pages@v4
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
publish_dir: ./apt-repo
|
||||
destination_dir: apt
|
||||
keep_files: true
|
||||
|
||||
flatpak-build:
|
||||
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
|
||||
strategy:
|
||||
@@ -185,7 +225,7 @@ jobs:
|
||||
options: --privileged
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v7
|
||||
|
||||
- name: Build Flatpak
|
||||
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
||||
@@ -196,3 +236,22 @@ jobs:
|
||||
branch: master
|
||||
build-bundle: true
|
||||
arch: ${{ matrix.arch }}
|
||||
|
||||
trigger-copr-nightly:
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Install copr-cli
|
||||
run: pip install copr-cli
|
||||
|
||||
- name: Trigger Copr Build
|
||||
env:
|
||||
COPR_CONFIG: ${{ secrets.COPR_CONFIG }}
|
||||
run: |
|
||||
mkdir -p ~/.config
|
||||
echo "$COPR_CONFIG" > ~/.config/copr
|
||||
copr-cli buildscm --nowait \
|
||||
--clone-url https://github.com/arabianq/pipewire-soundpad.git \
|
||||
--commit ${{ github.sha }} \
|
||||
--spec packages/rpm/pwsp-git.spec \
|
||||
arabianq/pwsp
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
name: Dependabot Flatpak Cargo Sources
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened, synchronize, reopened]
|
||||
paths:
|
||||
- "Cargo.lock"
|
||||
|
||||
jobs:
|
||||
update-cargo-sources:
|
||||
if: github.actor == 'dependabot[bot]'
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write # Needed to push back to the branch
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
ref: ${{ github.head_ref }}
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v7
|
||||
with:
|
||||
python-version: "3.x"
|
||||
|
||||
- name: Install dependencies
|
||||
run: pip install aiohttp tomlkit
|
||||
|
||||
- name: Generate cargo-sources.json
|
||||
run: bash ./scripts/generate-sources.sh
|
||||
|
||||
- name: Commit and push changes
|
||||
uses: stefanzweifel/git-auto-commit-action@v7
|
||||
with:
|
||||
commit_message: "chore(flatpak): automatically update cargo-sources.json"
|
||||
file_pattern: "packages/flatpak/cargo-sources.json"
|
||||
@@ -21,9 +21,17 @@ on:
|
||||
default: "stable"
|
||||
|
||||
jobs:
|
||||
flatter-x64:
|
||||
name: Flatter (x86_64)
|
||||
runs-on: ubuntu-latest
|
||||
build-flatpak:
|
||||
name: Build Flatpak (${{ matrix.arch }})
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- arch: x86_64
|
||||
runner: ubuntu-latest
|
||||
- arch: aarch64
|
||||
runner: ubuntu-24.04-arm
|
||||
fail-fast: false
|
||||
runs-on: ${{ matrix.runner }}
|
||||
permissions:
|
||||
contents: read
|
||||
container:
|
||||
@@ -32,13 +40,13 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
ref: ${{ inputs.tag_name || github.ref }}
|
||||
|
||||
- name: Setup GPG
|
||||
id: gpg
|
||||
uses: crazy-max/ghaction-import-gpg@v6
|
||||
uses: crazy-max/ghaction-import-gpg@v7
|
||||
with:
|
||||
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
passphrase: ${{ secrets.GPG_PASSPHRASE }}
|
||||
@@ -56,88 +64,123 @@ jobs:
|
||||
|
||||
- name: Modify Manifest
|
||||
run: |
|
||||
sed -i '/^branch:/d' packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
sed -i '/^default-branch:/d' packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
echo "branch: ${{ steps.set_branch.outputs.branch }}" >> packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
echo "default-branch: ${{ steps.set_branch.outputs.branch }}" >> packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
|
||||
- name: Install SDK Extensions
|
||||
run:
|
||||
run: |
|
||||
flatpak install -y flathub org.freedesktop.Sdk.Extension.rust-stable//25.08
|
||||
org.freedesktop.Sdk.Extension.llvm20//25.08
|
||||
flatpak install -y flathub org.freedesktop.Sdk.Extension.llvm20//25.08
|
||||
|
||||
- name: Build Flatpak
|
||||
uses: andyholmes/flatter@main
|
||||
with:
|
||||
files: packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
gpg-sign: ${{ steps.gpg.outputs.fingerprint }}
|
||||
upload-bundles: false
|
||||
upload-bundles: true
|
||||
upload-pages-artifact: false
|
||||
arch: x86_64
|
||||
arch: ${{ matrix.arch }}
|
||||
cache: true
|
||||
|
||||
flatter-arm64:
|
||||
name: Flatter (aarch64)
|
||||
needs: flatter-x64
|
||||
runs-on: ubuntu-24.04-arm
|
||||
permissions:
|
||||
contents: read
|
||||
prepare-repo:
|
||||
name: Prepare OSTree Repo
|
||||
needs: build-flatpak
|
||||
runs-on: ubuntu-latest
|
||||
concurrency: gh-pages-deploy
|
||||
container:
|
||||
image: ghcr.io/andyholmes/flatter/freedesktop:25.08
|
||||
options: --privileged
|
||||
permissions:
|
||||
contents: write # Needed to upload files to GitHub Release
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Download Flatpak Bundles
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
ref: ${{ inputs.tag_name || github.ref }}
|
||||
path: bundles
|
||||
pattern: ru.arabianq.pwsp-*
|
||||
|
||||
- name: Checkout existing gh-pages
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
ref: gh-pages
|
||||
path: gh-pages-branch
|
||||
continue-on-error: true
|
||||
|
||||
- name: Setup GPG
|
||||
id: gpg
|
||||
uses: crazy-max/ghaction-import-gpg@v6
|
||||
uses: crazy-max/ghaction-import-gpg@v7
|
||||
with:
|
||||
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
passphrase: ${{ secrets.GPG_PASSPHRASE }}
|
||||
|
||||
- name: Set Default Branch
|
||||
id: set_branch
|
||||
- name: Update OSTree Repo and Prepare Release Bundles
|
||||
run: |
|
||||
if [ "${{ github.event_name }}" == "release" ]; then
|
||||
echo "branch=stable" >> $GITHUB_OUTPUT
|
||||
elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
|
||||
echo "branch=${{ inputs.build_branch }}" >> $GITHUB_OUTPUT
|
||||
mkdir -p release-bundles
|
||||
|
||||
# Inherit existing OSTree repository to preserve previous branches (e.g. stable vs nightly)
|
||||
# Only inherit if objects/ exists, otherwise it's a corrupted/empty repo due to Git ignoring empty folders
|
||||
if [ -d "gh-pages-branch/objects" ]; then
|
||||
echo "Found existing OSTree repository. Copying..."
|
||||
cp -r gh-pages-branch pages-repo
|
||||
# Clean up the .git folder so it doesn't interfere
|
||||
rm -rf pages-repo/.git
|
||||
# Recreate empty OSTree directories that Git ignored when pushing previously
|
||||
mkdir -p pages-repo/refs/heads pages-repo/refs/mirrors pages-repo/refs/remotes \
|
||||
pages-repo/objects pages-repo/state pages-repo/extensions pages-repo/tmp
|
||||
else
|
||||
echo "branch=nightly" >> $GITHUB_OUTPUT
|
||||
echo "Initializing new OSTree repository..."
|
||||
mkdir -p pages-repo
|
||||
ostree init --mode=archive-z2 --repo=pages-repo
|
||||
fi
|
||||
|
||||
- name: Modify Manifest
|
||||
run: |
|
||||
echo "branch: ${{ steps.set_branch.outputs.branch }}" >> packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
echo "default-branch: ${{ steps.set_branch.outputs.branch }}" >> packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
shopt -s nullglob
|
||||
for dir in bundles/ru.arabianq.pwsp-*; do
|
||||
arch=$(basename "$dir" | sed 's/ru.arabianq.pwsp-//')
|
||||
|
||||
- name: Install SDK Extensions
|
||||
run:
|
||||
flatpak install -y flathub org.freedesktop.Sdk.Extension.rust-stable//25.08
|
||||
org.freedesktop.Sdk.Extension.llvm20//25.08
|
||||
# Find the flatpak file inside the dir
|
||||
bundle=$(find "$dir" -name "*.flatpak" | head -n 1)
|
||||
|
||||
- name: Build Flatpak
|
||||
uses: andyholmes/flatter@main
|
||||
if [ -n "$bundle" ]; then
|
||||
echo "Importing $bundle for architecture $arch..."
|
||||
flatpak build-import-bundle pages-repo "$bundle"
|
||||
|
||||
# Copy with a unique name for GitHub Release
|
||||
cp "$bundle" "release-bundles/ru.arabianq.pwsp-${arch}.flatpak"
|
||||
fi
|
||||
done
|
||||
|
||||
# Update summary and sign the repository
|
||||
flatpak build-update-repo --generate-static-deltas --gpg-sign=${{ steps.gpg.outputs.fingerprint }} pages-repo
|
||||
|
||||
# Export GPG public key for manual import
|
||||
gpg --export ${{ steps.gpg.outputs.fingerprint }} > pages-repo/pwsp.gpg
|
||||
|
||||
# Generate a .flatpakrepo file for easy installation
|
||||
GPG_BASE64=$(gpg --export ${{ steps.gpg.outputs.fingerprint }} | base64 -w 0)
|
||||
cat <<EOF | sed 's/^ *//' > pages-repo/pwsp.flatpakrepo
|
||||
[Flatpak Repo]
|
||||
Title=PipeWire Soundpad
|
||||
Url=https://arabianq.github.io/pipewire-soundpad/
|
||||
Homepage=https://github.com/arabianq/pipewire-soundpad
|
||||
Comment=PipeWire Soundpad Flatpak Repository
|
||||
Description=Official repository for PWSP
|
||||
GPGKey=${GPG_BASE64}
|
||||
EOF
|
||||
|
||||
- name: Deploy Flatpak Repo to GitHub Pages
|
||||
uses: peaceiris/actions-gh-pages@v4
|
||||
with:
|
||||
files: packages/flatpak/ru.arabianq.pwsp.yaml
|
||||
gpg-sign: ${{ steps.gpg.outputs.fingerprint }}
|
||||
upload-bundles: false
|
||||
upload-pages-artifact: true
|
||||
arch: aarch64
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
publish_dir: ./pages-repo
|
||||
destination_dir: .
|
||||
keep_files: true
|
||||
|
||||
deploy:
|
||||
name: Deploy to GitHub Pages
|
||||
runs-on: ubuntu-latest
|
||||
needs: flatter-arm64
|
||||
permissions:
|
||||
pages: write
|
||||
id-token: write
|
||||
environment:
|
||||
name: github-pages
|
||||
url: ${{ steps.deployment.outputs.page_url }}
|
||||
|
||||
steps:
|
||||
- name: GitHub Pages
|
||||
id: deployment
|
||||
uses: actions/deploy-pages@v4
|
||||
- name: Upload bundles to GitHub Release
|
||||
if: github.event_name == 'release'
|
||||
uses: softprops/action-gh-release@v3
|
||||
with:
|
||||
files: release-bundles/*.flatpak
|
||||
tag_name: ${{ github.event.release.tag_name }}
|
||||
|
||||
+139
-113
@@ -23,46 +23,32 @@ jobs:
|
||||
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"
|
||||
|
||||
if [ -n "$INPUT_TAG" ]; then
|
||||
echo "tag=$INPUT_TAG" >> $GITHUB_OUTPUT
|
||||
elif [ -n "$EVENT_TAG" ]; then
|
||||
echo "tag=$EVENT_TAG" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
|
||||
echo "Using GITHUB_REF tag: ${BASH_REMATCH[1]}"
|
||||
elif [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
|
||||
echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
|
||||
exit 0
|
||||
else
|
||||
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 "tag=$TAG_NAME" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "tag=" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "No tag in input/event/GITHUB_REF — querying latest release via API..."
|
||||
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"
|
||||
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."
|
||||
echo "ERROR: No tag determined."
|
||||
exit 1
|
||||
|
||||
linux-release:
|
||||
build-release:
|
||||
needs: prepare
|
||||
strategy:
|
||||
matrix:
|
||||
@@ -75,7 +61,7 @@ jobs:
|
||||
runs-on: ${{ matrix.runner }}
|
||||
|
||||
steps:
|
||||
- name: Install apt deps (jq/zip + dev-libs)
|
||||
- name: Install apt deps
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
@@ -84,10 +70,11 @@ jobs:
|
||||
libclang-dev \
|
||||
libasound2-dev \
|
||||
libdbus-1-dev \
|
||||
libssl-dev \
|
||||
pkg-config
|
||||
|
||||
- name: Checkout code at tag
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
ref: ${{ needs.prepare.outputs.tag }}
|
||||
fetch-depth: 0
|
||||
@@ -95,7 +82,13 @@ jobs:
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.96.0
|
||||
toolchain: stable
|
||||
cache: false
|
||||
|
||||
- name: Rust Cache
|
||||
uses: swatinem/rust-cache@v2
|
||||
with:
|
||||
prefix-key: "v3-${{ matrix.runner }}"
|
||||
|
||||
- name: Extract all binary names
|
||||
id: cargo-meta
|
||||
@@ -110,13 +103,12 @@ jobs:
|
||||
- name: Build all release binaries
|
||||
run: cargo build --release --locked
|
||||
|
||||
- name: Package all binaries into one archive
|
||||
- name: Package ZIP archive
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
TAG="${{ needs.prepare.outputs.tag }}"
|
||||
ARCHIVE_NAME="pwsp-${TAG}-linux-${{ matrix.arch }}.zip"
|
||||
echo "Creating archive: $ARCHIVE_NAME"
|
||||
|
||||
FILES=()
|
||||
while IFS= read -r BIN; do
|
||||
@@ -124,68 +116,18 @@ jobs:
|
||||
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 zip archive
|
||||
uses: actions/upload-artifact@v4
|
||||
- name: Upload ZIP artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: zip-archive-${{ matrix.arch }}
|
||||
path: pwsp-*.zip
|
||||
retention-days: 1
|
||||
|
||||
deb-release:
|
||||
needs: prepare
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- arch: x64
|
||||
runner: ubuntu-latest
|
||||
- arch: arm64
|
||||
runner: ubuntu-24.04-arm
|
||||
fail-fast: false
|
||||
runs-on: ${{ matrix.runner }}
|
||||
|
||||
steps:
|
||||
- name: Install apt deps (dev-libs)
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y \
|
||||
libpipewire-0.3-dev \
|
||||
libclang-dev \
|
||||
libasound2-dev \
|
||||
libdbus-1-dev \
|
||||
pkg-config
|
||||
|
||||
- name: Checkout code at tag
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ needs.prepare.outputs.tag }}
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Rust toolchain
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: 1.96.0
|
||||
|
||||
- name: Build all release binaries
|
||||
run: cargo build --release --locked
|
||||
|
||||
- name: Cache cargo-deb
|
||||
id: cache-cargo-deb
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v6
|
||||
with:
|
||||
path: ~/.cargo/bin/cargo-deb
|
||||
key: ${{ runner.os }}-${{ runner.arch }}-cargo-deb-v1
|
||||
@@ -194,53 +136,137 @@ jobs:
|
||||
if: steps.cache-cargo-deb.outputs.cache-hit != 'true'
|
||||
run: cargo install --locked cargo-deb
|
||||
|
||||
- name: Create .deb package (release binaries)
|
||||
- name: Create .deb package
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
cargo-deb -p pwsp-gui --no-build
|
||||
|
||||
- name: Upload deb package
|
||||
uses: actions/upload-artifact@v4
|
||||
- name: Upload DEB artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: deb-package-${{ matrix.arch }}
|
||||
path: target/debian/*.deb
|
||||
retention-days: 1
|
||||
|
||||
publish-release:
|
||||
needs: [prepare, linux-release, deb-release]
|
||||
needs: [prepare, build-release]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Download zip archive (x64)
|
||||
uses: actions/download-artifact@v4
|
||||
- name: Download all artifacts
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: zip-archive-x64
|
||||
path: ./dist
|
||||
|
||||
- name: Download zip archive (arm64)
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: zip-archive-arm64
|
||||
path: ./dist
|
||||
|
||||
- name: Download deb package (x64)
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: deb-package-x64
|
||||
path: ./dist
|
||||
|
||||
- name: Download deb package (arm64)
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: deb-package-arm64
|
||||
path: ./dist
|
||||
merge-multiple: true
|
||||
|
||||
- name: Upload artifacts to Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
uses: softprops/action-gh-release@v3
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_name: ${{ needs.prepare.outputs.tag }}
|
||||
files: |
|
||||
./dist/pwsp-*.zip
|
||||
./dist/*.deb
|
||||
|
||||
trigger-copr:
|
||||
needs: prepare
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Install copr-cli
|
||||
run: pip install copr-cli
|
||||
|
||||
- name: Trigger Copr Build
|
||||
env:
|
||||
COPR_CONFIG: ${{ secrets.COPR_CONFIG }}
|
||||
run: |
|
||||
mkdir -p ~/.config
|
||||
echo "$COPR_CONFIG" > ~/.config/copr
|
||||
copr-cli buildscm --nowait \
|
||||
--clone-url https://github.com/arabianq/pipewire-soundpad.git \
|
||||
--commit ${{ needs.prepare.outputs.tag }} \
|
||||
--spec packages/rpm/pwsp.spec \
|
||||
arabianq/pwsp
|
||||
|
||||
build-apt-repo:
|
||||
needs: [prepare, build-release]
|
||||
runs-on: ubuntu-latest
|
||||
concurrency: gh-pages-deploy
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Setup GPG
|
||||
id: gpg
|
||||
uses: crazy-max/ghaction-import-gpg@v7
|
||||
with:
|
||||
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
passphrase: ${{ secrets.GPG_PASSPHRASE }}
|
||||
|
||||
- name: Download DEB artifacts
|
||||
uses: actions/download-artifact@v8
|
||||
with:
|
||||
pattern: deb-package-*
|
||||
path: debs
|
||||
merge-multiple: true
|
||||
|
||||
- name: Checkout existing gh-pages
|
||||
uses: actions/checkout@v7
|
||||
with:
|
||||
ref: gh-pages
|
||||
path: gh-pages-branch
|
||||
continue-on-error: true
|
||||
|
||||
- name: Generate APT Repository
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y reprepro
|
||||
|
||||
mkdir -p apt-repo
|
||||
|
||||
# Restore existing repository first so we don't lose old packages
|
||||
if [ -d "gh-pages-branch/apt" ]; then
|
||||
cp -r gh-pages-branch/apt/* apt-repo/ || true
|
||||
fi
|
||||
|
||||
# Always rewrite the config and public key to ensure they are up-to-date
|
||||
mkdir -p apt-repo/conf
|
||||
|
||||
cat <<EOF > apt-repo/conf/distributions
|
||||
Origin: arabianq
|
||||
Label: PipeWire Soundpad
|
||||
Codename: stable
|
||||
Architectures: amd64 arm64
|
||||
Components: main
|
||||
Description: APT Repository for PWSP
|
||||
SignWith: ${{ steps.gpg.outputs.fingerprint }}
|
||||
|
||||
Origin: arabianq
|
||||
Label: PipeWire Soundpad
|
||||
Codename: nightly
|
||||
Architectures: amd64 arm64
|
||||
Components: main
|
||||
Description: Nightly APT Repository for PWSP
|
||||
SignWith: ${{ steps.gpg.outputs.fingerprint }}
|
||||
EOF
|
||||
|
||||
gpg --armor --export ${{ steps.gpg.outputs.fingerprint }} > apt-repo/pubkey.gpg
|
||||
|
||||
cd apt-repo
|
||||
|
||||
for deb in ../debs/*.deb; do
|
||||
if [ -f "$deb" ]; then
|
||||
echo "Adding $deb to APT repository..."
|
||||
reprepro includedeb stable "$deb"
|
||||
fi
|
||||
done
|
||||
|
||||
- name: Deploy APT Repo to GitHub Pages
|
||||
uses: peaceiris/actions-gh-pages@v4
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
publish_dir: ./apt-repo
|
||||
destination_dir: apt
|
||||
keep_files: true
|
||||
|
||||
Generated
+680
-1098
File diff suppressed because it is too large
Load Diff
+15
-10
@@ -8,7 +8,7 @@ members = [
|
||||
resolver = "2"
|
||||
|
||||
[workspace.package]
|
||||
version = "1.11.0"
|
||||
version = "1.14.0"
|
||||
edition = "2024"
|
||||
authors = ["arabian"]
|
||||
homepage = "https://pwsp.arabianq.ru"
|
||||
@@ -39,7 +39,7 @@ clap = { version = "4.6.1", default-features = false, features = [
|
||||
] }
|
||||
|
||||
dirs = "6.0.0"
|
||||
itertools = "0.14.0"
|
||||
itertools = "0.15.0"
|
||||
evdev = { version = "0.13.2", features = ["tokio"] }
|
||||
rfd = { version = "0.17.2", default-features = false, features = [
|
||||
"xdg-portal",
|
||||
@@ -52,34 +52,39 @@ rustix = { version = "1.1.4", features = ["process"] }
|
||||
rust-i18n = "4.0.0"
|
||||
sys-locale = "0.3.2"
|
||||
|
||||
rodio = { git = "https://github.com/arabianq/rodio.git", rev = "a634dd471e9d59196e19bf01323fb45f2f899821", default-features = false, features = [
|
||||
rodio = { git = "https://github.com/arabianq/rodio.git", rev = "610955cf524467690cc9abe1a6277e8bffcadb71", default-features = false, features = [
|
||||
"symphonia-all",
|
||||
"symphonia-libopus",
|
||||
"playback",
|
||||
] }
|
||||
pipewire = "0.10.0"
|
||||
|
||||
egui = { version = "0.34.2", default-features = false, features = [
|
||||
egui = { version = "0.35.0", default-features = false, features = [
|
||||
"default_fonts",
|
||||
"rayon",
|
||||
] }
|
||||
eframe = { version = "0.34.2", default-features = false, features = [
|
||||
eframe = { version = "0.35.0", default-features = false, features = [
|
||||
"default_fonts",
|
||||
"glow",
|
||||
"x11",
|
||||
"wayland",
|
||||
] }
|
||||
egui_extras = "0.34.1"
|
||||
egui_material_icons = "0.6.0"
|
||||
egui_dnd = "0.15.0"
|
||||
egui_extras = "0.35.0"
|
||||
egui_material_icons = "0.7.0"
|
||||
egui_dnd = "0.16.0"
|
||||
|
||||
reqwest = "0.13.4"
|
||||
reqwest = { version = "0.13.4", default-features = false, features = ["native-tls"] }
|
||||
percent-encoding = "2.3.2"
|
||||
|
||||
[profile.dev]
|
||||
|
||||
[profile.dev.package."*"]
|
||||
opt-level = 3
|
||||
debug = false
|
||||
|
||||
[profile.release]
|
||||
strip = true
|
||||
lto = true
|
||||
codegen-units = 1
|
||||
opt-level = "z"
|
||||
panic = "abort"
|
||||
|
||||
|
||||
@@ -1,118 +1,149 @@
|
||||
<div align="center">
|
||||
<h1>🎵 PipeWire Soundpad (PWSP)</h1>
|
||||
<p><b>A simple, modern, and powerful soundboard for Linux, written in Rust.</b></p>
|
||||
<img src="pwsp-gui/assets/screenshot.png" alt="PWSP Screenshot" width="700"/>
|
||||
</div>
|
||||
# PipeWire Soundpad (PWSP) 🎵
|
||||
|
||||
## 🌟 Overview
|
||||
**PipeWire Soundpad (PWSP)** is a graphical soundboard application that routes audio directly to your virtual microphone using **PipeWire**. It provides an intuitive interface for managing your audio collection, making it an ideal tool for gamers, streamers, and anyone looking to inject sound effects into voice chats on platforms like Discord, Zoom, or TeamSpeak.
|
||||

|
||||
|
||||
## ✨ Key Features
|
||||
* **🎙️ Virtual Microphone Output:** Seamlessly mixes your microphone input with sound effects by automatically managing PipeWire virtual devices.
|
||||
* **🎵 Multi-Format Support:** Plays popular audio formats including `mp3`, `wav`, `ogg`, `flac`, `mp4`, and `aac`.
|
||||
* **⚡ Global Hotkeys:** Trigger sounds instantly from anywhere, even when the app is running in the background.
|
||||
* **📂 Smart Collection Management:** Drag-and-drop folders, quick search, and collapsible tracks to keep your library organized.
|
||||
* **🎛️ Advanced Playback Controls:** Individual volume sliders, play/pause, position scrubbing, and concurrent multi-track playback.
|
||||
* **🔌 Plug & Play:** Automatically detects when an input device is connected or disconnected and handles linking/unlinking on the fly.
|
||||
* **🖥️ Modern GUI:** Clean, responsive, and lightweight interface powered by [egui](https://egui.rs/).
|
||||
[🇷🇺 Читать на русском](README.ru.md) | [🇺🇸 Read in English](README.md)
|
||||
|
||||
## ⚙️ Architecture
|
||||
PWSP is built with a client-server model to ensure stability and separation of concerns:
|
||||
* **`pwsp-daemon`**: The background engine. It runs silently, managing PipeWire virtual devices, audio routing, and playback.
|
||||
* **`pwsp-gui`**: The graphical interface. Communicates with the daemon via a Unix socket to control playback and settings.
|
||||
* **`pwsp-cli`**: The command-line tool. Perfect for scripting, hotkey binding, or quick terminal-based control.
|
||||
[](https://github.com/arabianq/pipewire-soundpad/actions)
|
||||
[](https://opensource.org/licenses/MIT)
|
||||
[](https://github.com/arabianq/pipewire-soundpad/releases/latest)
|
||||
[](https://pipewire.org/)
|
||||
|
||||
**PipeWire Soundpad (PWSP)** is a modern, low-latency application that lets you play audio files directly through your microphone. Designed specifically for Linux, it leverages the power of PipeWire to achieve native integration without the need for Pulseaudio bridges or complex virtual sinks.
|
||||
|
||||
---
|
||||
|
||||
## ✨ Features
|
||||
|
||||
- **Native PipeWire Integration:** Direct communication with the PipeWire API for the lowest possible latency.
|
||||
- **Modular Architecture:** Consists of a background `daemon`, a command-line interface (`cli`), and a graphical user interface (`gui`).
|
||||
- **Modern GUI:** Built with `egui`, supporting both Wayland and X11 seamlessly.
|
||||
- **Global Hotkeys:** Powered by `evdev`, allowing you to play sounds from anywhere.
|
||||
- **Broad Audio Support:** Powered by `rodio` and `symphonia` to support a wide range of audio formats.
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Installation
|
||||
|
||||
We provide multiple ways to install PWSP, including stable releases and rolling "nightly" builds directly from the `main` branch.
|
||||
|
||||
### 📦 Flatpak (Recommended)
|
||||
Install PWSP via Flatpak from our custom repository:
|
||||
|
||||
Add our official OSTree repository and install the application:
|
||||
|
||||
```bash
|
||||
flatpak remote-add --user --if-not-exists pwsp-repo https://arabianq.github.io/pipewire-soundpad/index.flatpakrepo
|
||||
# Add the repository
|
||||
flatpak remote-add --if-not-exists pwsp https://arabianq.github.io/pipewire-soundpad/pwsp.flatpakrepo
|
||||
|
||||
# Install stable version
|
||||
flatpak install --user arabianq-repo ru.arabianq.pwsp//stable
|
||||
# Install the Stable version
|
||||
flatpak install pwsp ru.arabianq.pwsp//stable
|
||||
|
||||
# Or install the nightly version (latest commit)
|
||||
flatpak install --user arabianq-repo ru.arabianq.pwsp//nightly
|
||||
# OR Install the Nightly version (rolling updates)
|
||||
flatpak install pwsp ru.arabianq.pwsp//nightly
|
||||
```
|
||||
|
||||
### 🐧 Linux Packages
|
||||
**Fedora (and derivatives):**
|
||||
### 🟠 Debian / Ubuntu (APT Repository)
|
||||
|
||||
We maintain an official APT repository for seamless updates via `apt`:
|
||||
|
||||
```bash
|
||||
# 1. Download the public GPG key
|
||||
wget -O- https://arabianq.github.io/pipewire-soundpad/apt/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/pwsp.gpg
|
||||
|
||||
# 2. Add the repository (Choose STABLE or NIGHTLY)
|
||||
# For Stable:
|
||||
echo "deb [signed-by=/etc/apt/keyrings/pwsp.gpg] https://arabianq.github.io/pipewire-soundpad/apt/ stable main" | sudo tee /etc/apt/sources.list.d/pwsp.list
|
||||
|
||||
# For Nightly:
|
||||
# echo "deb [signed-by=/etc/apt/keyrings/pwsp.gpg] https://arabianq.github.io/pipewire-soundpad/apt/ nightly main" | sudo tee /etc/apt/sources.list.d/pwsp.list
|
||||
|
||||
# 3. Update and install
|
||||
sudo apt update
|
||||
sudo apt install pwsp
|
||||
```
|
||||
|
||||
### 🐧 Fedora / RHEL (COPR)
|
||||
|
||||
Available via the Fedora COPR repository:
|
||||
|
||||
```bash
|
||||
sudo dnf copr enable arabianq/pwsp
|
||||
sudo dnf install pwsp
|
||||
```
|
||||
|
||||
**Arch Linux (AUR):**
|
||||
### ⚙️ Manual / Standalone
|
||||
|
||||
You can manually download `.deb` packages or standalone `.zip` binaries from the [Releases page](https://github.com/arabianq/pipewire-soundpad/releases).
|
||||
|
||||
### 🦀 Build from Source
|
||||
|
||||
Make sure you have Rust, Cargo, and the required dependencies (`libpipewire-0.3-dev`, `libclang-dev`, `libasound2-dev`, `libdbus-1-dev`) installed.
|
||||
|
||||
```bash
|
||||
paru -S pwsp-bin # or 'pwsp' to build from source
|
||||
```
|
||||
|
||||
**Debian / Ubuntu:**
|
||||
Download pre-built `.deb` packages or standalone binaries from the [Releases page](https://github.com/arabianq/pipewire-soundpad/releases).
|
||||
|
||||
### 🦀 Cargo / Source Build
|
||||
```bash
|
||||
cargo install pwsp
|
||||
|
||||
# OR clone and build manually:
|
||||
git clone https://github.com/arabianq/pipewire-soundpad.git
|
||||
cd pipewire-soundpad
|
||||
cargo build --release
|
||||
cargo build --release --locked
|
||||
```
|
||||
*(Note: Requires Rust toolchain and PipeWire running on your system).*
|
||||
|
||||
The binaries will be located in `target/release/`.
|
||||
|
||||
---
|
||||
|
||||
## 🎮 Usage
|
||||
|
||||
### 1. Start the Daemon
|
||||
Before using the GUI or CLI, the daemon must be running in the background.
|
||||
|
||||
PWSP operates via a background daemon that handles the audio routing.
|
||||
|
||||
```bash
|
||||
# Recommended: Start and enable via systemd (starts on login)
|
||||
systemctl --user enable --now pwsp-daemon
|
||||
|
||||
# Manual start (if not using systemd):
|
||||
pwsp-daemon &
|
||||
# Run the daemon
|
||||
pwsp-daemon
|
||||
```
|
||||
|
||||
### 2. Using the GUI
|
||||
1. **Add Sounds:** Click the **"+"** button to add a directory containing your audio files.
|
||||
2. **Select Mic:** Choose your physical microphone from the dropdown. PWSP will instantly create a virtual microphone combining your voice and the soundboard.
|
||||
3. **Play:** Click any sound to play it, adjust its volume, or assign a hotkey for quick access.
|
||||
_(Tip: If installed via package managers, a systemd user service is provided. You can enable it with `systemctl --user enable --now pwsp-daemon.service`)_
|
||||
|
||||
### 2. Launch the GUI
|
||||
|
||||
Simply run the graphical interface to manage and play your sounds:
|
||||
|
||||
### 3. Using the CLI
|
||||
Control the daemon directly from your terminal:
|
||||
```bash
|
||||
pwsp-cli action play /path/to/sound.mp3
|
||||
pwsp-cli get volume
|
||||
pwsp-cli set position 20
|
||||
pwsp-cli --help # View all commands
|
||||
pwsp-gui
|
||||
```
|
||||
|
||||
### 3. Use the CLI
|
||||
|
||||
You can also interact with the daemon directly via the command line:
|
||||
|
||||
```bash
|
||||
pwsp-cli play /path/to/sound.mp3
|
||||
pwsp-cli stop
|
||||
pwsp-cli status
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ⌨️ Shortcuts & Controls
|
||||
## 📚 Documentation & DeepWiki
|
||||
|
||||
| Action | Keyboard | Mouse |
|
||||
| :----------------------------------- | :--------------------- | :------------------- |
|
||||
| **Play Track** (Stops others) | | `Left Click` |
|
||||
| **Add Track** (Plays simultaneously) | | `Ctrl + Left Click` |
|
||||
| **Replace Last Track** | | `Shift + Left Click` |
|
||||
| **Pause / Resume** | `Space` | |
|
||||
| **Stop All Tracks** | `Backspace` | |
|
||||
| **Open / Close Settings** | `I` | |
|
||||
| **Search** | `/` | |
|
||||
For advanced configuration, troubleshooting, architecture details, and custom setups, please visit our official Wiki:
|
||||
|
||||
[](https://deepwiki.com/arabianq/pipewire-soundpad)
|
||||
|
||||
---
|
||||
|
||||
## 🤝 Contributing
|
||||
Contributions, issues, and feature requests are welcome! Feel free to check out the [issues page](https://github.com/arabianq/pipewire-soundpad/issues).
|
||||
|
||||
[](https://deepwiki.com/arabianq/pipewire-soundpad)
|
||||
Contributions, issues, and feature requests are welcome!
|
||||
|
||||
## 📜 License
|
||||
This project is licensed under the [MIT License](LICENSE).
|
||||
1. Fork the project.
|
||||
2. Create your feature branch (`git checkout -b feat/amazing-feature`).
|
||||
3. Commit your changes (`git commit -m 'Add some amazing feature'`).
|
||||
4. Push to the branch (`git push origin feat/amazing-feature`).
|
||||
5. Open a Pull Request.
|
||||
|
||||
---
|
||||
|
||||
## 📝 License
|
||||
|
||||
Distributed under the MIT License. See `LICENSE` for more information.
|
||||
|
||||
_Built with ❤️ for the Linux community._
|
||||
|
||||
+149
@@ -0,0 +1,149 @@
|
||||
# PipeWire Soundpad (PWSP) 🎵
|
||||
|
||||

|
||||
|
||||
[🇷🇺 Читать на русском](README.ru.md) | [🇺🇸 Read in English](README.md)
|
||||
|
||||
[](https://github.com/arabianq/pipewire-soundpad/actions)
|
||||
[](https://opensource.org/licenses/MIT)
|
||||
[](https://github.com/arabianq/pipewire-soundpad/releases/latest)
|
||||
[](https://pipewire.org/)
|
||||
|
||||
**PipeWire Soundpad (PWSP)** — это современное приложение с низкой задержкой, которое позволяет воспроизводить аудиофайлы прямо в ваш микрофон. Разработано специально для Linux с использованием мощи PipeWire для достижения нативной интеграции без использования мостов Pulseaudio или сложных виртуальных устройств.
|
||||
|
||||
---
|
||||
|
||||
## ✨ Возможности
|
||||
|
||||
- **Нативная интеграция с PipeWire:** Прямое взаимодействие с PipeWire API для минимальной задержки.
|
||||
- **Модульная архитектура:** Состоит из фонового демона (`daemon`), интерфейса командной строки (`cli`) и графического интерфейса (`gui`).
|
||||
- **Современный GUI:** Построен на `egui`, плавно работает как на Wayland, так и на X11.
|
||||
- **Глобальные горячие клавиши:** Работают через `evdev`, позволяя воспроизводить звуки из любого окна.
|
||||
- **Широкая поддержка форматов:** Использует `rodio` и `symphonia` для поддержки большинства аудиоформатов.
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Установка
|
||||
|
||||
Мы предоставляем несколько способов установки PWSP, включая стабильные релизы и постоянно обновляемые "nightly" сборки напрямую из ветки `main`.
|
||||
|
||||
### 📦 Flatpak (Рекомендуется)
|
||||
|
||||
Добавьте наш официальный OSTree репозиторий и установите приложение:
|
||||
|
||||
```bash
|
||||
# Добавьте репозиторий
|
||||
flatpak remote-add --if-not-exists pwsp https://arabianq.github.io/pipewire-soundpad/pwsp.flatpakrepo
|
||||
|
||||
# Установите стабильную (Stable) версию
|
||||
flatpak install pwsp ru.arabianq.pwsp//stable
|
||||
|
||||
# ИЛИ установите Nightly версию (самые свежие обновления)
|
||||
flatpak install pwsp ru.arabianq.pwsp//nightly
|
||||
```
|
||||
|
||||
### 🟠 Debian / Ubuntu (APT Репозиторий)
|
||||
|
||||
Мы поддерживаем официальный APT-репозиторий для бесшовных обновлений через `apt`:
|
||||
|
||||
```bash
|
||||
# 1. Скачайте публичный GPG ключ
|
||||
wget -O- https://arabianq.github.io/pipewire-soundpad/apt/pubkey.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/pwsp.gpg
|
||||
|
||||
# 2. Добавьте репозиторий (Выберите STABLE или NIGHTLY)
|
||||
# Для Stable:
|
||||
echo "deb [signed-by=/etc/apt/keyrings/pwsp.gpg] https://arabianq.github.io/pipewire-soundpad/apt/ stable main" | sudo tee /etc/apt/sources.list.d/pwsp.list
|
||||
|
||||
# Для Nightly:
|
||||
# echo "deb [signed-by=/etc/apt/keyrings/pwsp.gpg] https://arabianq.github.io/pipewire-soundpad/apt/ nightly main" | sudo tee /etc/apt/sources.list.d/pwsp.list
|
||||
|
||||
# 3. Обновите индексы и установите
|
||||
sudo apt update
|
||||
sudo apt install pwsp
|
||||
```
|
||||
|
||||
### 🐧 Fedora / RHEL (COPR)
|
||||
|
||||
Доступно через репозиторий Fedora COPR:
|
||||
|
||||
```bash
|
||||
sudo dnf copr enable arabianq/pwsp
|
||||
sudo dnf install pwsp
|
||||
```
|
||||
|
||||
### ⚙️ Ручная установка
|
||||
|
||||
Вы можете вручную скачать пакеты `.deb` или готовые бинарники `.zip` на [странице релизов](https://github.com/arabianq/pipewire-soundpad/releases).
|
||||
|
||||
### 🦀 Сборка из исходников
|
||||
|
||||
Убедитесь, что у вас установлены Rust, Cargo и необходимые зависимости (`libpipewire-0.3-dev`, `libclang-dev`, `libasound2-dev`, `libdbus-1-dev`).
|
||||
|
||||
```bash
|
||||
git clone https://github.com/arabianq/pipewire-soundpad.git
|
||||
cd pipewire-soundpad
|
||||
cargo build --release --locked
|
||||
```
|
||||
|
||||
Собранные бинарники будут находиться в папке `target/release/`.
|
||||
|
||||
---
|
||||
|
||||
## 🎮 Использование
|
||||
|
||||
### 1. Запуск демона
|
||||
|
||||
PWSP работает через фоновый демон, который маршрутизирует аудио.
|
||||
|
||||
```bash
|
||||
# Запуск демона
|
||||
pwsp-daemon
|
||||
```
|
||||
|
||||
_(Подсказка: Если вы установили программу через пакетный менеджер, она включает пользовательский systemd-сервис. Вы можете включить его командой: `systemctl --user enable --now pwsp-daemon.service`)_
|
||||
|
||||
### 2. Запуск GUI
|
||||
|
||||
Просто запустите графический интерфейс для управления и воспроизведения звуков:
|
||||
|
||||
```bash
|
||||
pwsp-gui
|
||||
```
|
||||
|
||||
### 3. Использование CLI
|
||||
|
||||
Вы также можете взаимодействовать с демоном напрямую через командную строку:
|
||||
|
||||
```bash
|
||||
pwsp-cli play /path/to/sound.mp3
|
||||
pwsp-cli stop
|
||||
pwsp-cli status
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📚 Документация и DeepWiki
|
||||
|
||||
Для детальной настройки, решения проблем, описания архитектуры и кастомных конфигураций, пожалуйста, посетите нашу официальную Wiki:
|
||||
|
||||
[](https://deepwiki.com/arabianq/pipewire-soundpad)
|
||||
|
||||
---
|
||||
|
||||
## 🤝 Вклад в проект (Contributing)
|
||||
|
||||
Будем рады вашей помощи, баг-репортам и идеям!
|
||||
|
||||
1. Сделайте Fork проекта.
|
||||
2. Создайте свою ветку (`git checkout -b feat/amazing-feature`).
|
||||
3. Закоммитьте изменения (`git commit -m 'Add some amazing feature'`).
|
||||
4. Запушьте ветку (`git push origin feat/amazing-feature`).
|
||||
5. Откройте Pull Request.
|
||||
|
||||
---
|
||||
|
||||
## 📝 Лицензия
|
||||
|
||||
Распространяется под лицензией MIT. Подробнее см. в файле `LICENSE`.
|
||||
|
||||
_Сделано с ❤️ для сообщества Linux._
|
||||
@@ -1,6 +1,6 @@
|
||||
pkgbase = pwsp-bin
|
||||
pkgdesc = Lets you play audio files through your microphone (Pre-built binaries)
|
||||
pkgver = 1.11.0
|
||||
pkgver = 1.14.0
|
||||
pkgrel = 1
|
||||
url = https://github.com/arabianq/pipewire-soundpad
|
||||
arch = x86_64
|
||||
@@ -10,11 +10,11 @@ pkgbase = pwsp-bin
|
||||
depends = alsa-lib
|
||||
provides = pwsp
|
||||
conflicts = pwsp
|
||||
source = pipewire-soundpad-1.11.0.tar.gz :: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.11.0.tar.gz
|
||||
source = pipewire-soundpad-1.14.0.tar.gz :: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.14.0.tar.gz
|
||||
sha256sums = SKIP
|
||||
source_x86_64 = pwsp-1.11.0-x86_64.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.11.0/pwsp-v1.11.0-linux-x64.zip
|
||||
source_x86_64 = pwsp-1.14.0-x86_64.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.14.0/pwsp-v1.14.0-linux-x64.zip
|
||||
sha256sums_x86_64 = SKIP
|
||||
source_aarch64 = pwsp-1.11.0-aarch64.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.11.0/pwsp-v1.11.0-linux-arm64.zip
|
||||
source_aarch64 = pwsp-1.14.0-aarch64.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.14.0/pwsp-v1.14.0-linux-arm64.zip
|
||||
sha256sums_aarch64 = SKIP
|
||||
|
||||
pkgname = pwsp-bin
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
|
||||
pkgname=pwsp-bin
|
||||
_pkgname=pipewire-soundpad
|
||||
pkgver=1.11.0
|
||||
pkgver=1.14.0
|
||||
pkgrel=1
|
||||
pkgdesc="Lets you play audio files through your microphone (Pre-built binaries)"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://github.com/arabianq/pipewire-soundpad"
|
||||
license=('MIT')
|
||||
depends=('pipewire' 'alsa-lib')
|
||||
depends=('pipewire' 'alsa-lib' 'openssl')
|
||||
provides=('pwsp')
|
||||
conflicts=('pwsp')
|
||||
|
||||
@@ -26,9 +26,9 @@ package() {
|
||||
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/pwsp.png"
|
||||
install -Dm644 "$_srcsrc/assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
||||
|
||||
install -Dm644 "$_srcsrc/pwsp-gui/assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop"
|
||||
install -Dm644 "$_srcsrc/pwsp-gui/assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/pwsp.png"
|
||||
install -Dm644 "$_srcsrc/pwsp-daemon/assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
||||
|
||||
install -Dm644 "$_srcsrc/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
pkgbase = pwsp
|
||||
pkgdesc = Lets you play audio files through your microphone
|
||||
pkgver = 1.11.0
|
||||
pkgver = 1.14.0
|
||||
pkgrel = 1
|
||||
url = https://github.com/arabianq/pipewire-soundpad
|
||||
arch = x86_64
|
||||
@@ -12,7 +12,7 @@ pkgbase = pwsp
|
||||
makedepends = cmake
|
||||
makedepends = pipewire
|
||||
makedepends = alsa-lib
|
||||
source = https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.11.0.tar.gz
|
||||
source = https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.14.0.tar.gz
|
||||
sha256sums = SKIP
|
||||
|
||||
pkgname = pwsp
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
|
||||
pkgsubn=pwsp
|
||||
pkgname=pwsp
|
||||
pkgver=1.11.0
|
||||
pkgver=1.14.0
|
||||
pkgrel=1
|
||||
pkgdesc="Lets you play audio files through your microphone"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://github.com/arabianq/pipewire-soundpad"
|
||||
license=('MIT')
|
||||
depends=('pipewire' 'alsa-lib' 'openssl')
|
||||
makedepends=(clang rust cargo cmake pipewire alsa-lib)
|
||||
source=("$url/archive/refs/tags/v$pkgver.tar.gz")
|
||||
sha256sums=('SKIP')
|
||||
@@ -14,7 +15,7 @@ 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')"
|
||||
@@ -35,7 +36,7 @@ build() {
|
||||
|
||||
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"
|
||||
@@ -43,5 +44,5 @@ package() {
|
||||
install -Dm644 "pwsp-gui/assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop"
|
||||
install -Dm644 "pwsp-gui/assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/pwsp.png"
|
||||
|
||||
install -Dm644 "pwsp-gui/assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
||||
install -Dm644 "pwsp-daemon/assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
||||
}
|
||||
|
||||
+986
-1504
File diff suppressed because one or more lines are too long
@@ -25,7 +25,7 @@
|
||||
<name>arabian</name>
|
||||
</developer>
|
||||
<releases>
|
||||
<release version="1.11.0" date="2026-06-02" />
|
||||
<release version="1.14.0" date="2026-07-24" />
|
||||
</releases>
|
||||
<content_rating type="oars-1.1" />
|
||||
</component>
|
||||
@@ -30,6 +30,7 @@ modules:
|
||||
- name: pwsp
|
||||
buildsystem: simple
|
||||
build-commands:
|
||||
- if [ -w /run/ccache ]; then mkdir -p /run/ccache/cargo-target && rm -rf target && ln -s /run/ccache/cargo-target target; fi
|
||||
- export CARGO_HOME=$PWD/cargo && cargo build --release --offline
|
||||
- install -Dm755 target/release/pwsp-daemon /app/bin/pwsp-daemon
|
||||
- install -Dm755 target/release/pwsp-cli /app/bin/pwsp-cli
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
|
||||
# prevent library files from being installed
|
||||
%global cargo_install_lib 0
|
||||
|
||||
# disable debuginfo package generation (debugsourcefiles.list is empty for Rust)
|
||||
%global debug_package %{nil}
|
||||
|
||||
Name: pwsp-git
|
||||
Version: {{{ git describe --tags --always | sed 's/^v//' | sed -E 's/-([0-9]+)-(g[0-9a-f]+)/^git.\1.\2/' }}}
|
||||
Release: 1%{?dist}
|
||||
Summary: Lets you play audio files through your microphone (git version)
|
||||
|
||||
License: MIT
|
||||
|
||||
URL: https://github.com/arabianq/pipewire-soundpad
|
||||
VCS: {{{ git_dir_vcs }}}
|
||||
Source: {{{ git_cwd_pack }}}
|
||||
|
||||
|
||||
BuildRequires: rust
|
||||
BuildRequires: cargo
|
||||
BuildRequires: pipewire-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
%else
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: openssl-devel
|
||||
%endif
|
||||
BuildRequires: clang-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: pkgconfig
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1500
|
||||
BuildRequires: gcc13-c++
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
# Declare compatibility and conflicts with the stable package
|
||||
Provides: pwsp = %{version}-%{release}
|
||||
Conflicts: pwsp
|
||||
|
||||
%global _description %{expand:
|
||||
PWSP lets you play audio files through your microphone. Has both CLI and
|
||||
GUI clients. This is the latest development (git) version.}
|
||||
|
||||
%description %{_description}
|
||||
|
||||
%prep
|
||||
{{{ git_cwd_setup_macro }}}
|
||||
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1500
|
||||
export CC=gcc-13
|
||||
export CXX=g++-13
|
||||
%endif
|
||||
cargo build --release --locked
|
||||
|
||||
|
||||
%install
|
||||
install -Dm755 target/release/pwsp-cli %{buildroot}%{_bindir}/pwsp-cli
|
||||
install -Dm755 target/release/pwsp-daemon %{buildroot}%{_bindir}/pwsp-daemon
|
||||
install -Dm755 target/release/pwsp-gui %{buildroot}%{_bindir}/pwsp-gui
|
||||
|
||||
install -Dm644 pwsp-gui/assets/pwsp-gui.desktop %{buildroot}%{_datadir}/applications/pwsp.desktop
|
||||
install -Dm644 pwsp-gui/assets/icon.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/pwsp.png
|
||||
|
||||
install -Dm644 pwsp-daemon/assets/pwsp-daemon.service %{buildroot}/usr/lib/systemd/user/pwsp-daemon.service
|
||||
|
||||
%post
|
||||
%systemd_user_post pwsp-daemon.service
|
||||
|
||||
%preun
|
||||
%systemd_user_preun pwsp-daemon.service
|
||||
|
||||
%postun
|
||||
%systemd_user_postun_with_restart pwsp-daemon.service
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{_bindir}/pwsp-cli
|
||||
%{_bindir}/pwsp-daemon
|
||||
%{_bindir}/pwsp-gui
|
||||
%{_datadir}/applications/pwsp.desktop
|
||||
%{_datadir}/icons/hicolor/256x256/apps/pwsp.png
|
||||
/usr/lib/systemd/user/pwsp-daemon.service
|
||||
|
||||
%changelog
|
||||
{{{ git_dir_changelog }}}
|
||||
|
||||
+41
-6
@@ -1,10 +1,19 @@
|
||||
%bcond check 1
|
||||
|
||||
# prevent library files from being installed
|
||||
%global cargo_install_lib 0
|
||||
|
||||
# Fallback macros for systems without rpmautospec (e.g. openSUSE)
|
||||
%{!?autorelease: %global autorelease 1}
|
||||
%{!?autochangelog: %global autochangelog \
|
||||
* Tue Jun 02 2026 Arabian <arabianq@github> - %{version}-%{release}\
|
||||
- Release build}
|
||||
|
||||
|
||||
# disable debuginfo package generation (debugsourcefiles.list is empty for Rust)
|
||||
%global debug_package %{nil}
|
||||
|
||||
|
||||
Name: pwsp
|
||||
Version: 1.11.0
|
||||
Version: 1.14.0
|
||||
Release: %autorelease
|
||||
Summary: Lets you play audio files through your microphone
|
||||
|
||||
@@ -16,11 +25,23 @@ Source: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags
|
||||
BuildRequires: rust
|
||||
BuildRequires: cargo
|
||||
BuildRequires: pipewire-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
%else
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: openssl-devel
|
||||
%endif
|
||||
BuildRequires: clang-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: pkgconf-pkg-config
|
||||
BuildRequires: pkgconfig
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1500
|
||||
BuildRequires: gcc13-c++
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
%global _description %{expand:
|
||||
PWSP lets you play audio files through your microphone. Has both CLI and
|
||||
@@ -32,8 +53,13 @@ GUI clients.}
|
||||
%autosetup -n pipewire-soundpad-%{version} -p1
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1500
|
||||
export CC=gcc-13
|
||||
export CXX=g++-13
|
||||
%endif
|
||||
cargo build --release --locked
|
||||
|
||||
|
||||
%install
|
||||
install -Dm755 target/release/pwsp-cli %{buildroot}%{_bindir}/pwsp-cli
|
||||
install -Dm755 target/release/pwsp-daemon %{buildroot}%{_bindir}/pwsp-daemon
|
||||
@@ -42,7 +68,16 @@ install -Dm755 target/release/pwsp-gui %{buildroot}%{_bindir}/pwsp-gui
|
||||
install -Dm644 pwsp-gui/assets/pwsp-gui.desktop %{buildroot}%{_datadir}/applications/pwsp.desktop
|
||||
install -Dm644 pwsp-gui/assets/icon.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/pwsp.png
|
||||
|
||||
install -Dm644 pwsp-gui/assets/pwsp-daemon.service %{buildroot}/usr/lib/systemd/user/pwsp-daemon.service
|
||||
install -Dm644 pwsp-daemon/assets/pwsp-daemon.service %{buildroot}/usr/lib/systemd/user/pwsp-daemon.service
|
||||
|
||||
%post
|
||||
%systemd_user_post pwsp-daemon.service
|
||||
|
||||
%preun
|
||||
%systemd_user_preun pwsp-daemon.service
|
||||
|
||||
%postun
|
||||
%systemd_user_postun_with_restart pwsp-daemon.service
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
|
||||
@@ -69,6 +69,8 @@ enum Actions {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Daemon configuration
|
||||
SaveDaemonConfig,
|
||||
/// Play a sound by hotkey slot name
|
||||
PlayHotkey { slot: String },
|
||||
/// Remove the hotkey slot
|
||||
@@ -86,6 +88,8 @@ enum GetCommands {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Volume multiplier for all tracks
|
||||
VolumeMultiplier,
|
||||
/// Playback position (in seconds)
|
||||
Position {
|
||||
#[clap(short, long)]
|
||||
@@ -106,6 +110,8 @@ enum GetCommands {
|
||||
Inputs,
|
||||
/// Version of the daemon
|
||||
DaemonVersion,
|
||||
/// Daemon configuration
|
||||
DaemonConfig,
|
||||
/// Full player state
|
||||
FullState,
|
||||
/// All hotkey slots
|
||||
@@ -120,6 +126,8 @@ enum SetCommands {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Volume multiplier for all tracks
|
||||
VolumeMultiplier { volume: f32 },
|
||||
/// Playback position (in seconds)
|
||||
Position {
|
||||
position: f32,
|
||||
@@ -165,6 +173,7 @@ async fn main() -> Result<()> {
|
||||
concurrent,
|
||||
} => Request::play(&file_path.to_string_lossy(), concurrent),
|
||||
Actions::ToggleLoop { id } => Request::toggle_loop(id),
|
||||
Actions::SaveDaemonConfig => Request::save_daemon_config(),
|
||||
Actions::PlayHotkey { slot } => Request::play_hotkey(&slot),
|
||||
Actions::ClearHotkey { slot } => Request::clear_hotkey(&slot),
|
||||
Actions::ClearHotkeyKey { slot } => Request::clear_hotkey_key(&slot),
|
||||
@@ -172,6 +181,7 @@ async fn main() -> Result<()> {
|
||||
Commands::Get { parameter } => match parameter {
|
||||
GetCommands::IsPaused => Request::get_is_paused(),
|
||||
GetCommands::Volume { id } => Request::get_volume(id),
|
||||
GetCommands::VolumeMultiplier => Request::get_volume_multiplier(),
|
||||
GetCommands::Position { id } => Request::get_position(id),
|
||||
GetCommands::Duration { id } => Request::get_duration(id),
|
||||
GetCommands::State => Request::get_state(),
|
||||
@@ -179,11 +189,13 @@ async fn main() -> Result<()> {
|
||||
GetCommands::Input => Request::get_input(),
|
||||
GetCommands::Inputs => Request::get_inputs(),
|
||||
GetCommands::DaemonVersion => Request::get_daemon_version(),
|
||||
GetCommands::DaemonConfig => Request::get_daemon_config(),
|
||||
GetCommands::FullState => Request::get_full_state(),
|
||||
GetCommands::Hotkeys => Request::get_hotkeys(),
|
||||
},
|
||||
Commands::Set { parameter } => match parameter {
|
||||
SetCommands::Volume { volume, id } => Request::set_volume(volume, id),
|
||||
SetCommands::VolumeMultiplier { volume } => Request::set_volume_multiplier(volume),
|
||||
SetCommands::Position { position, id } => Request::seek(position, id),
|
||||
SetCommands::Input { name } => Request::set_input(&name),
|
||||
SetCommands::Loop { enabled, id } => Request::set_loop(&enabled, id),
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
[Unit]
|
||||
Description=Pipewire Soundpad Daemon
|
||||
Requires=pipewire.service
|
||||
After=pipewire.service
|
||||
PartOf=graphical-session.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/pwsp-daemon
|
||||
Restart=on-failure
|
||||
RestartSec=3
|
||||
RuntimeDirectory=pwsp
|
||||
SyslogIdentifier=pwsp-daemon
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
@@ -28,7 +28,10 @@ async fn main() -> Result<()> {
|
||||
}
|
||||
|
||||
get_daemon_config(); // Initialize daemon config
|
||||
create_virtual_mic()?;
|
||||
|
||||
// Virtual mic object must be kept alive by some variable until daemon exits
|
||||
let _virtual_mic = create_virtual_mic().await?;
|
||||
|
||||
if let Err(err) = get_audio_player().await {
|
||||
eprintln!("Failed to initialize audio player: {}", err);
|
||||
} // Initialize audio player
|
||||
|
||||
+6
-1
@@ -20,6 +20,7 @@ anyhow.workspace = true
|
||||
|
||||
serde.workspace = true
|
||||
serde_json.workspace = true
|
||||
dirs.workspace = true
|
||||
|
||||
egui.workspace = true
|
||||
eframe.workspace = true
|
||||
@@ -35,6 +36,10 @@ reqwest.workspace = true
|
||||
percent-encoding.workspace = true
|
||||
|
||||
[package.metadata.deb]
|
||||
name = "pwsp"
|
||||
section = "sound"
|
||||
priority = "optional"
|
||||
maintainer-scripts = "maintainer-scripts"
|
||||
assets = [
|
||||
[
|
||||
"target/release/pwsp-daemon",
|
||||
@@ -62,7 +67,7 @@ assets = [
|
||||
"644",
|
||||
],
|
||||
[
|
||||
"assets/pwsp-daemon.service",
|
||||
"../pwsp-daemon/assets/pwsp-daemon.service",
|
||||
"usr/lib/systemd/user/pwsp-daemon.service",
|
||||
"644",
|
||||
],
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
[Unit]
|
||||
Description=Pipewire Soundpad Daemon
|
||||
After=pipewire.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/pwsp-daemon
|
||||
Restart=no
|
||||
RuntimeDirectory=pwsp
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
@@ -70,6 +70,61 @@ kz = "Жою"
|
||||
he = "הסר"
|
||||
pt-BR = "Remover"
|
||||
|
||||
[gui.context.dirs.sort_by]
|
||||
en = "Sort by"
|
||||
ru = "Сортировка"
|
||||
es = "Ordenar por"
|
||||
fr = "Trier par"
|
||||
zh = "排序方式"
|
||||
ar = "ترتيب حسب"
|
||||
kz = "Сұрыптау"
|
||||
he = "מיין לפי"
|
||||
pt-BR = "Ordenar por"
|
||||
|
||||
[gui.sort.alpha_asc]
|
||||
en = "Alphabetical (A-Z)"
|
||||
ru = "По алфавиту (А-Я)"
|
||||
es = "Alfabético (A-Z)"
|
||||
fr = "Alphabétique (A-Z)"
|
||||
zh = "字母顺序 (A-Z)"
|
||||
ar = "أبجدي (A-Z)"
|
||||
kz = "Әліпби бойынша (А-Я)"
|
||||
he = "אלפביתי (A-Z)"
|
||||
pt-BR = "Alfabético (A-Z)"
|
||||
|
||||
[gui.sort.alpha_desc]
|
||||
en = "Alphabetical (Z-A)"
|
||||
ru = "По алфавиту (Я-А)"
|
||||
es = "Alfabético (Z-A)"
|
||||
fr = "Alphabétique (Z-A)"
|
||||
zh = "字母顺序 (Z-A)"
|
||||
ar = "أبجدي (Z-A)"
|
||||
kz = "Әліпби бойынша (Я-А)"
|
||||
he = "אלפביתי (Z-A)"
|
||||
pt-BR = "Alfabético (Z-A)"
|
||||
|
||||
[gui.sort.date_newest]
|
||||
en = "Date modified (Newest first)"
|
||||
ru = "Дата изменения (Сначала новые)"
|
||||
es = "Fecha de modificación (Más nuevo primero)"
|
||||
fr = "Date de modification (Plus récent en premier)"
|
||||
zh = "修改日期 (最新优先)"
|
||||
ar = "تاريخ التعديل (الأحدث أولاً)"
|
||||
kz = "Өзгертілген күні (Жаңалары бірінші)"
|
||||
he = "תאריך שינוי (החדש ביותר ראשון)"
|
||||
pt-BR = "Data de modificação (Mais novo primeiro)"
|
||||
|
||||
[gui.sort.date_oldest]
|
||||
en = "Date modified (Oldest first)"
|
||||
ru = "Дата изменения (Сначала старые)"
|
||||
es = "Fecha de modificación (Más antiguo primero)"
|
||||
fr = "Date de modification (Plus ancien en premier)"
|
||||
zh = "修改日期 (最旧优先)"
|
||||
ar = "تاريخ التعديل (الأقدم أولاً)"
|
||||
kz = "Өзгертілген күні (Ескілері бірінші)"
|
||||
he = "תאריך שינוי (הישן ביותר ראשון)"
|
||||
pt-BR = "Data de modificação (Mais antigo primeiro)"
|
||||
|
||||
[gui.context.files.play_solo]
|
||||
en = "Play Solo"
|
||||
ru = "Играть"
|
||||
@@ -125,6 +180,17 @@ kz = "Ыстық пернені тағайындау"
|
||||
he = "הקצה מקש קיצור"
|
||||
pt-BR = "Definir tecla de atalho"
|
||||
|
||||
[gui.context.files.copy_cli_command]
|
||||
en = "Copy PWSP-CLI command"
|
||||
ru = "Скопировать команду для PWSP-CLI"
|
||||
es = "Copiar comando de PWSP-CLI"
|
||||
fr = "Copier la commande PWSP-CLI"
|
||||
zh = "复制 PWSP-CLI 命令"
|
||||
ar = "نسخ أمر PWSP-CLI"
|
||||
kz = "PWSP-CLI командасын көшіру"
|
||||
he = "העתק פקודת PWSP-CLI"
|
||||
pt-BR = "Copiar comando PWSP-CLI"
|
||||
|
||||
# ----------------
|
||||
# Settings
|
||||
# ----------------
|
||||
@@ -151,6 +217,28 @@ kz = "Әрқашан дыбыс деңгейін есте сақтау"
|
||||
he = "זכור תמיד עוצמת קול"
|
||||
pt-BR = "Lembrar volume"
|
||||
|
||||
[gui.settings.remember_volume_multiplier]
|
||||
en = "Always remember volume multiplier"
|
||||
ru = "Всегда запоминать множитель громкости"
|
||||
es = "Recordar siempre el multiplicador de volumen"
|
||||
fr = "Toujours se souvenir du multiplicateur de volume"
|
||||
zh = "始终记住音量乘数"
|
||||
ar = "تذكر ضرب الصوت دائمًا"
|
||||
kz = "Әрқашан дыбыс деңгейін есте сақтау"
|
||||
he = "זכור תמיד עוצמת קול"
|
||||
pt-BR = "Lembrar volume"
|
||||
|
||||
[gui.settings.volume_multiplier]
|
||||
en = "Volume multiplier"
|
||||
ru = "Множитель громкости"
|
||||
es = "Multiplicador de volumen"
|
||||
fr = "Multiplicateur de volume"
|
||||
zh = "音量乘数"
|
||||
ar = "ضرب الصوت"
|
||||
kz = "Дыбыс деңгейі"
|
||||
he = "עוצמת קול"
|
||||
pt-BR = "Volume"
|
||||
|
||||
[gui.settings.remember_mic]
|
||||
en = "Always remember microphone"
|
||||
ru = "Всегда запоминать микрофон"
|
||||
@@ -265,6 +353,17 @@ kz = "Ыстық пернелерді іздеу..."
|
||||
he = "חפש מקשי קיצור..."
|
||||
pt-BR = "Buscar atalhos..."
|
||||
|
||||
[gui.search_truncated_warning]
|
||||
en = "... and %{count} more results"
|
||||
ru = "... и ещё %{count} результатов"
|
||||
es = "... y %{count} resultados más"
|
||||
fr = "... et %{count} résultats de plus"
|
||||
zh = "... 还有 %{count} 个结果"
|
||||
ar = "... و %{count} نتائج أخرى"
|
||||
kz = "... және тағы %{count} нәтиже"
|
||||
he = "... ועוד %{count} תוצאות"
|
||||
pt-BR = "... e mais %{count} resultados"
|
||||
|
||||
[gui.hotkeys.add_command_select]
|
||||
en = "Add Command"
|
||||
ru = "Добавить команду"
|
||||
|
||||
Executable
+21
@@ -0,0 +1,21 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
if [ "$1" = "configure" ]; then
|
||||
if [ -x "/usr/bin/systemctl" ]; then
|
||||
systemctl --global enable pwsp-daemon.service || true
|
||||
|
||||
for uid_dir in /run/user/*; do
|
||||
if [ -d "$uid_dir/systemd" ]; then
|
||||
uid=$(basename "$uid_dir")
|
||||
if [ "$uid" != "0" ]; then
|
||||
username=$(id -un "$uid" 2>/dev/null) || continue
|
||||
su -s /bin/sh -c "XDG_RUNTIME_DIR=$uid_dir systemctl --user daemon-reload" "$username" || true
|
||||
su -s /bin/sh -c "XDG_RUNTIME_DIR=$uid_dir systemctl --user try-restart pwsp-daemon.service" "$username" || true
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
exit 0
|
||||
Executable
+18
@@ -0,0 +1,18 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
if [ "$1" = "remove" ]; then
|
||||
if [ -x "/usr/bin/systemctl" ]; then
|
||||
for uid_dir in /run/user/*; do
|
||||
if [ -d "$uid_dir/systemd" ]; then
|
||||
uid=$(basename "$uid_dir")
|
||||
if [ "$uid" != "0" ]; then
|
||||
username=$(id -un "$uid" 2>/dev/null) || continue
|
||||
su -s /bin/sh -c "XDG_RUNTIME_DIR=$uid_dir systemctl --user daemon-reload" "$username" || true
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
exit 0
|
||||
Executable
+20
@@ -0,0 +1,20 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
|
||||
if [ -x "/usr/bin/systemctl" ]; then
|
||||
systemctl --global disable pwsp-daemon.service || true
|
||||
|
||||
for uid_dir in /run/user/*; do
|
||||
if [ -d "$uid_dir/systemd" ]; then
|
||||
uid=$(basename "$uid_dir")
|
||||
if [ "$uid" != "0" ]; then
|
||||
username=$(id -un "$uid" 2>/dev/null) || continue
|
||||
su -s /bin/sh -c "XDG_RUNTIME_DIR=$uid_dir systemctl --user stop pwsp-daemon.service" "$username" || true
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
exit 0
|
||||
@@ -92,7 +92,7 @@ impl SoundpadGui {
|
||||
}
|
||||
|
||||
pub fn handle_input(&mut self, ctx: &Context) {
|
||||
let _modifiers = self.modifiers(ctx);
|
||||
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
|
||||
@@ -185,14 +185,15 @@ impl SoundpadGui {
|
||||
}
|
||||
|
||||
// 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;
|
||||
}
|
||||
if modifiers.ctrl && self.key_pressed(ctx, Key::F) {
|
||||
self.app_state.force_focus_search = true;
|
||||
}
|
||||
|
||||
// Unfocus search field
|
||||
if search_focused && self.key_pressed(ctx, Key::Escape) {
|
||||
ctx.memory_mut(|m| {
|
||||
m.request_focus(Id::NULL);
|
||||
});
|
||||
}
|
||||
|
||||
// Check for hotkey chord triggers
|
||||
|
||||
+209
-58
@@ -3,28 +3,30 @@ mod update;
|
||||
mod views;
|
||||
|
||||
use anyhow::{Result, anyhow};
|
||||
use eframe::{HardwareAcceleration, NativeOptions, icon_data::from_png_bytes, run_native};
|
||||
use eframe::{NativeOptions, icon_data::from_png_bytes, run_native};
|
||||
use egui::{Context, FontData, FontDefinitions, FontFamily, FontTweak, Vec2, ViewportBuilder};
|
||||
use itertools::Itertools;
|
||||
use pwsp_lib::{
|
||||
types::{
|
||||
audio_player::PlayerState,
|
||||
config::GuiConfig,
|
||||
config::HotkeyConfig,
|
||||
config::{GuiConfig, HotkeyConfig},
|
||||
gui::{AppState, AudioPlayerState},
|
||||
socket::Request,
|
||||
},
|
||||
utils::{
|
||||
daemon::get_daemon_config,
|
||||
gui::{get_gui_config, make_request_async, make_request_sync, start_app_state_thread},
|
||||
utils::gui::{
|
||||
get_daemon_config, get_gui_config, make_request_async, make_request_sync,
|
||||
start_app_state_thread, update_daemon_config,
|
||||
},
|
||||
};
|
||||
use rfd::FileDialog;
|
||||
use std::{
|
||||
cmp::Ordering,
|
||||
collections::{HashMap, HashSet},
|
||||
fs,
|
||||
hash::{DefaultHasher, Hash, Hasher},
|
||||
path::{Path, PathBuf},
|
||||
sync::{Arc, Mutex},
|
||||
thread,
|
||||
};
|
||||
use system_fonts::{FontStyle, FoundFontSource, find_for_locale};
|
||||
|
||||
@@ -32,6 +34,16 @@ const SUPPORTED_EXTENSIONS: [&str; 13] = [
|
||||
"mp3", "wav", "ogg", "flac", "mp4", "m4a", "aac", "mov", "mkv", "mka", "webm", "avi", "opus",
|
||||
];
|
||||
|
||||
fn get_cache_file_for(path: &Path) -> PathBuf {
|
||||
let mut hasher = DefaultHasher::new();
|
||||
path.hash(&mut hasher);
|
||||
let hash = hasher.finish();
|
||||
dirs::cache_dir()
|
||||
.unwrap_or_else(|| PathBuf::from("/tmp"))
|
||||
.join("pwsp")
|
||||
.join(format!("{:x}.json", hash))
|
||||
}
|
||||
|
||||
struct SoundpadGui {
|
||||
pub app_state: AppState,
|
||||
pub config: GuiConfig,
|
||||
@@ -107,19 +119,119 @@ impl SoundpadGui {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn open_dir(&mut self, path: &PathBuf) {
|
||||
pub fn open_dir(&mut self, path: &PathBuf, ctx: Option<Context>, force_rescan: bool) {
|
||||
self.app_state.current_dir = Some(path.clone());
|
||||
match path.read_dir() {
|
||||
Ok(read_dir) => {
|
||||
self.app_state.listed_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.listed_files.clear();
|
||||
|
||||
if !self.app_state.dir_cache.contains_key(path) || force_rescan {
|
||||
match fs::read_dir(path) {
|
||||
Ok(read_dir) => {
|
||||
let files = read_dir
|
||||
.filter_map(|res| res.ok())
|
||||
.map(|entry| entry.path())
|
||||
.collect::<Vec<_>>();
|
||||
self.app_state.listed_files = files.iter().cloned().collect();
|
||||
self.app_state.dir_cache.insert(path.clone(), files);
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Failed to read directory {:?}: {}", path, e);
|
||||
self.app_state.listed_files.clear();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
self.app_state.listed_files = self
|
||||
.app_state
|
||||
.dir_cache
|
||||
.get(path)
|
||||
.unwrap()
|
||||
.clone()
|
||||
.into_iter()
|
||||
.collect();
|
||||
}
|
||||
|
||||
let is_scanning = self.app_state.scanning_dirs.lock().unwrap().contains(path);
|
||||
let is_cached = self.app_state.recursive_files_cache.contains_key(path);
|
||||
let has_scanned_this_session = self.app_state.scanned_this_session.contains(path);
|
||||
|
||||
let needs_scan = force_rescan || !has_scanned_this_session || !is_cached;
|
||||
|
||||
if !is_scanning && needs_scan {
|
||||
self.app_state
|
||||
.scanning_dirs
|
||||
.lock()
|
||||
.unwrap()
|
||||
.insert(path.clone());
|
||||
self.app_state.scanned_this_session.insert(path.clone());
|
||||
|
||||
let finished_scans = self.app_state.finished_scans.clone();
|
||||
let scanning_dirs = self.app_state.scanning_dirs.clone();
|
||||
let path_clone = path.clone();
|
||||
|
||||
thread::spawn(move || {
|
||||
let cache_file = get_cache_file_for(&path_clone);
|
||||
|
||||
// 1. Try to load from disk cache if we don't have it in memory yet
|
||||
if !is_cached
|
||||
&& let Ok(data) = fs::read_to_string(&cache_file)
|
||||
&& let Ok((all_files, dir_updates)) = serde_json::from_str::<(
|
||||
Vec<PathBuf>,
|
||||
HashMap<PathBuf, Vec<PathBuf>>,
|
||||
)>(&data)
|
||||
{
|
||||
finished_scans.lock().unwrap().push((
|
||||
path_clone.clone(),
|
||||
all_files,
|
||||
dir_updates,
|
||||
));
|
||||
if let Some(ctx) = ctx.as_ref() {
|
||||
ctx.request_repaint();
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Scan recursively
|
||||
let mut all_files = Vec::new();
|
||||
let mut dir_updates = HashMap::new();
|
||||
let mut dirs_to_visit = vec![path_clone.clone()];
|
||||
|
||||
while let Some(dir) = dirs_to_visit.pop() {
|
||||
if let Ok(entries) = fs::read_dir(&dir) {
|
||||
let mut children = Vec::new();
|
||||
for entry in entries.filter_map(|e| e.ok()) {
|
||||
let p = entry.path();
|
||||
if p.is_dir() {
|
||||
dirs_to_visit.push(p.clone());
|
||||
children.push(p);
|
||||
} else if crate::gui::SUPPORTED_EXTENSIONS.contains(
|
||||
&p.extension()
|
||||
.unwrap_or_default()
|
||||
.to_str()
|
||||
.unwrap_or_default(),
|
||||
) {
|
||||
all_files.push(p.clone());
|
||||
children.push(p);
|
||||
}
|
||||
}
|
||||
dir_updates.insert(dir, children);
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Save to disk cache
|
||||
if let Some(parent) = cache_file.parent() {
|
||||
fs::create_dir_all(parent).ok();
|
||||
}
|
||||
if let Ok(json) = serde_json::to_string(&(all_files.clone(), dir_updates.clone())) {
|
||||
fs::write(&cache_file, json).ok();
|
||||
}
|
||||
|
||||
// 4. Send to UI
|
||||
finished_scans
|
||||
.lock()
|
||||
.unwrap()
|
||||
.push((path_clone.clone(), all_files, dir_updates));
|
||||
scanning_dirs.lock().unwrap().remove(&path_clone);
|
||||
if let Some(ctx) = ctx {
|
||||
ctx.request_repaint();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,10 +242,11 @@ impl SoundpadGui {
|
||||
pub fn set_input(&mut self, name: String) {
|
||||
make_request_async(Request::set_input(&name));
|
||||
|
||||
if self.config.save_input {
|
||||
let mut daemon_config = get_daemon_config();
|
||||
if self.config.save_input
|
||||
&& let Ok(mut daemon_config) = get_daemon_config()
|
||||
{
|
||||
daemon_config.default_input_name = Some(name);
|
||||
daemon_config.save_to_file().ok();
|
||||
update_daemon_config(&daemon_config).ok();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,8 +270,22 @@ impl SoundpadGui {
|
||||
make_request_async(Request::play_hotkey(slot));
|
||||
}
|
||||
|
||||
pub fn get_filtered_files(&self) -> Vec<PathBuf> {
|
||||
pub fn get_filtered_files(
|
||||
&self,
|
||||
matching_dirs: &HashSet<PathBuf>,
|
||||
matching_files: &HashSet<PathBuf>,
|
||||
) -> Vec<PathBuf> {
|
||||
let search_query = self.app_state.search_query.to_lowercase();
|
||||
let search_query = search_query.trim();
|
||||
|
||||
let mut files: Vec<PathBuf> = self.app_state.listed_files.iter().cloned().collect();
|
||||
let sort_order = self
|
||||
.app_state
|
||||
.current_dir
|
||||
.as_ref()
|
||||
.map(|d| self.config.get_sort_order(d))
|
||||
.unwrap_or_default();
|
||||
|
||||
files.sort_by(|a, b| {
|
||||
let a_is_dir = a.is_dir();
|
||||
let b_is_dir = b.is_dir();
|
||||
@@ -167,52 +294,62 @@ impl SoundpadGui {
|
||||
} else if !a_is_dir && b_is_dir {
|
||||
Ordering::Greater
|
||||
} else {
|
||||
a.cmp(b)
|
||||
sort_order.compare(a, b)
|
||||
}
|
||||
});
|
||||
|
||||
let search_query = self.app_state.search_query.to_lowercase();
|
||||
let search_query = search_query.trim();
|
||||
let is_cached = self
|
||||
.app_state
|
||||
.current_dir
|
||||
.as_ref()
|
||||
.is_some_and(|d| self.app_state.recursive_files_cache.contains_key(d));
|
||||
|
||||
files
|
||||
.into_iter()
|
||||
.filter(|entry_path| {
|
||||
if entry_path.is_dir() {
|
||||
return true;
|
||||
}
|
||||
|
||||
if !SUPPORTED_EXTENSIONS.contains(
|
||||
&entry_path
|
||||
.extension()
|
||||
.unwrap_or_default()
|
||||
.to_str()
|
||||
.unwrap_or_default(),
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if !search_query.is_empty() {
|
||||
let file_name = entry_path
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
|
||||
if !file_name.to_lowercase().contains(search_query) {
|
||||
if !search_query.is_empty() && is_cached {
|
||||
files
|
||||
.into_iter()
|
||||
.filter(|p| {
|
||||
if p.is_dir() {
|
||||
matching_dirs.contains(p)
|
||||
} else {
|
||||
matching_files.contains(p)
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
} else {
|
||||
files
|
||||
.into_iter()
|
||||
.filter(|entry_path| {
|
||||
if !entry_path.is_dir()
|
||||
&& !SUPPORTED_EXTENSIONS.contains(
|
||||
&entry_path
|
||||
.extension()
|
||||
.unwrap_or_default()
|
||||
.to_str()
|
||||
.unwrap_or_default(),
|
||||
)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
true
|
||||
})
|
||||
.collect()
|
||||
if !search_query.is_empty() {
|
||||
let file_name =
|
||||
entry_path.file_name().unwrap_or_default().to_string_lossy();
|
||||
if !file_name.to_lowercase().contains(search_query) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
true
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn add_font(font_name: &str, font_bytes: &[u8], fonts: &mut FontDefinitions) -> Result<()> {
|
||||
let font_data = FontData::from_owned(font_bytes.to_vec()).tweak(FontTweak {
|
||||
scale: 1.0,
|
||||
hinting_override: Some(true),
|
||||
hinting: Some(true),
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
@@ -258,9 +395,7 @@ pub async fn run() -> Result<()> {
|
||||
const ICON: &[u8] = include_bytes!("../../assets/icon.png");
|
||||
|
||||
let options = NativeOptions {
|
||||
vsync: true,
|
||||
centered: true,
|
||||
hardware_acceleration: HardwareAcceleration::Preferred,
|
||||
|
||||
viewport: ViewportBuilder::default()
|
||||
.with_app_id("ru.arabianq.pwsp")
|
||||
@@ -324,15 +459,31 @@ mod tests {
|
||||
// On the real OS filesystem, these paths don't exist, so they are treated as files.
|
||||
// Unsupported extensions (like .txt) will be filtered out.
|
||||
// So we expect only file_b and file_c, sorted alphabetically.
|
||||
let filtered = gui.get_filtered_files();
|
||||
let empty_dirs = HashSet::new();
|
||||
let empty_files = HashSet::new();
|
||||
let filtered = gui.get_filtered_files(&empty_dirs, &empty_files);
|
||||
assert_eq!(filtered.len(), 2);
|
||||
assert_eq!(filtered[0], file_b);
|
||||
assert_eq!(filtered[1], file_c);
|
||||
|
||||
// Test search query
|
||||
gui.app_state.search_query = "c_fi".to_string();
|
||||
let filtered_search = gui.get_filtered_files();
|
||||
let filtered_search = gui.get_filtered_files(&empty_dirs, &empty_files);
|
||||
assert_eq!(filtered_search.len(), 1);
|
||||
assert_eq!(filtered_search[0], file_c);
|
||||
|
||||
// Test sort order descending
|
||||
gui.app_state.current_dir = Some(PathBuf::from("dummy_dir"));
|
||||
gui.config.dirs_settings.insert(
|
||||
PathBuf::from("dummy_dir"),
|
||||
pwsp_lib::types::config::DirSettings {
|
||||
sort_order: pwsp_lib::types::config::SortOrder::AlphabeticalDesc,
|
||||
},
|
||||
);
|
||||
gui.app_state.search_query = String::new();
|
||||
let filtered_desc = gui.get_filtered_files(&empty_dirs, &empty_files);
|
||||
assert_eq!(filtered_desc.len(), 2);
|
||||
assert_eq!(filtered_desc[0], file_c);
|
||||
assert_eq!(filtered_desc[1], file_b);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ use eframe::{App, Frame as EFrame};
|
||||
use egui::{CentralPanel, Context, ThemePreference};
|
||||
use pwsp_lib::{
|
||||
types::{config::PreferredTheme, socket::Request},
|
||||
utils::{daemon::get_daemon_config, gui::make_request_async},
|
||||
utils::gui::{get_daemon_config, make_request_async, update_daemon_config},
|
||||
};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
@@ -85,10 +85,29 @@ impl App for SoundpadGui {
|
||||
self.app_state.ignore_volume_update_until =
|
||||
Some(Instant::now() + Duration::from_millis(300));
|
||||
|
||||
if self.config.save_volume {
|
||||
let mut daemon_config = get_daemon_config();
|
||||
if self.config.save_volume
|
||||
&& let Ok(mut daemon_config) = get_daemon_config()
|
||||
{
|
||||
daemon_config.default_volume = Some(self.app_state.volume_slider_value);
|
||||
daemon_config.save_to_file().ok();
|
||||
update_daemon_config(&daemon_config).ok();
|
||||
}
|
||||
}
|
||||
|
||||
if self.app_state.volume_multiplier_dragged {
|
||||
make_request_async(Request::set_volume_multiplier(
|
||||
self.app_state.volume_multiplier_slider_value,
|
||||
));
|
||||
|
||||
self.app_state.volume_multiplier_dragged = false;
|
||||
self.app_state.ignore_volume_multiplier_update_until =
|
||||
Some(Instant::now() + Duration::from_millis(300));
|
||||
|
||||
if self.config.save_volume_multiplier
|
||||
&& let Ok(mut daemon_config) = get_daemon_config()
|
||||
{
|
||||
daemon_config.default_volume_multiplier =
|
||||
Some(self.app_state.volume_multiplier_slider_value);
|
||||
update_daemon_config(&daemon_config).ok();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,7 +140,7 @@ impl App for SoundpadGui {
|
||||
|
||||
fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut EFrame) {
|
||||
// Draw UI
|
||||
CentralPanel::default().show_inside(ui, |ui| {
|
||||
CentralPanel::default().show(ui, |ui| {
|
||||
if !self.audio_player_state.is_daemon_running {
|
||||
self.draw_waiting_for_daemon(ui);
|
||||
return;
|
||||
|
||||
+307
-56
@@ -5,9 +5,12 @@ use egui::{
|
||||
};
|
||||
use egui_dnd::dnd;
|
||||
use egui_material_icons::icons::*;
|
||||
use pwsp_lib::types::{gui::AppState, gui::AudioPlayerState};
|
||||
use pwsp_lib::types::{
|
||||
config::{GuiConfig, SortOrder},
|
||||
gui::{AppState, AudioPlayerState},
|
||||
};
|
||||
use rust_i18n::t;
|
||||
use std::{cmp::Ordering, path::Path, path::PathBuf};
|
||||
use std::{cmp::Ordering, collections::HashSet, path::Path, path::PathBuf};
|
||||
|
||||
pub(crate) enum FileAction {
|
||||
Play(PathBuf, bool),
|
||||
@@ -135,13 +138,72 @@ impl SoundpadGui {
|
||||
{
|
||||
self.app_state.dirs_to_remove.insert(path.clone());
|
||||
}
|
||||
|
||||
ui.separator();
|
||||
ui.label(t!("gui.context.dirs.sort_by"));
|
||||
|
||||
let current_order = self
|
||||
.config
|
||||
.dirs_settings
|
||||
.get(path)
|
||||
.map(|s| s.sort_order)
|
||||
.unwrap_or_default();
|
||||
let mut new_order = None;
|
||||
|
||||
if ui
|
||||
.radio(
|
||||
current_order == SortOrder::AlphabeticalAsc,
|
||||
t!("gui.sort.alpha_asc"),
|
||||
)
|
||||
.clicked()
|
||||
{
|
||||
new_order = Some(SortOrder::AlphabeticalAsc);
|
||||
}
|
||||
if ui
|
||||
.radio(
|
||||
current_order == SortOrder::AlphabeticalDesc,
|
||||
t!("gui.sort.alpha_desc"),
|
||||
)
|
||||
.clicked()
|
||||
{
|
||||
new_order = Some(SortOrder::AlphabeticalDesc);
|
||||
}
|
||||
if ui
|
||||
.radio(
|
||||
current_order == SortOrder::DateModifiedNewest,
|
||||
t!("gui.sort.date_newest"),
|
||||
)
|
||||
.clicked()
|
||||
{
|
||||
new_order = Some(SortOrder::DateModifiedNewest);
|
||||
}
|
||||
if ui
|
||||
.radio(
|
||||
current_order == SortOrder::DateModifiedOldest,
|
||||
t!("gui.sort.date_oldest"),
|
||||
)
|
||||
.clicked()
|
||||
{
|
||||
new_order = Some(SortOrder::DateModifiedOldest);
|
||||
}
|
||||
|
||||
if let Some(order) = new_order {
|
||||
self.config
|
||||
.dirs_settings
|
||||
.entry(path.clone())
|
||||
.or_default()
|
||||
.sort_order = order;
|
||||
self.config.save_to_file().ok();
|
||||
self.app_state.dir_cache.remove(path);
|
||||
self.open_dir(path, Some(ui.ctx().clone()), false);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
self.app_state.dirs = dirs;
|
||||
|
||||
if let Some(path) = dir_to_open {
|
||||
self.open_dir(&path);
|
||||
self.open_dir(&path, Some(ui.ctx().clone()), false);
|
||||
}
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
@@ -165,12 +227,41 @@ impl SoundpadGui {
|
||||
|
||||
fn draw_files_search_field(&mut self, ui: &mut Ui) {
|
||||
ui.horizontal(|ui| {
|
||||
let is_scanning = self
|
||||
.app_state
|
||||
.current_dir
|
||||
.as_ref()
|
||||
.is_some_and(|d| self.app_state.scanning_dirs.lock().unwrap().contains(d));
|
||||
let spinner_width = if is_scanning { 20.0 } else { 0.0 };
|
||||
|
||||
let refresh_button = Button::new(ICON_REFRESH).frame(false);
|
||||
let refresh_width = 24.0;
|
||||
|
||||
let search_field_response = ui.add_sized(
|
||||
[ui.available_width(), 22.0],
|
||||
[
|
||||
f32::max(
|
||||
0.0,
|
||||
ui.available_width() - spinner_width - refresh_width - 8.0,
|
||||
),
|
||||
22.0,
|
||||
],
|
||||
TextEdit::singleline(&mut self.app_state.search_query)
|
||||
.hint_text(t!("gui.search_placeholder")),
|
||||
);
|
||||
|
||||
if is_scanning {
|
||||
ui.spinner();
|
||||
}
|
||||
|
||||
let refresh_response = ui
|
||||
.add_sized([refresh_width, 22.0], refresh_button)
|
||||
.on_hover_text("Refresh");
|
||||
if refresh_response.clicked()
|
||||
&& let Some(dir) = self.app_state.current_dir.clone()
|
||||
{
|
||||
self.open_dir(&dir, Some(ui.ctx().clone()), true);
|
||||
}
|
||||
|
||||
if self.app_state.force_focus_search {
|
||||
search_field_response.request_focus();
|
||||
self.app_state.force_focus_search = false;
|
||||
@@ -185,16 +276,78 @@ impl SoundpadGui {
|
||||
ui.set_min_width(area_size.x);
|
||||
ui.set_min_height(area_size.y);
|
||||
|
||||
let finished = {
|
||||
let mut scans = self.app_state.finished_scans.lock().unwrap();
|
||||
std::mem::take(&mut *scans)
|
||||
};
|
||||
for (top_dir, all_files, dir_updates) in finished {
|
||||
self.app_state
|
||||
.recursive_files_cache
|
||||
.insert(top_dir, all_files);
|
||||
self.app_state.dir_cache.extend(dir_updates);
|
||||
}
|
||||
|
||||
ui.vertical(|ui| {
|
||||
let mut actions = Vec::new();
|
||||
let files = self.get_filtered_files();
|
||||
|
||||
let search_query = self.app_state.search_query.to_lowercase();
|
||||
let search_query = search_query.trim();
|
||||
|
||||
let mut matching_dirs = std::collections::HashSet::new();
|
||||
let mut matching_files = std::collections::HashSet::new();
|
||||
|
||||
if !search_query.is_empty()
|
||||
&& let Some(current_dir) = &self.app_state.current_dir
|
||||
&& let Some(all_files) = self.app_state.recursive_files_cache.get(current_dir)
|
||||
{
|
||||
for file in all_files {
|
||||
if let Ok(rel_path) = file.strip_prefix(current_dir) {
|
||||
let rel_path_str =
|
||||
rel_path.to_string_lossy().to_lowercase().replace("\\", "/");
|
||||
if rel_path_str.contains(search_query) {
|
||||
matching_files.insert(file.clone());
|
||||
let mut p = file.parent();
|
||||
while let Some(parent) = p {
|
||||
if parent == current_dir {
|
||||
break;
|
||||
}
|
||||
matching_dirs.insert(parent.to_path_buf());
|
||||
p = parent.parent();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let max_results = 300;
|
||||
let is_truncated = !search_query.is_empty() && matching_files.len() > max_results;
|
||||
|
||||
let files = self.get_filtered_files(&matching_dirs, &matching_files);
|
||||
let mut rendered_count = 0;
|
||||
for entry_path in files {
|
||||
Self::draw_tree_node(
|
||||
ui,
|
||||
entry_path,
|
||||
&self.config,
|
||||
&mut self.app_state,
|
||||
&self.audio_player_state,
|
||||
&mut actions,
|
||||
&matching_dirs,
|
||||
&matching_files,
|
||||
search_query,
|
||||
&mut rendered_count,
|
||||
max_results,
|
||||
);
|
||||
}
|
||||
|
||||
if is_truncated {
|
||||
ui.add_space(8.0);
|
||||
let text = t!(
|
||||
"gui.search_truncated_warning",
|
||||
count = matching_files.len() - max_results
|
||||
);
|
||||
ui.label(
|
||||
egui::RichText::new(text).color(egui::Color32::from_rgb(200, 150, 50)),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -223,73 +376,120 @@ impl SoundpadGui {
|
||||
});
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn draw_tree_node_dir(
|
||||
ui: &mut Ui,
|
||||
path: std::path::PathBuf,
|
||||
config: &GuiConfig,
|
||||
app_state: &mut AppState,
|
||||
audio_player_state: &AudioPlayerState,
|
||||
actions: &mut Vec<FileAction>,
|
||||
matching_dirs: &std::collections::HashSet<PathBuf>,
|
||||
matching_files: &std::collections::HashSet<PathBuf>,
|
||||
search_query: &str,
|
||||
rendered_count: &mut usize,
|
||||
max_results: usize,
|
||||
) {
|
||||
if *rendered_count >= max_results && !search_query.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
let dir_name = path
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
CollapsingHeader::new(dir_name)
|
||||
.id_salt(&path)
|
||||
.show(ui, |ui| {
|
||||
let children = if let Some(cached) = app_state.dir_cache.get(&path) {
|
||||
cached.clone()
|
||||
} else {
|
||||
let mut read = Vec::new();
|
||||
if let Ok(entries) = std::fs::read_dir(&path) {
|
||||
for entry in entries.filter_map(|e| e.ok()) {
|
||||
read.push(entry.path());
|
||||
}
|
||||
}
|
||||
read.sort_by(|a, b| {
|
||||
let a_is_dir = a.is_dir();
|
||||
let b_is_dir = b.is_dir();
|
||||
if a_is_dir && !b_is_dir {
|
||||
Ordering::Less
|
||||
} else if !a_is_dir && b_is_dir {
|
||||
Ordering::Greater
|
||||
} else {
|
||||
a.cmp(b)
|
||||
}
|
||||
});
|
||||
app_state.dir_cache.insert(path.clone(), read.clone());
|
||||
read
|
||||
};
|
||||
|
||||
let search_query = app_state.search_query.to_lowercase();
|
||||
let search_query = search_query.trim();
|
||||
let id_salt = if search_query.is_empty() {
|
||||
format!("normal_{:?}", path)
|
||||
} else {
|
||||
format!("search_{:?}", path)
|
||||
};
|
||||
|
||||
for child in children {
|
||||
if !child.is_dir() {
|
||||
if !crate::gui::SUPPORTED_EXTENSIONS.contains(
|
||||
&child
|
||||
.extension()
|
||||
.unwrap_or_default()
|
||||
.to_str()
|
||||
.unwrap_or_default(),
|
||||
) {
|
||||
let mut header = CollapsingHeader::new(dir_name).id_salt(id_salt);
|
||||
|
||||
let is_cached = app_state
|
||||
.current_dir
|
||||
.as_ref()
|
||||
.is_some_and(|d| app_state.recursive_files_cache.contains_key(d));
|
||||
if !search_query.is_empty() && is_cached {
|
||||
header = header.default_open(true);
|
||||
}
|
||||
|
||||
header.show(ui, |ui| {
|
||||
let children = if let Some(cached) = app_state.dir_cache.get(&path) {
|
||||
cached.clone()
|
||||
} else {
|
||||
let mut read = Vec::new();
|
||||
if let Ok(entries) = std::fs::read_dir(&path) {
|
||||
for entry in entries.filter_map(|e| e.ok()) {
|
||||
let child_path = entry.path();
|
||||
if !child_path.is_dir()
|
||||
&& !crate::gui::SUPPORTED_EXTENSIONS.contains(
|
||||
&child_path
|
||||
.extension()
|
||||
.unwrap_or_default()
|
||||
.to_str()
|
||||
.unwrap_or_default(),
|
||||
)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if !search_query.is_empty() {
|
||||
let file_name = child
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
if !file_name.to_lowercase().contains(search_query) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
read.push(child_path);
|
||||
}
|
||||
Self::draw_tree_node(ui, child, app_state, audio_player_state, actions);
|
||||
}
|
||||
});
|
||||
let sort_order = config.get_sort_order(&path);
|
||||
read.sort_by(|a, b| {
|
||||
let a_is_dir = a.is_dir();
|
||||
let b_is_dir = b.is_dir();
|
||||
if a_is_dir && !b_is_dir {
|
||||
Ordering::Less
|
||||
} else if !a_is_dir && b_is_dir {
|
||||
Ordering::Greater
|
||||
} else {
|
||||
sort_order.compare(a, b)
|
||||
}
|
||||
});
|
||||
app_state.dir_cache.insert(path.clone(), read.clone());
|
||||
read
|
||||
};
|
||||
|
||||
for child in children {
|
||||
if *rendered_count >= max_results && !search_query.is_empty() {
|
||||
break;
|
||||
}
|
||||
if !search_query.is_empty() && is_cached {
|
||||
if child.is_dir() && !matching_dirs.contains(&child) {
|
||||
continue;
|
||||
}
|
||||
if !child.is_dir() && !matching_files.contains(&child) {
|
||||
continue;
|
||||
}
|
||||
} else if !search_query.is_empty() && !child.is_dir() {
|
||||
let file_name = child
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_lowercase();
|
||||
if !file_name.contains(search_query) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
Self::draw_tree_node(
|
||||
ui,
|
||||
child,
|
||||
config,
|
||||
app_state,
|
||||
audio_player_state,
|
||||
actions,
|
||||
matching_dirs,
|
||||
matching_files,
|
||||
search_query,
|
||||
rendered_count,
|
||||
max_results,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_tree_node_file(
|
||||
@@ -298,7 +498,10 @@ impl SoundpadGui {
|
||||
app_state: &mut AppState,
|
||||
audio_player_state: &AudioPlayerState,
|
||||
actions: &mut Vec<FileAction>,
|
||||
rendered_count: &mut usize,
|
||||
) {
|
||||
*rendered_count += 1;
|
||||
|
||||
let file_name = path
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
@@ -412,21 +615,69 @@ impl SoundpadGui {
|
||||
actions.push(FileAction::AssignHotkey(path.clone()));
|
||||
ui.close();
|
||||
}
|
||||
|
||||
ui.separator();
|
||||
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_FILE_COPY.codepoint,
|
||||
t!("gui.context.files.copy_cli_command")
|
||||
))
|
||||
.clicked()
|
||||
{
|
||||
ui.ctx().copy_text(format!(
|
||||
"pwsp-cli action play \"{}\"",
|
||||
path.to_string_lossy()
|
||||
.replace('\\', "\\\\")
|
||||
.replace('"', "\\\"")
|
||||
));
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn draw_tree_node(
|
||||
ui: &mut Ui,
|
||||
path: std::path::PathBuf,
|
||||
config: &GuiConfig,
|
||||
app_state: &mut AppState,
|
||||
audio_player_state: &AudioPlayerState,
|
||||
actions: &mut Vec<FileAction>,
|
||||
matching_dirs: &HashSet<PathBuf>,
|
||||
matching_files: &HashSet<PathBuf>,
|
||||
search_query: &str,
|
||||
rendered_count: &mut usize,
|
||||
max_results: usize,
|
||||
) {
|
||||
if *rendered_count >= max_results && !search_query.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
if path.is_dir() {
|
||||
Self::draw_tree_node_dir(ui, path, app_state, audio_player_state, actions);
|
||||
Self::draw_tree_node_dir(
|
||||
ui,
|
||||
path,
|
||||
config,
|
||||
app_state,
|
||||
audio_player_state,
|
||||
actions,
|
||||
matching_dirs,
|
||||
matching_files,
|
||||
search_query,
|
||||
rendered_count,
|
||||
max_results,
|
||||
);
|
||||
} else {
|
||||
Self::draw_tree_node_file(ui, path, app_state, audio_player_state, actions);
|
||||
Self::draw_tree_node_file(
|
||||
ui,
|
||||
path,
|
||||
app_state,
|
||||
audio_player_state,
|
||||
actions,
|
||||
rendered_count,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{Align, Button, Color32, ComboBox, Layout, RichText, Ui};
|
||||
use egui::{Align, Button, Color32, ComboBox, Layout, RichText, Slider, Ui};
|
||||
use egui_material_icons::icons::ICON_ARROW_BACK;
|
||||
use pwsp_lib::types::config::PreferredTheme;
|
||||
use rust_i18n::t;
|
||||
@@ -34,6 +34,10 @@ impl SoundpadGui {
|
||||
&mut self.config.save_volume,
|
||||
t!("gui.settings.remember_volume"),
|
||||
);
|
||||
let save_volume_multiplier_response = ui.checkbox(
|
||||
&mut self.config.save_volume_multiplier,
|
||||
t!("gui.settings.remember_volume_multiplier"),
|
||||
);
|
||||
let save_input_response =
|
||||
ui.checkbox(&mut self.config.save_input, t!("gui.settings.remember_mic"));
|
||||
let save_scale_response = ui.checkbox(
|
||||
@@ -46,6 +50,7 @@ impl SoundpadGui {
|
||||
);
|
||||
|
||||
if save_volume_response.changed()
|
||||
|| save_volume_multiplier_response.changed()
|
||||
|| save_input_response.changed()
|
||||
|| save_scale_response.changed()
|
||||
|| pause_on_exit_response.changed()
|
||||
@@ -88,6 +93,39 @@ impl SoundpadGui {
|
||||
}
|
||||
// --------------------------------
|
||||
|
||||
ui.separator();
|
||||
|
||||
// ----------- Sliders ------------
|
||||
// Volume multiplier
|
||||
let should_update_multiplier = !self.app_state.volume_multiplier_dragged
|
||||
&& self
|
||||
.app_state
|
||||
.ignore_volume_multiplier_update_until
|
||||
.map(|t| std::time::Instant::now() > t)
|
||||
.unwrap_or(true);
|
||||
|
||||
if should_update_multiplier {
|
||||
self.app_state.volume_multiplier_slider_value =
|
||||
self.audio_player_state.volume_multiplier;
|
||||
}
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
let slider = Slider::new(
|
||||
&mut self.app_state.volume_multiplier_slider_value,
|
||||
0.01..=3.0,
|
||||
);
|
||||
let response = ui.add(slider);
|
||||
ui.label(t!("gui.settings.volume_multiplier"));
|
||||
|
||||
if response.changed() {
|
||||
// This condition is required to avoid spamming requests while dragging, but to allow changing the value via TextEdit
|
||||
if !response.dragged() || (response.dragged() && response.drag_stopped()) {
|
||||
self.app_state.volume_multiplier_dragged = true;
|
||||
}
|
||||
}
|
||||
});
|
||||
// --------------------------------
|
||||
|
||||
ui.with_layout(Layout::bottom_up(Align::Min), |ui| {
|
||||
ui.label(t!(
|
||||
"gui.settings.version",
|
||||
|
||||
+25
-9
@@ -1,9 +1,13 @@
|
||||
mod gui;
|
||||
|
||||
use anyhow::{Context, Result};
|
||||
use anyhow::{Context, Result, anyhow};
|
||||
use pwsp_lib::utils::gui::ensure_pwsp_audio_dir;
|
||||
use rust_i18n::i18n;
|
||||
use std::{env, path::PathBuf};
|
||||
use std::{
|
||||
env,
|
||||
path::{Path, PathBuf},
|
||||
time::{SystemTime, UNIX_EPOCH},
|
||||
};
|
||||
|
||||
i18n!("locales", fallback = "en");
|
||||
|
||||
@@ -31,19 +35,31 @@ async fn download_audio_from_url(uri: &str) -> Result<PathBuf> {
|
||||
|
||||
let target_url = uri
|
||||
.strip_prefix(prefix)
|
||||
.ok_or_else(|| anyhow::anyhow!("URI does not containt an expected prefix: {}", prefix))?;
|
||||
.ok_or_else(|| anyhow!("URI does not containt an expected prefix: {}", prefix))?;
|
||||
|
||||
let file_name_encoded = target_url
|
||||
.split('/')
|
||||
.next_back()
|
||||
.unwrap_or("downloaded_audio.mp3");
|
||||
let file_name_encoded = match target_url.split('/').next_back() {
|
||||
Some(path) => path.to_string(),
|
||||
None => {
|
||||
let id = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.expect("Time went back")
|
||||
.as_nanos();
|
||||
format!("downloaded_audio_{}.mp3", id)
|
||||
}
|
||||
};
|
||||
|
||||
let file_name = percent_encoding::percent_decode_str(file_name_encoded)
|
||||
let file_name = percent_encoding::percent_decode_str(&file_name_encoded.clone())
|
||||
.decode_utf8()
|
||||
.unwrap_or_else(|_| file_name_encoded.into())
|
||||
.into_owned();
|
||||
|
||||
let save_path = ensure_pwsp_audio_dir().join(file_name);
|
||||
let normalized_file_name = file_name.replace('\\', "/");
|
||||
let sanitized_file_name = Path::new(&normalized_file_name)
|
||||
.file_name()
|
||||
.and_then(|n| n.to_str())
|
||||
.unwrap_or("downloaded_audio.mp3");
|
||||
|
||||
let save_path = ensure_pwsp_audio_dir()?.join(sanitized_file_name);
|
||||
|
||||
let response = reqwest::get(target_url)
|
||||
.await?
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use crate::{
|
||||
types::pipewire::{DeviceType, Terminate},
|
||||
types::pipewire::DeviceType,
|
||||
utils::{
|
||||
daemon::get_daemon_config,
|
||||
pipewire::{create_link, get_device, link_player_to_virtual_mic},
|
||||
daemon::with_daemon_config,
|
||||
pipewire::{PwTerminator, create_link, get_device, link_player_to_virtual_mic},
|
||||
},
|
||||
};
|
||||
use anyhow::{Result, anyhow};
|
||||
@@ -40,6 +40,7 @@ pub struct FullState {
|
||||
pub state: PlayerState,
|
||||
pub tracks: Vec<TrackInfo>,
|
||||
pub volume: f32,
|
||||
pub volume_multiplier: f32,
|
||||
pub current_input: String,
|
||||
pub all_inputs: HashMap<String, String>,
|
||||
}
|
||||
@@ -58,17 +59,24 @@ pub struct AudioPlayer {
|
||||
pub tracks: HashMap<u32, PlayingSound>,
|
||||
pub next_id: u32,
|
||||
|
||||
input_link_sender: Option<pipewire::channel::Sender<Terminate>>,
|
||||
player_link_sender: Option<pipewire::channel::Sender<Terminate>>,
|
||||
input_link_sender: Option<PwTerminator>,
|
||||
player_link_sender: Option<PwTerminator>,
|
||||
pub input_device_name: Option<String>,
|
||||
|
||||
pub volume: f32, // Master volume
|
||||
pub volume_multiplier: f32,
|
||||
}
|
||||
|
||||
impl AudioPlayer {
|
||||
pub async fn new() -> Result<Self> {
|
||||
let daemon_config = get_daemon_config();
|
||||
let default_volume = daemon_config.default_volume.unwrap_or(1.0);
|
||||
let (default_input_name, default_volume, default_volume_multiplier) =
|
||||
with_daemon_config(|c| {
|
||||
(
|
||||
c.default_input_name.clone(),
|
||||
c.default_volume.unwrap_or(1.0),
|
||||
c.default_volume_multiplier.unwrap_or(1.0),
|
||||
)
|
||||
});
|
||||
|
||||
let mut audio_player = AudioPlayer {
|
||||
stream_handle: None,
|
||||
@@ -77,9 +85,10 @@ impl AudioPlayer {
|
||||
|
||||
input_link_sender: None,
|
||||
player_link_sender: None,
|
||||
input_device_name: daemon_config.default_input_name.clone(),
|
||||
input_device_name: default_input_name,
|
||||
|
||||
volume: default_volume,
|
||||
volume_multiplier: default_volume_multiplier,
|
||||
};
|
||||
|
||||
if audio_player.input_device_name.is_some() {
|
||||
@@ -108,24 +117,16 @@ impl AudioPlayer {
|
||||
}
|
||||
|
||||
fn abort_link_thread(&mut self) {
|
||||
if let Some(sender) = &self.input_link_sender {
|
||||
if sender.send(Terminate {}).is_ok() {
|
||||
println!("Sent terminate signal to input link thread");
|
||||
self.input_link_sender = None;
|
||||
} else {
|
||||
eprintln!("Failed to send terminate signal to input link thread");
|
||||
}
|
||||
if self.input_link_sender.is_some() {
|
||||
println!("Sent terminate signal to input link thread");
|
||||
self.input_link_sender = None;
|
||||
}
|
||||
}
|
||||
|
||||
fn abort_player_link_thread(&mut self) {
|
||||
if let Some(sender) = &self.player_link_sender {
|
||||
if sender.send(Terminate {}).is_ok() {
|
||||
println!("Sent terminate signal to player link thread");
|
||||
self.player_link_sender = None;
|
||||
} else {
|
||||
eprintln!("Failed to send terminate signal to player link thread");
|
||||
}
|
||||
if self.player_link_sender.is_some() {
|
||||
println!("Sent terminate signal to player link thread");
|
||||
self.player_link_sender = None;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -187,7 +188,7 @@ impl AudioPlayer {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
self.input_link_sender = Some(create_link(output_fl, output_fr, input_fl, input_fr)?);
|
||||
self.input_link_sender = Some(create_link(output_fl, output_fr, input_fl, input_fr).await?);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -270,12 +271,16 @@ impl AudioPlayer {
|
||||
if let Some(id) = id {
|
||||
if let Some(sound) = self.tracks.get_mut(&id) {
|
||||
sound.volume = volume;
|
||||
sound.sink.set_volume(self.volume * volume);
|
||||
sound
|
||||
.sink
|
||||
.set_volume(self.volume * sound.volume * self.volume_multiplier);
|
||||
}
|
||||
} else {
|
||||
self.volume = volume;
|
||||
for sound in self.tracks.values_mut() {
|
||||
sound.sink.set_volume(self.volume * sound.volume);
|
||||
sound
|
||||
.sink
|
||||
.set_volume(self.volume * sound.volume * self.volume_multiplier);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -355,7 +360,7 @@ impl AudioPlayer {
|
||||
.ok_or_else(|| anyhow::anyhow!("stream_handle is unexpectedly missing"))?
|
||||
.mixer();
|
||||
let sink = Player::connect_new(mixer);
|
||||
sink.set_volume(self.volume); // Default volume is 1.0 * master
|
||||
sink.set_volume(self.volume * self.volume_multiplier); // Default volume is 1.0 * master
|
||||
sink.append(source);
|
||||
sink.play();
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
use crate::{
|
||||
types::{
|
||||
audio_player::{FullState, PlayerState},
|
||||
config::HotkeyConfig,
|
||||
config::{DaemonConfig, HotkeyConfig},
|
||||
socket::{Request, Response},
|
||||
},
|
||||
utils::{
|
||||
commands::parse_command,
|
||||
daemon::get_audio_player,
|
||||
daemon::{get_audio_player, with_daemon_config},
|
||||
pipewire::{get_all_devices, get_device},
|
||||
},
|
||||
};
|
||||
@@ -46,11 +46,17 @@ pub struct GetVolumeCommand {
|
||||
pub id: Option<u32>,
|
||||
}
|
||||
|
||||
pub struct GetVolumeMultiplierCommand {}
|
||||
|
||||
pub struct SetVolumeCommand {
|
||||
pub volume: Option<f32>,
|
||||
pub id: Option<u32>,
|
||||
}
|
||||
|
||||
pub struct SetVolumeMultiplierCommand {
|
||||
pub volume_multiplier: Option<f32>,
|
||||
}
|
||||
|
||||
pub struct GetPositionCommand {
|
||||
pub id: Option<u32>,
|
||||
}
|
||||
@@ -127,6 +133,14 @@ pub struct ClearHotkeyKeyCommand {
|
||||
pub slot: Option<String>,
|
||||
}
|
||||
|
||||
pub struct GetDaemonConfigCommand {}
|
||||
|
||||
pub struct SaveDaemonConfigCommand {}
|
||||
|
||||
pub struct UpdateDaemonConfigCommand {
|
||||
pub new_config: DaemonConfig,
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for PingCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
@@ -262,6 +276,18 @@ impl Executable for GetVolumeCommand {
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for GetVolumeMultiplierCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
let audio_player = match get_audio_player().await {
|
||||
Ok(player) => player.lock().await,
|
||||
Err(err) => return Response::new(false, format!("Audio player error: {}", err)),
|
||||
};
|
||||
|
||||
Response::new(true, audio_player.volume_multiplier.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for SetVolumeCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
@@ -278,6 +304,26 @@ impl Executable for SetVolumeCommand {
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for SetVolumeMultiplierCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
if let Some(volume_multiplier) = self.volume_multiplier {
|
||||
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.volume_multiplier = volume_multiplier;
|
||||
audio_player.set_volume(volume_multiplier, None); // Reset current volume for all tracks to apply multiplier
|
||||
Response::new(
|
||||
true,
|
||||
format!("Audio volume multiplier was set to {}", volume_multiplier),
|
||||
)
|
||||
} else {
|
||||
Response::new(false, "Invalid volume multiplier value")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for GetPositionCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
@@ -508,6 +554,7 @@ impl Executable for GetFullStateCommand {
|
||||
state: audio_player.get_state(),
|
||||
tracks: audio_player.get_tracks(),
|
||||
volume: audio_player.volume,
|
||||
volume_multiplier: audio_player.volume_multiplier,
|
||||
current_input: current_input_nick,
|
||||
all_inputs,
|
||||
};
|
||||
@@ -723,3 +770,36 @@ impl Executable for ClearHotkeyKeyCommand {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for GetDaemonConfigCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
let serialized = with_daemon_config(|c| serde_json::to_string(&c));
|
||||
|
||||
match serialized {
|
||||
Ok(s) => Response::new(true, s),
|
||||
Err(err) => Response::new(false, format!("Failed to serialize daemon config: {}", err)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for SaveDaemonConfigCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
match with_daemon_config(|c| c.save_to_file()) {
|
||||
Ok(_) => Response::new(true, "Daemon config saved successfully"),
|
||||
Err(err) => Response::new(false, format!("Failed to save daemon config: {}", err)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl Executable for UpdateDaemonConfigCommand {
|
||||
async fn execute(&self) -> Response {
|
||||
with_daemon_config(|c| {
|
||||
c.clone_from(&self.new_config);
|
||||
});
|
||||
|
||||
Response::new(true, "Daemon config updated successfully")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,13 +4,20 @@ use crate::{
|
||||
};
|
||||
use anyhow::Result;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{collections::HashMap, fs, path::PathBuf};
|
||||
use std::{
|
||||
cmp::Ordering,
|
||||
collections::HashMap,
|
||||
fs,
|
||||
path::{Path, PathBuf},
|
||||
time::SystemTime,
|
||||
};
|
||||
|
||||
#[derive(Default, Clone, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
pub struct DaemonConfig {
|
||||
pub default_input_name: Option<String>,
|
||||
pub default_volume: Option<f32>,
|
||||
pub default_volume_multiplier: Option<f32>,
|
||||
}
|
||||
|
||||
impl DaemonConfig {
|
||||
@@ -45,6 +52,21 @@ pub enum PreferredTheme {
|
||||
Dark,
|
||||
}
|
||||
|
||||
#[derive(Default, Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
|
||||
pub enum SortOrder {
|
||||
#[default]
|
||||
AlphabeticalAsc,
|
||||
AlphabeticalDesc,
|
||||
DateModifiedNewest,
|
||||
DateModifiedOldest,
|
||||
}
|
||||
|
||||
#[derive(Default, Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(default)]
|
||||
pub struct DirSettings {
|
||||
pub sort_order: SortOrder,
|
||||
}
|
||||
|
||||
#[derive(Clone, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
pub struct GuiConfig {
|
||||
@@ -52,15 +74,44 @@ pub struct GuiConfig {
|
||||
pub left_panel_width: f32,
|
||||
|
||||
pub save_volume: bool,
|
||||
pub save_volume_multiplier: bool,
|
||||
pub save_input: bool,
|
||||
pub save_scale_factor: bool,
|
||||
pub pause_on_exit: bool,
|
||||
|
||||
pub dirs: Vec<PathBuf>,
|
||||
pub dirs_settings: HashMap<PathBuf, DirSettings>,
|
||||
|
||||
pub preferred_theme: PreferredTheme,
|
||||
}
|
||||
|
||||
impl SortOrder {
|
||||
pub fn compare(&self, a: &Path, b: &Path) -> Ordering {
|
||||
match self {
|
||||
SortOrder::AlphabeticalAsc => a.cmp(b),
|
||||
SortOrder::AlphabeticalDesc => b.cmp(a),
|
||||
SortOrder::DateModifiedNewest => {
|
||||
let a_time = fs::metadata(a)
|
||||
.and_then(|m| m.modified())
|
||||
.unwrap_or(SystemTime::UNIX_EPOCH);
|
||||
let b_time = fs::metadata(b)
|
||||
.and_then(|m| m.modified())
|
||||
.unwrap_or(SystemTime::UNIX_EPOCH);
|
||||
b_time.cmp(&a_time)
|
||||
}
|
||||
SortOrder::DateModifiedOldest => {
|
||||
let a_time = fs::metadata(a)
|
||||
.and_then(|m| m.modified())
|
||||
.unwrap_or(SystemTime::UNIX_EPOCH);
|
||||
let b_time = fs::metadata(b)
|
||||
.and_then(|m| m.modified())
|
||||
.unwrap_or(SystemTime::UNIX_EPOCH);
|
||||
a_time.cmp(&b_time)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for GuiConfig {
|
||||
fn default() -> Self {
|
||||
GuiConfig {
|
||||
@@ -68,18 +119,31 @@ impl Default for GuiConfig {
|
||||
left_panel_width: 280.0,
|
||||
|
||||
save_volume: false,
|
||||
save_volume_multiplier: false,
|
||||
save_input: false,
|
||||
save_scale_factor: false,
|
||||
pause_on_exit: false,
|
||||
|
||||
dirs: vec![ensure_pwsp_audio_dir()],
|
||||
dirs: vec![ensure_pwsp_audio_dir().unwrap()],
|
||||
|
||||
preferred_theme: PreferredTheme::System,
|
||||
dirs_settings: HashMap::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl GuiConfig {
|
||||
pub fn get_sort_order(&self, path: &Path) -> SortOrder {
|
||||
let mut current = Some(path);
|
||||
while let Some(p) = current {
|
||||
if let Some(settings) = self.dirs_settings.get(p) {
|
||||
return settings.sort_order;
|
||||
}
|
||||
current = p.parent();
|
||||
}
|
||||
SortOrder::default()
|
||||
}
|
||||
|
||||
pub fn save_to_file(&mut self) -> Result<()> {
|
||||
let config_path = get_config_path()?.join("gui.json");
|
||||
|
||||
|
||||
@@ -8,9 +8,12 @@ use egui::Id;
|
||||
use std::{
|
||||
collections::{HashMap, HashSet},
|
||||
path::PathBuf,
|
||||
sync::{Arc, Mutex},
|
||||
time::Instant,
|
||||
};
|
||||
|
||||
pub type ScanResult = (PathBuf, Vec<PathBuf>, HashMap<PathBuf, Vec<PathBuf>>);
|
||||
|
||||
#[derive(Default, Debug)]
|
||||
pub struct TrackUiState {
|
||||
pub position_slider_value: f32,
|
||||
@@ -31,13 +34,16 @@ pub struct AppState {
|
||||
|
||||
pub show_settings: bool,
|
||||
pub volume_dragged: bool,
|
||||
pub volume_multiplier_dragged: bool,
|
||||
pub force_focus_search: bool,
|
||||
|
||||
pub volume_slider_value: f32,
|
||||
pub volume_multiplier_slider_value: f32,
|
||||
|
||||
pub search_field_id: Option<Id>,
|
||||
|
||||
pub ignore_volume_update_until: Option<Instant>,
|
||||
pub ignore_volume_multiplier_update_until: Option<Instant>,
|
||||
|
||||
pub current_dir: Option<PathBuf>,
|
||||
pub dirs: Vec<PathBuf>,
|
||||
@@ -47,6 +53,11 @@ pub struct AppState {
|
||||
pub listed_dirs: HashSet<PathBuf>,
|
||||
pub dir_cache: HashMap<PathBuf, Vec<PathBuf>>,
|
||||
|
||||
pub scanning_dirs: Arc<Mutex<HashSet<PathBuf>>>,
|
||||
pub scanned_this_session: HashSet<PathBuf>,
|
||||
pub finished_scans: Arc<Mutex<Vec<ScanResult>>>,
|
||||
pub recursive_files_cache: HashMap<PathBuf, Vec<PathBuf>>,
|
||||
|
||||
pub show_hotkeys: bool,
|
||||
pub hotkey_capture_active: bool,
|
||||
|
||||
@@ -65,6 +76,7 @@ pub struct AudioPlayerState {
|
||||
pub tracks: Vec<TrackInfo>,
|
||||
|
||||
pub volume: f32, // Master volume
|
||||
pub volume_multiplier: f32,
|
||||
|
||||
pub current_input: String,
|
||||
pub all_inputs: HashMap<String, String>,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
use crate::types::config::DaemonConfig;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
|
||||
@@ -94,6 +95,10 @@ impl Request {
|
||||
Request::new("get_volume", args)
|
||||
}
|
||||
|
||||
pub fn get_volume_multiplier() -> Self {
|
||||
Request::new("get_volume_multiplier", vec![])
|
||||
}
|
||||
|
||||
pub fn get_position(id: Option<u32>) -> Self {
|
||||
let mut args = vec![];
|
||||
let id_str;
|
||||
@@ -138,6 +143,13 @@ impl Request {
|
||||
Request::new("set_volume".to_string(), args)
|
||||
}
|
||||
|
||||
pub fn set_volume_multiplier(volume: f32) -> Self {
|
||||
Request::new(
|
||||
"set_volume_multiplier",
|
||||
vec![("volume_multiplier", &volume.to_string())],
|
||||
)
|
||||
}
|
||||
|
||||
pub fn seek(position: f32, id: Option<u32>) -> Self {
|
||||
let mut args = vec![("position".to_string(), position.to_string())];
|
||||
if let Some(id) = id {
|
||||
@@ -172,6 +184,24 @@ impl Request {
|
||||
Request::new("get_daemon_version", vec![])
|
||||
}
|
||||
|
||||
pub fn get_daemon_config() -> Self {
|
||||
Request::new("get_daemon_config", vec![])
|
||||
}
|
||||
|
||||
pub fn save_daemon_config() -> Self {
|
||||
Request::new("save_daemon_config", vec![])
|
||||
}
|
||||
|
||||
pub fn update_daemon_config(new_config: &DaemonConfig) -> Self {
|
||||
Request::new(
|
||||
"update_daemon_config",
|
||||
vec![(
|
||||
"new_config",
|
||||
&serde_json::to_string(&new_config).unwrap_or_default(),
|
||||
)],
|
||||
)
|
||||
}
|
||||
|
||||
pub fn get_full_state() -> Self {
|
||||
Request::new("get_full_state", vec![])
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use crate::types::{commands::*, socket::Request};
|
||||
use crate::types::{commands::*, config::DaemonConfig, socket::Request};
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
@@ -15,6 +15,7 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
|
||||
"is_paused" => Some(Box::new(IsPausedCommand {})),
|
||||
"get_state" => Some(Box::new(GetStateCommand {})),
|
||||
"get_volume" => Some(Box::new(GetVolumeCommand { id })),
|
||||
"get_volume_multiplier" => Some(Box::new(GetVolumeMultiplierCommand {})),
|
||||
"set_volume" => {
|
||||
let volume = request
|
||||
.args
|
||||
@@ -24,6 +25,15 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
|
||||
.ok();
|
||||
Some(Box::new(SetVolumeCommand { volume, id }))
|
||||
}
|
||||
"set_volume_multiplier" => {
|
||||
let volume_multiplier = request
|
||||
.args
|
||||
.get("volume_multiplier")
|
||||
.unwrap_or(&String::new())
|
||||
.parse::<f32>()
|
||||
.ok();
|
||||
Some(Box::new(SetVolumeMultiplierCommand { volume_multiplier }))
|
||||
}
|
||||
"get_position" => Some(Box::new(GetPositionCommand { id })),
|
||||
"seek" => {
|
||||
let position = request
|
||||
@@ -119,6 +129,17 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
|
||||
key_chord,
|
||||
}))
|
||||
}
|
||||
"get_daemon_config" => Some(Box::new(GetDaemonConfigCommand {})),
|
||||
"save_daemon_config" => Some(Box::new(SaveDaemonConfigCommand {})),
|
||||
"update_daemon_config" => {
|
||||
let new_config = request
|
||||
.args
|
||||
.get("new_config")
|
||||
.and_then(|nc| serde_json::from_str::<DaemonConfig>(nc).ok())
|
||||
.unwrap_or_default();
|
||||
|
||||
Some(Box::new(UpdateDaemonConfigCommand { new_config }))
|
||||
}
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use anyhow::Result;
|
||||
use anyhow::{Context, Result};
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub fn get_config_path() -> Result<PathBuf> {
|
||||
let config_path = dirs::config_dir().expect("Failed to obtain config dir");
|
||||
let config_path = dirs::config_dir().context("Failed to obtain config dir")?;
|
||||
Ok(config_path.join("pwsp"))
|
||||
}
|
||||
|
||||
@@ -7,36 +7,52 @@ use crate::types::{
|
||||
use anyhow::Result;
|
||||
use std::os::unix::fs::{DirBuilderExt, MetadataExt, PermissionsExt};
|
||||
use std::path::PathBuf;
|
||||
use std::{env, error::Error, fs};
|
||||
use std::{
|
||||
env,
|
||||
error::Error,
|
||||
fs,
|
||||
sync::{Arc, Mutex, OnceLock},
|
||||
};
|
||||
use tokio::{
|
||||
io::{AsyncReadExt, AsyncWriteExt},
|
||||
net::UnixStream,
|
||||
sync::{Mutex, OnceCell},
|
||||
sync::{Mutex as AsyncMutex, OnceCell},
|
||||
time::{Duration, sleep},
|
||||
};
|
||||
|
||||
static AUDIO_PLAYER: OnceCell<Mutex<AudioPlayer>> = OnceCell::const_new();
|
||||
static AUDIO_PLAYER: OnceCell<AsyncMutex<AudioPlayer>> = OnceCell::const_new();
|
||||
static DAEMON_CONFIG: OnceLock<Arc<Mutex<DaemonConfig>>> = OnceLock::new();
|
||||
|
||||
pub async fn get_audio_player() -> Result<&'static Mutex<AudioPlayer>, String> {
|
||||
pub async fn get_audio_player() -> Result<&'static AsyncMutex<AudioPlayer>, String> {
|
||||
AUDIO_PLAYER
|
||||
.get_or_try_init(|| async {
|
||||
println!("Initializing audio player");
|
||||
match AudioPlayer::new().await {
|
||||
Ok(player) => Ok(Mutex::new(player)),
|
||||
Ok(player) => Ok(AsyncMutex::new(player)),
|
||||
Err(err) => Err(err.to_string()),
|
||||
}
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
pub fn get_daemon_config() -> DaemonConfig {
|
||||
DaemonConfig::load_from_file().unwrap_or_else(|_| {
|
||||
let config = DaemonConfig::default();
|
||||
config.save_to_file().ok();
|
||||
config
|
||||
pub fn get_daemon_config() -> &'static Arc<Mutex<DaemonConfig>> {
|
||||
DAEMON_CONFIG.get_or_init(|| {
|
||||
Arc::new(Mutex::new(DaemonConfig::load_from_file().unwrap_or_else(
|
||||
|_| {
|
||||
let config = DaemonConfig::default();
|
||||
config.save_to_file().ok();
|
||||
config
|
||||
},
|
||||
)))
|
||||
})
|
||||
}
|
||||
|
||||
pub fn with_daemon_config<R>(f: impl FnOnce(&mut DaemonConfig) -> R) -> R {
|
||||
let config = get_daemon_config().clone();
|
||||
let mut guard = config.lock().unwrap();
|
||||
f(&mut guard)
|
||||
}
|
||||
|
||||
fn get_current_uid() -> u32 {
|
||||
rustix::process::geteuid().as_raw()
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use crate::{
|
||||
types::{
|
||||
audio_player::FullState,
|
||||
config::{GuiConfig, HotkeyConfig},
|
||||
config::{DaemonConfig, GuiConfig, HotkeyConfig},
|
||||
gui::AudioPlayerState,
|
||||
socket::{Request, Response},
|
||||
},
|
||||
@@ -9,6 +9,7 @@ use crate::{
|
||||
};
|
||||
use anyhow::{Result, anyhow};
|
||||
use std::{
|
||||
fs,
|
||||
path::PathBuf,
|
||||
sync::{Arc, Mutex},
|
||||
time::Instant,
|
||||
@@ -23,6 +24,19 @@ pub fn get_gui_config() -> GuiConfig {
|
||||
})
|
||||
}
|
||||
|
||||
pub fn update_daemon_config(new_config: &DaemonConfig) -> Result<()> {
|
||||
make_request_sync(Request::update_daemon_config(new_config))?;
|
||||
make_request_async(Request::save_daemon_config());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn get_daemon_config() -> Result<DaemonConfig> {
|
||||
let response = make_request_sync(Request::get_daemon_config())?;
|
||||
let config: DaemonConfig = serde_json::from_str(&response.message)?;
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
pub fn make_request_sync(request: Request) -> Result<Response> {
|
||||
tokio::task::block_in_place(|| {
|
||||
tokio::runtime::Handle::current()
|
||||
@@ -37,15 +51,19 @@ pub fn make_request_async(request: Request) {
|
||||
});
|
||||
}
|
||||
|
||||
pub fn ensure_pwsp_audio_dir() -> PathBuf {
|
||||
let audio_dir = dirs::audio_dir().unwrap_or("~/Music".into());
|
||||
pub fn ensure_pwsp_audio_dir() -> Result<PathBuf> {
|
||||
let audio_dir = dirs::audio_dir().unwrap_or(
|
||||
dirs::home_dir()
|
||||
.map(|p| p.join("Music"))
|
||||
.ok_or_else(|| anyhow!("Failed to get home directory. Is your system ok?"))?,
|
||||
);
|
||||
let pwsp_audio_dir = audio_dir.join("PWSP");
|
||||
|
||||
if !pwsp_audio_dir.exists() {
|
||||
std::fs::create_dir_all(&pwsp_audio_dir).ok();
|
||||
fs::create_dir_all(&pwsp_audio_dir)?;
|
||||
}
|
||||
|
||||
pwsp_audio_dir
|
||||
Ok(pwsp_audio_dir)
|
||||
}
|
||||
|
||||
pub fn format_time_pair(position: f32, duration: f32) -> String {
|
||||
@@ -98,6 +116,7 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
|
||||
};
|
||||
guard.tracks = full_state.tracks;
|
||||
guard.volume = full_state.volume;
|
||||
guard.volume_multiplier = full_state.volume_multiplier;
|
||||
guard.current_input = full_state
|
||||
.current_input
|
||||
.split(" - ")
|
||||
|
||||
+276
-252
@@ -1,14 +1,224 @@
|
||||
use crate::types::pipewire::{AudioDevice, DeviceType, Port, Terminate};
|
||||
use crate::types::pipewire::{AudioDevice, DeviceType, Port};
|
||||
use anyhow::{Result, anyhow};
|
||||
use pipewire::{
|
||||
context::ContextRc, link::Link, main_loop::MainLoopRc, properties::properties,
|
||||
registry::GlobalObject, spa::utils::dict::DictRef,
|
||||
};
|
||||
use std::{collections::HashMap, thread};
|
||||
use tokio::{
|
||||
sync::mpsc,
|
||||
time::{Duration, timeout},
|
||||
};
|
||||
use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::OnceLock, thread};
|
||||
use tokio::sync::oneshot;
|
||||
|
||||
pub enum PwCommand {
|
||||
GetDevices {
|
||||
resp: oneshot::Sender<(Vec<AudioDevice>, Vec<AudioDevice>)>,
|
||||
},
|
||||
CreateVirtualMic {
|
||||
resp: oneshot::Sender<Result<u32, String>>,
|
||||
},
|
||||
CreateLink {
|
||||
output_fl: Port,
|
||||
output_fr: Port,
|
||||
input_fl: Port,
|
||||
input_fr: Port,
|
||||
resp: oneshot::Sender<Result<(u32, u32), String>>,
|
||||
},
|
||||
DestroyObject {
|
||||
id: u32,
|
||||
},
|
||||
}
|
||||
|
||||
struct AppState {
|
||||
input_devices: HashMap<u32, AudioDevice>,
|
||||
output_devices: HashMap<u32, AudioDevice>,
|
||||
ports: HashMap<u32, Port>,
|
||||
proxies: HashMap<u32, Box<dyn std::any::Any>>,
|
||||
proxy_id_counter: u32,
|
||||
ready_tx: Option<std::sync::mpsc::Sender<()>>,
|
||||
}
|
||||
|
||||
pub struct PipewireManager {
|
||||
pub sender: pipewire::channel::Sender<PwCommand>,
|
||||
}
|
||||
|
||||
static MANAGER: OnceLock<PipewireManager> = OnceLock::new();
|
||||
|
||||
pub fn get_manager() -> &'static PipewireManager {
|
||||
MANAGER.get_or_init(|| {
|
||||
let (pw_sender, pw_receiver) = pipewire::channel::channel::<PwCommand>();
|
||||
let (ready_tx, ready_rx) = std::sync::mpsc::channel();
|
||||
|
||||
thread::spawn(move || {
|
||||
let (main_loop, context) = setup_pipewire_context().expect("Failed to setup pipewire");
|
||||
|
||||
// Leak main_loop and context so their borrows can be 'static
|
||||
let main_loop = Box::leak(Box::new(main_loop));
|
||||
let context = Box::leak(Box::new(context));
|
||||
|
||||
// Leak to fix lifetime issues since this thread lives forever
|
||||
let core = Box::leak(Box::new(
|
||||
context
|
||||
.connect(None)
|
||||
.expect("Failed to connect to pipewire"),
|
||||
));
|
||||
let registry = Box::leak(Box::new(
|
||||
core.get_registry().expect("Failed to get registry"),
|
||||
));
|
||||
|
||||
let state = Rc::new(RefCell::new(AppState {
|
||||
input_devices: HashMap::new(),
|
||||
output_devices: HashMap::new(),
|
||||
ports: HashMap::new(),
|
||||
proxies: HashMap::new(),
|
||||
proxy_id_counter: 10000,
|
||||
ready_tx: Some(ready_tx),
|
||||
}));
|
||||
|
||||
let state_for_registry_add = state.clone();
|
||||
let state_for_registry_remove = state.clone();
|
||||
|
||||
let _listener = registry
|
||||
.add_listener_local()
|
||||
.global(move |global| {
|
||||
let (device, port) = parse_global_object(global);
|
||||
let mut s = state_for_registry_add.borrow_mut();
|
||||
if let Some(device) = device {
|
||||
match device.device_type {
|
||||
DeviceType::Input => {
|
||||
s.input_devices.insert(device.id, device);
|
||||
}
|
||||
DeviceType::Output => {
|
||||
s.output_devices.insert(device.id, device);
|
||||
}
|
||||
}
|
||||
} else if let Some(port) = port {
|
||||
let node_id = port.node_id;
|
||||
s.ports.insert(port.port_id, port.clone());
|
||||
if let Some(d) = s.input_devices.get_mut(&node_id) {
|
||||
d.add_port(port.clone());
|
||||
} else if let Some(d) = s.output_devices.get_mut(&node_id) {
|
||||
d.add_port(port);
|
||||
}
|
||||
}
|
||||
})
|
||||
.global_remove(move |id| {
|
||||
let mut s = state_for_registry_remove.borrow_mut();
|
||||
s.input_devices.remove(&id);
|
||||
s.output_devices.remove(&id);
|
||||
s.ports.retain(|_, port| port.node_id != id);
|
||||
s.ports.remove(&id);
|
||||
})
|
||||
.register();
|
||||
|
||||
// sync to signal ready
|
||||
let state_for_sync = state.clone();
|
||||
let _core_listener = core
|
||||
.add_listener_local()
|
||||
.done(move |id, _seq| {
|
||||
if id == 0 {
|
||||
let mut s = state_for_sync.borrow_mut();
|
||||
if let Some(tx) = s.ready_tx.take() {
|
||||
let _ = tx.send(());
|
||||
}
|
||||
}
|
||||
})
|
||||
.register();
|
||||
|
||||
let _pending = core.sync(0).expect("sync failed");
|
||||
|
||||
let state_for_cmd = state.clone();
|
||||
let _receiver = pw_receiver.attach(main_loop.loop_(), move |cmd| {
|
||||
let mut s = state_for_cmd.borrow_mut();
|
||||
match cmd {
|
||||
PwCommand::GetDevices { resp } => {
|
||||
let mut inputs: Vec<AudioDevice> =
|
||||
s.input_devices.values().cloned().collect();
|
||||
let mut outputs: Vec<AudioDevice> =
|
||||
s.output_devices.values().cloned().collect();
|
||||
inputs.sort_by_key(|a| a.id);
|
||||
outputs.sort_by_key(|a| a.id);
|
||||
let _ = resp.send((inputs, outputs));
|
||||
}
|
||||
PwCommand::CreateVirtualMic { resp } => {
|
||||
let props = properties!(
|
||||
"factory.name" => "support.null-audio-sink",
|
||||
"node.name" => "pwsp-virtual-mic",
|
||||
"node.description" => "PWSP Virtual Mic",
|
||||
"media.class" => "Audio/Source/Virtual",
|
||||
"audio.position" => "[ FL FR ]",
|
||||
"audio.channels" => "2",
|
||||
"object.linger" => "false",
|
||||
);
|
||||
match core.create_object::<pipewire::node::Node>("adapter", &props) {
|
||||
Ok(node) => {
|
||||
s.proxy_id_counter += 1;
|
||||
let id = s.proxy_id_counter;
|
||||
s.proxies.insert(id, Box::new(node));
|
||||
let _ = resp.send(Ok(id));
|
||||
}
|
||||
Err(e) => {
|
||||
let _ = resp.send(Err(e.to_string()));
|
||||
}
|
||||
}
|
||||
}
|
||||
PwCommand::CreateLink {
|
||||
output_fl,
|
||||
output_fr,
|
||||
input_fl,
|
||||
input_fr,
|
||||
resp,
|
||||
} => {
|
||||
let props_fl = properties! {
|
||||
"link.output.node" => format!("{}", output_fl.node_id).as_str(),
|
||||
"link.output.port" => format!("{}", output_fl.port_id).as_str(),
|
||||
"link.input.node" => format!("{}", input_fl.node_id).as_str(),
|
||||
"link.input.port" => format!("{}", input_fl.port_id).as_str(),
|
||||
};
|
||||
let props_fr = properties! {
|
||||
"link.output.node" => format!("{}", output_fr.node_id).as_str(),
|
||||
"link.output.port" => format!("{}", output_fr.port_id).as_str(),
|
||||
"link.input.node" => format!("{}", input_fr.node_id).as_str(),
|
||||
"link.input.port" => format!("{}", input_fr.port_id).as_str(),
|
||||
};
|
||||
|
||||
let link_fl = match core.create_object::<Link>("link-factory", &props_fl) {
|
||||
Ok(link) => link,
|
||||
Err(e) => {
|
||||
let _ = resp.send(Err(e.to_string()));
|
||||
return;
|
||||
}
|
||||
};
|
||||
let link_fr = match core.create_object::<Link>("link-factory", &props_fr) {
|
||||
Ok(link) => link,
|
||||
Err(e) => {
|
||||
let _ = resp.send(Err(e.to_string()));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
s.proxy_id_counter += 1;
|
||||
let id_fl = s.proxy_id_counter;
|
||||
s.proxies.insert(id_fl, Box::new(link_fl));
|
||||
|
||||
s.proxy_id_counter += 1;
|
||||
let id_fr = s.proxy_id_counter;
|
||||
s.proxies.insert(id_fr, Box::new(link_fr));
|
||||
|
||||
let _ = resp.send(Ok((id_fl, id_fr)));
|
||||
}
|
||||
PwCommand::DestroyObject { id } => {
|
||||
s.proxies.remove(&id);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
main_loop.run();
|
||||
});
|
||||
|
||||
// Wait for the pipewire thread to be fully up and processed initial events
|
||||
let _ = ready_rx.recv();
|
||||
|
||||
PipewireManager { sender: pw_sender }
|
||||
})
|
||||
}
|
||||
|
||||
pub fn setup_pipewire_context() -> Result<(MainLoopRc, ContextRc), String> {
|
||||
pipewire::init();
|
||||
@@ -71,127 +281,17 @@ fn parse_global_object(
|
||||
(None, None)
|
||||
}
|
||||
|
||||
async fn pw_get_global_objects_thread(
|
||||
main_sender: mpsc::Sender<(Option<AudioDevice>, Option<Port>)>,
|
||||
pw_receiver: pipewire::channel::Receiver<Terminate>,
|
||||
init_sender: tokio::sync::oneshot::Sender<Result<(), String>>,
|
||||
) {
|
||||
let (main_loop, context) = match setup_pipewire_context() {
|
||||
Ok(res) => res,
|
||||
Err(e) => {
|
||||
let _ = init_sender.send(Err(e));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
// Stop main loop on Terminate message
|
||||
let _receiver = pw_receiver.attach(main_loop.loop_(), {
|
||||
let _main_loop = main_loop.clone();
|
||||
move |_| _main_loop.quit()
|
||||
});
|
||||
|
||||
let core = match context.connect(None) {
|
||||
Ok(core) => core,
|
||||
Err(e) => {
|
||||
let _ = init_sender.send(Err(format!("Failed to connect to pipewire context: {}", e)));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let registry = match core.get_registry() {
|
||||
Ok(registry) => registry,
|
||||
Err(e) => {
|
||||
let _ = init_sender.send(Err(format!(
|
||||
"Failed to get registry from pipewire context: {}",
|
||||
e
|
||||
)));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let _listener = registry
|
||||
.add_listener_local()
|
||||
.global(move |global| {
|
||||
// Try to parse every global object pipewire finds
|
||||
let (device, port) = parse_global_object(global);
|
||||
|
||||
// Send message to the main thread
|
||||
let sender_clone = main_sender.clone();
|
||||
tokio::task::spawn(async move {
|
||||
sender_clone.send((device, port)).await.ok();
|
||||
});
|
||||
})
|
||||
.register();
|
||||
|
||||
// Signal successful initialization
|
||||
if init_sender.send(Ok(())).is_err() {
|
||||
return;
|
||||
}
|
||||
|
||||
main_loop.run();
|
||||
}
|
||||
|
||||
pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>)> {
|
||||
// Channels to communicate with pipewire thread
|
||||
let (main_sender, mut main_receiver) = mpsc::channel(10);
|
||||
let (pw_sender, pw_receiver) = pipewire::channel::channel();
|
||||
let (init_sender, init_receiver) = tokio::sync::oneshot::channel();
|
||||
|
||||
// Spawn pipewire thread in background
|
||||
let _pw_thread = tokio::spawn(async move {
|
||||
pw_get_global_objects_thread(main_sender, pw_receiver, init_sender).await
|
||||
});
|
||||
|
||||
// Wait for initialization to complete
|
||||
if let Err(e) = init_receiver.await {
|
||||
return Err(anyhow!(e));
|
||||
}
|
||||
|
||||
let mut input_devices: HashMap<u32, AudioDevice> = HashMap::new();
|
||||
let mut output_devices: HashMap<u32, AudioDevice> = HashMap::new();
|
||||
let mut ports: Vec<Port> = vec![];
|
||||
|
||||
loop {
|
||||
// If we don't receive a message in 100ms, we can assume that pipewire thread is finished
|
||||
match timeout(Duration::from_millis(100), main_receiver.recv()).await {
|
||||
Ok(Some((device, port))) => {
|
||||
if let Some(device) = device {
|
||||
match device.device_type {
|
||||
DeviceType::Input => {
|
||||
input_devices.insert(device.id, device);
|
||||
}
|
||||
DeviceType::Output => {
|
||||
output_devices.insert(device.id, device);
|
||||
}
|
||||
}
|
||||
} else if let Some(port) = port {
|
||||
ports.push(port);
|
||||
}
|
||||
}
|
||||
Ok(None) | Err(_) => {
|
||||
// Pipewire thread is finished and we can collect our devices
|
||||
let _ = pw_sender.send(Terminate {});
|
||||
|
||||
for port in ports {
|
||||
let node_id = port.node_id;
|
||||
|
||||
if let Some(input_device) = input_devices.get_mut(&node_id) {
|
||||
input_device.add_port(port);
|
||||
} else if let Some(output_device) = output_devices.get_mut(&node_id) {
|
||||
output_device.add_port(port);
|
||||
}
|
||||
}
|
||||
|
||||
let mut input_devices: Vec<AudioDevice> = input_devices.into_values().collect();
|
||||
let mut output_devices: Vec<AudioDevice> = output_devices.into_values().collect();
|
||||
|
||||
input_devices.sort_by_key(|a| a.id);
|
||||
output_devices.sort_by_key(|a| a.id);
|
||||
|
||||
return Ok((input_devices, output_devices));
|
||||
}
|
||||
}
|
||||
}
|
||||
let (tx, rx) = oneshot::channel();
|
||||
let manager = get_manager();
|
||||
manager
|
||||
.sender
|
||||
.send(PwCommand::GetDevices { resp: tx })
|
||||
.map_err(|_| anyhow!("Failed to send GetDevices to manager"))?;
|
||||
let res = rx
|
||||
.await
|
||||
.map_err(|e| anyhow!("Failed to receive response: {}", e))?;
|
||||
Ok(res)
|
||||
}
|
||||
|
||||
pub async fn get_device(device_name: &str) -> Result<AudioDevice> {
|
||||
@@ -209,65 +309,36 @@ pub async fn get_device(device_name: &str) -> Result<AudioDevice> {
|
||||
.ok_or_else(|| anyhow!("Device not found"))
|
||||
}
|
||||
|
||||
pub fn create_virtual_mic() -> Result<pipewire::channel::Sender<Terminate>> {
|
||||
let (pw_sender, pw_receiver) = pipewire::channel::channel::<Terminate>();
|
||||
let (init_sender, init_receiver) = std::sync::mpsc::sync_channel(0);
|
||||
|
||||
let _pw_thread = thread::spawn(move || {
|
||||
let (main_loop, context) = match setup_pipewire_context() {
|
||||
Ok(res) => res,
|
||||
Err(e) => {
|
||||
let _ = init_sender.send(Err(e));
|
||||
return;
|
||||
}
|
||||
};
|
||||
let core = match context.connect(None) {
|
||||
Ok(core) => core,
|
||||
Err(e) => {
|
||||
let _ =
|
||||
init_sender.send(Err(format!("Failed to connect to pipewire context: {}", e)));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let props = properties!(
|
||||
"factory.name" => "support.null-audio-sink",
|
||||
"node.name" => "pwsp-virtual-mic",
|
||||
"node.description" => "PWSP Virtual Mic",
|
||||
"media.class" => "Audio/Source/Virtual",
|
||||
"audio.position" => "[ FL FR ]",
|
||||
"audio.channels" => "2",
|
||||
"object.linger" => "false", // Destroy the node on app exit
|
||||
);
|
||||
|
||||
let _node = match core.create_object::<pipewire::node::Node>("adapter", &props) {
|
||||
Ok(node) => node,
|
||||
Err(e) => {
|
||||
let _ = init_sender.send(Err(format!("Failed to create virtual mic: {}", e)));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let _receiver = pw_receiver.attach(main_loop.loop_(), {
|
||||
let _main_loop = main_loop.clone();
|
||||
move |_| _main_loop.quit()
|
||||
});
|
||||
|
||||
println!("Virtual mic created");
|
||||
if init_sender.send(Ok(())).is_err() {
|
||||
return;
|
||||
}
|
||||
main_loop.run();
|
||||
});
|
||||
|
||||
if let Err(e) = init_receiver.recv()? {
|
||||
return Err(anyhow!(e));
|
||||
}
|
||||
|
||||
Ok(pw_sender)
|
||||
pub struct PwTerminator {
|
||||
ids: Vec<u32>,
|
||||
}
|
||||
|
||||
pub async fn link_player_to_virtual_mic() -> Result<pipewire::channel::Sender<Terminate>> {
|
||||
impl Drop for PwTerminator {
|
||||
fn drop(&mut self) {
|
||||
let manager = get_manager();
|
||||
for id in &self.ids {
|
||||
let _ = manager.sender.send(PwCommand::DestroyObject { id: *id });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn create_virtual_mic() -> Result<PwTerminator> {
|
||||
let (tx, rx) = oneshot::channel();
|
||||
let manager = get_manager();
|
||||
manager
|
||||
.sender
|
||||
.send(PwCommand::CreateVirtualMic { resp: tx })
|
||||
.map_err(|_| anyhow!("Failed to send CreateVirtualMic to manager"))?;
|
||||
|
||||
let res = rx
|
||||
.await
|
||||
.map_err(|e| anyhow!("Failed to receive response: {}", e))?;
|
||||
|
||||
let id = res.map_err(|e| anyhow!(e))?;
|
||||
Ok(PwTerminator { ids: vec![id] })
|
||||
}
|
||||
|
||||
pub async fn link_player_to_virtual_mic() -> Result<PwTerminator> {
|
||||
let pwsp_daemon_output = match get_device("pwsp-daemon").await {
|
||||
Ok(device) => device,
|
||||
Err(_) => {
|
||||
@@ -303,81 +374,34 @@ pub async fn link_player_to_virtual_mic() -> Result<pipewire::channel::Sender<Te
|
||||
None => return Err(anyhow!("Failed to get pwsp-virtual-mic input_fr")),
|
||||
};
|
||||
|
||||
create_link(output_fl, output_fr, input_fl, input_fr)
|
||||
create_link(output_fl, output_fr, input_fl, input_fr).await
|
||||
}
|
||||
|
||||
pub fn create_link(
|
||||
pub async fn create_link(
|
||||
output_fl: Port,
|
||||
output_fr: Port,
|
||||
input_fl: Port,
|
||||
input_fr: Port,
|
||||
) -> Result<pipewire::channel::Sender<Terminate>> {
|
||||
let (pw_sender, pw_receiver) = pipewire::channel::channel::<Terminate>();
|
||||
let (init_sender, init_receiver) = std::sync::mpsc::sync_channel(0);
|
||||
) -> Result<PwTerminator> {
|
||||
let (tx, rx) = oneshot::channel();
|
||||
let manager = get_manager();
|
||||
manager
|
||||
.sender
|
||||
.send(PwCommand::CreateLink {
|
||||
output_fl,
|
||||
output_fr,
|
||||
input_fl,
|
||||
input_fr,
|
||||
resp: tx,
|
||||
})
|
||||
.map_err(|_| anyhow!("Failed to send CreateLink to manager"))?;
|
||||
|
||||
let _pw_thread = thread::spawn(move || {
|
||||
let (main_loop, context) = match setup_pipewire_context() {
|
||||
Ok(res) => res,
|
||||
Err(e) => {
|
||||
let _ = init_sender.send(Err(e));
|
||||
return;
|
||||
}
|
||||
};
|
||||
let core = match context.connect(None) {
|
||||
Ok(core) => core,
|
||||
Err(e) => {
|
||||
let _ =
|
||||
init_sender.send(Err(format!("Failed to connect to pipewire context: {}", e)));
|
||||
return;
|
||||
}
|
||||
};
|
||||
let res = rx
|
||||
.await
|
||||
.map_err(|e| anyhow!("Failed to receive response: {}", e))?;
|
||||
|
||||
let props_fl = properties! {
|
||||
"link.output.node" => format!("{}", output_fl.node_id).as_str(),
|
||||
"link.output.port" => format!("{}", output_fl.port_id).as_str(),
|
||||
"link.input.node" => format!("{}", input_fl.node_id).as_str(),
|
||||
"link.input.port" => format!("{}", input_fl.port_id).as_str(),
|
||||
};
|
||||
let props_fr = properties! {
|
||||
"link.output.node" => format!("{}", output_fr.node_id).as_str(),
|
||||
"link.output.port" => format!("{}", output_fr.port_id).as_str(),
|
||||
"link.input.node" => format!("{}", input_fr.node_id).as_str(),
|
||||
"link.input.port" => format!("{}", input_fr.port_id).as_str(),
|
||||
};
|
||||
|
||||
let _link_fl = match core.create_object::<Link>("link-factory", &props_fl) {
|
||||
Ok(link) => link,
|
||||
Err(e) => {
|
||||
let _ = init_sender.send(Err(format!("Failed to create link FL: {}", e)));
|
||||
return;
|
||||
}
|
||||
};
|
||||
let _link_fr = match core.create_object::<Link>("link-factory", &props_fr) {
|
||||
Ok(link) => link,
|
||||
Err(e) => {
|
||||
let _ = init_sender.send(Err(format!("Failed to create link FR: {}", e)));
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let _receiver = pw_receiver.attach(main_loop.loop_(), {
|
||||
let _main_loop = main_loop.clone();
|
||||
move |_| _main_loop.quit()
|
||||
});
|
||||
|
||||
println!(
|
||||
"Link created: FL: {}-{} FR: {}-{}",
|
||||
output_fl.node_id, input_fl.node_id, output_fr.node_id, input_fr.node_id
|
||||
);
|
||||
if init_sender.send(Ok(())).is_err() {
|
||||
return;
|
||||
}
|
||||
main_loop.run();
|
||||
});
|
||||
|
||||
if let Err(e) = init_receiver.recv()? {
|
||||
return Err(anyhow!(e));
|
||||
}
|
||||
|
||||
Ok(pw_sender)
|
||||
let (id_fl, id_fr) = res.map_err(|e| anyhow!(e))?;
|
||||
Ok(PwTerminator {
|
||||
ids: vec![id_fl, id_fr],
|
||||
})
|
||||
}
|
||||
|
||||
@@ -27,18 +27,18 @@ with open(cargo_toml_path, "r", encoding="utf-8") as f:
|
||||
|
||||
# We want to match version in [workspace.package]
|
||||
# First, let's find the [workspace.package] section
|
||||
workspace_package_match = re.search(
|
||||
r"\[workspace\.package\](.*?)(?=\n\[|$)", cargo_toml_content, re.DOTALL
|
||||
)
|
||||
workspace_package_match = re.search(r"\[workspace\.package\](.*?)(?=\n\[|$)", cargo_toml_content, re.DOTALL)
|
||||
if not workspace_package_match:
|
||||
fatal("Could not find [workspace.package] section in Cargo.toml.")
|
||||
|
||||
workspace_package_sec = workspace_package_match.group(1)
|
||||
if isinstance(workspace_package_match, re.Match):
|
||||
workspace_package_sec = workspace_package_match.group(1)
|
||||
version_match = re.search(r'version\s*=\s*"([^"]+)"', workspace_package_sec)
|
||||
if not version_match:
|
||||
fatal("Could not find version in [workspace.package] in Cargo.toml.")
|
||||
|
||||
current_version = version_match.group(1)
|
||||
if isinstance(version_match, re.Match):
|
||||
current_version = version_match.group(1)
|
||||
print(f"Current version detected: {current_version}")
|
||||
|
||||
# Get new version
|
||||
@@ -62,9 +62,7 @@ print("Updating Cargo.toml...")
|
||||
|
||||
def replace_version_in_workspace(match):
|
||||
section_content = match.group(1)
|
||||
updated_section_content = re.sub(
|
||||
r'(version\s*=\s*")[^"]+(")', rf"\g<1>{new_version}\g<2>", section_content
|
||||
)
|
||||
updated_section_content = re.sub(r'(version\s*=\s*")[^"]+(")', rf"\g<1>{new_version}\g<2>", section_content)
|
||||
return f"[workspace.package]{updated_section_content}"
|
||||
|
||||
|
||||
@@ -127,9 +125,7 @@ def update_srcinfo(directory, pkgbuild_path, srcinfo_path):
|
||||
f.write(result.stdout)
|
||||
return
|
||||
except Exception as e:
|
||||
print(
|
||||
f"Warning: makepkg failed in {directory}: {e}. Falling back to text replacement."
|
||||
)
|
||||
print(f"Warning: makepkg failed in {directory}: {e}. Falling back to text replacement.")
|
||||
|
||||
# Text replacement fallback
|
||||
with open(srcinfo_path, "r", encoding="utf-8") as f:
|
||||
@@ -142,9 +138,7 @@ def update_srcinfo(directory, pkgbuild_path, srcinfo_path):
|
||||
|
||||
|
||||
update_srcinfo("packages/aur/bin", pkgbuild_bin_path, "packages/aur/bin/.SRCINFO")
|
||||
update_srcinfo(
|
||||
"packages/aur/standart", pkgbuild_std_path, "packages/aur/standart/.SRCINFO"
|
||||
)
|
||||
update_srcinfo("packages/aur/standart", pkgbuild_std_path, "packages/aur/standart/.SRCINFO")
|
||||
|
||||
# 4. Update packages/flatpak/ru.arabianq.pwsp.metainfo.xml
|
||||
flatpak_xml_path = "packages/flatpak/ru.arabianq.pwsp.metainfo.xml"
|
||||
|
||||
Reference in New Issue
Block a user