mirror of
https://github.com/arabianq/pipewire-soundpad.git
synced 2026-06-19 12:13:32 +00:00
Compare commits
50 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b824c88d01 | |||
| a36a82a276 | |||
| 426056e85e | |||
| 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 | |||
| 0060d0bdee | |||
| f91a49cb70 | |||
| 8d513ff65b | |||
| 226dfd91ff | |||
| 344ea60fa5 | |||
| 8411cb3528 | |||
| ad8f22a359 | |||
| 4ec49d822b | |||
| ec2fa2a478 | |||
| e91465365d | |||
| 0476329798 | |||
| 6c59137639 | |||
| 3693a678ea | |||
| 5511d23c3e | |||
| 818cd8b50d | |||
| 6f7d631e28 | |||
| 18904052c7 | |||
| 6841d8d1c3 | |||
| 105be87222 | |||
| 0f8abbc443 | |||
| 54011e7ff1 |
+94
-17
@@ -13,7 +13,15 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
linux-build:
|
linux-build:
|
||||||
runs-on: ubuntu-latest
|
strategy:
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- arch: x64
|
||||||
|
runner: ubuntu-latest
|
||||||
|
- arch: arm64
|
||||||
|
runner: ubuntu-24.04-arm
|
||||||
|
fail-fast: false
|
||||||
|
runs-on: ${{ matrix.runner }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install apt deps (jq/zip + dev-libs)
|
- name: Install apt deps (jq/zip + dev-libs)
|
||||||
@@ -33,35 +41,44 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Setup Rust toolchain
|
- name: Setup Rust toolchain
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.94.1
|
toolchain: 1.96.0
|
||||||
|
|
||||||
|
- 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: Extract all binary names
|
- name: Extract all binary names
|
||||||
id: cargo-meta
|
id: cargo-meta
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
BIN_NAMES=$(cargo metadata --no-deps --format-version 1 \
|
BIN_NAMES=$(cargo metadata --no-deps --format-version 1 \
|
||||||
| jq -r '.packages[0].targets[] | select(.kind[] | contains("bin")) | .name')
|
| jq -r '.packages[].targets[] | select(.kind[] | contains("bin")) | .name')
|
||||||
echo "bin_names<<EOF" >> $GITHUB_OUTPUT
|
echo "bin_names<<EOF" >> $GITHUB_OUTPUT
|
||||||
echo "$BIN_NAMES" >> $GITHUB_OUTPUT
|
echo "$BIN_NAMES" >> $GITHUB_OUTPUT
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Build all binaries
|
|
||||||
run: cargo build --locked
|
|
||||||
|
|
||||||
- name: Package all binaries into one archive
|
- name: Package all binaries into one archive
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
COMMIT_SHA="${{ github.sha }}"
|
COMMIT_SHA="${{ github.sha }}"
|
||||||
ARCHIVE_NAME="pwsp-${COMMIT_SHA}-linux-x64.zip"
|
ARCHIVE_NAME="pwsp-${COMMIT_SHA}-linux-${{ matrix.arch }}.zip"
|
||||||
echo "Creating archive: $ARCHIVE_NAME"
|
echo "Creating archive: $ARCHIVE_NAME"
|
||||||
|
|
||||||
FILES=()
|
FILES=()
|
||||||
while IFS= read -r BIN; do
|
while IFS= read -r BIN; do
|
||||||
[ -z "$BIN" ] && continue
|
[ -z "$BIN" ] && continue
|
||||||
FILES+=("target/debug/$BIN")
|
FILES+=("target/release/$BIN")
|
||||||
done <<< "${{ steps.cargo-meta.outputs.bin_names }}"
|
done <<< "${{ steps.cargo-meta.outputs.bin_names }}"
|
||||||
|
|
||||||
if [ "${#FILES[@]}" -eq 0 ]; then
|
if [ "${#FILES[@]}" -eq 0 ]; then
|
||||||
@@ -82,28 +99,87 @@ jobs:
|
|||||||
- name: Upload archive as artifact
|
- name: Upload archive as artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: archive
|
name: archive-${{ matrix.arch }}
|
||||||
path: pwsp-*.zip
|
path: pwsp-*.zip
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
- name: Install cargo-deb and create .deb
|
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
|
||||||
|
with:
|
||||||
|
path: ~/.cargo/bin/cargo-deb
|
||||||
|
key: ${{ runner.os }}-${{ runner.arch }}-cargo-deb-v1
|
||||||
|
|
||||||
|
- name: Install cargo-deb
|
||||||
|
if: steps.cache-cargo-deb.outputs.cache-hit != 'true'
|
||||||
|
run: cargo install --locked cargo-deb
|
||||||
|
|
||||||
|
- name: Create .deb package (debug binaries from target/release)
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
cargo install --locked cargo-deb
|
|
||||||
export PATH="$HOME/.cargo/bin:$PATH"
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
cargo-deb -p pwsp-gui --no-build --no-strip
|
||||||
cargo-deb
|
|
||||||
|
|
||||||
- name: Upload .deb(s) as artifacts
|
- name: Upload .deb(s) as artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: deb-packages
|
name: deb-packages-${{ matrix.arch }}
|
||||||
path: target/debian/*.deb
|
path: target/debian/*.deb
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
flatpak-build:
|
flatpak-build:
|
||||||
runs-on: ubuntu-latest
|
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- arch: x86_64
|
||||||
|
runner: ubuntu-latest
|
||||||
|
- arch: aarch64
|
||||||
|
runner: ubuntu-24.04-arm
|
||||||
|
fail-fast: false
|
||||||
|
runs-on: ${{ matrix.runner }}
|
||||||
container:
|
container:
|
||||||
image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-25.08
|
image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-25.08
|
||||||
options: --privileged
|
options: --privileged
|
||||||
@@ -114,8 +190,9 @@ jobs:
|
|||||||
- name: Build Flatpak
|
- name: Build Flatpak
|
||||||
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
||||||
with:
|
with:
|
||||||
bundle: ru.arabianq.pwsp.flatpak
|
bundle: ru.arabianq.pwsp_${{ matrix.arch }}.flatpak
|
||||||
manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
|
manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
|
||||||
cache: true
|
cache: true
|
||||||
branch: master
|
branch: master
|
||||||
build-bundle: true
|
build-bundle: true
|
||||||
|
arch: ${{ matrix.arch }}
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ name: Flatter
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ main, master ]
|
branches: [main, master]
|
||||||
release:
|
release:
|
||||||
types: [ published ]
|
types: [published]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
tag_name:
|
tag_name:
|
||||||
@@ -21,8 +21,8 @@ on:
|
|||||||
default: "stable"
|
default: "stable"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
flatter:
|
flatter-x64:
|
||||||
name: Flatter
|
name: Flatter (x86_64)
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@@ -60,7 +60,61 @@ jobs:
|
|||||||
echo "default-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
|
- name: Install SDK Extensions
|
||||||
run: flatpak install -y flathub org.freedesktop.Sdk.Extension.rust-stable//25.08
|
run:
|
||||||
|
flatpak install -y flathub org.freedesktop.Sdk.Extension.rust-stable//25.08
|
||||||
|
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-pages-artifact: false
|
||||||
|
arch: x86_64
|
||||||
|
|
||||||
|
flatter-arm64:
|
||||||
|
name: Flatter (aarch64)
|
||||||
|
needs: flatter-x64
|
||||||
|
runs-on: ubuntu-24.04-arm
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
container:
|
||||||
|
image: ghcr.io/andyholmes/flatter/freedesktop:25.08
|
||||||
|
options: --privileged
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: ${{ inputs.tag_name || github.ref }}
|
||||||
|
|
||||||
|
- name: Setup GPG
|
||||||
|
id: gpg
|
||||||
|
uses: crazy-max/ghaction-import-gpg@v6
|
||||||
|
with:
|
||||||
|
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||||
|
passphrase: ${{ secrets.GPG_PASSPHRASE }}
|
||||||
|
|
||||||
|
- name: Set Default Branch
|
||||||
|
id: set_branch
|
||||||
|
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
|
||||||
|
else
|
||||||
|
echo "branch=nightly" >> $GITHUB_OUTPUT
|
||||||
|
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
|
||||||
|
|
||||||
|
- name: Install SDK Extensions
|
||||||
|
run:
|
||||||
|
flatpak install -y flathub org.freedesktop.Sdk.Extension.rust-stable//25.08
|
||||||
org.freedesktop.Sdk.Extension.llvm20//25.08
|
org.freedesktop.Sdk.Extension.llvm20//25.08
|
||||||
|
|
||||||
- name: Build Flatpak
|
- name: Build Flatpak
|
||||||
@@ -70,11 +124,12 @@ jobs:
|
|||||||
gpg-sign: ${{ steps.gpg.outputs.fingerprint }}
|
gpg-sign: ${{ steps.gpg.outputs.fingerprint }}
|
||||||
upload-bundles: false
|
upload-bundles: false
|
||||||
upload-pages-artifact: true
|
upload-pages-artifact: true
|
||||||
|
arch: aarch64
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
name: Deploy to GitHub Pages
|
name: Deploy to GitHub Pages
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: flatter
|
needs: flatter-arm64
|
||||||
permissions:
|
permissions:
|
||||||
pages: write
|
pages: write
|
||||||
id-token: write
|
id-token: write
|
||||||
|
|||||||
+117
-34
@@ -64,7 +64,15 @@ jobs:
|
|||||||
|
|
||||||
linux-release:
|
linux-release:
|
||||||
needs: prepare
|
needs: prepare
|
||||||
runs-on: ubuntu-latest
|
strategy:
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- arch: x64
|
||||||
|
runner: ubuntu-latest
|
||||||
|
- arch: arm64
|
||||||
|
runner: ubuntu-24.04-arm
|
||||||
|
fail-fast: false
|
||||||
|
runs-on: ${{ matrix.runner }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install apt deps (jq/zip + dev-libs)
|
- name: Install apt deps (jq/zip + dev-libs)
|
||||||
@@ -85,16 +93,16 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Setup Rust toolchain
|
- name: Setup Rust toolchain
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.94.1
|
toolchain: 1.96.0
|
||||||
|
|
||||||
- name: Extract all binary names
|
- name: Extract all binary names
|
||||||
id: cargo-meta
|
id: cargo-meta
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
BIN_NAMES=$(cargo metadata --no-deps --format-version 1 \
|
BIN_NAMES=$(cargo metadata --no-deps --format-version 1 \
|
||||||
| jq -r '.packages[0].targets[] | select(.kind[] | contains("bin")) | .name')
|
| jq -r '.packages[].targets[] | select(.kind[] | contains("bin")) | .name')
|
||||||
echo "bin_names<<EOF" >> $GITHUB_OUTPUT
|
echo "bin_names<<EOF" >> $GITHUB_OUTPUT
|
||||||
echo "$BIN_NAMES" >> $GITHUB_OUTPUT
|
echo "$BIN_NAMES" >> $GITHUB_OUTPUT
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
@@ -107,7 +115,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
TAG="${{ needs.prepare.outputs.tag }}"
|
TAG="${{ needs.prepare.outputs.tag }}"
|
||||||
ARCHIVE_NAME="pwsp-${TAG}-linux-x64.zip"
|
ARCHIVE_NAME="pwsp-${TAG}-linux-${{ matrix.arch }}.zip"
|
||||||
echo "Creating archive: $ARCHIVE_NAME"
|
echo "Creating archive: $ARCHIVE_NAME"
|
||||||
|
|
||||||
FILES=()
|
FILES=()
|
||||||
@@ -131,48 +139,123 @@ jobs:
|
|||||||
|
|
||||||
zip -j "$ARCHIVE_NAME" "${FILES[@]}"
|
zip -j "$ARCHIVE_NAME" "${FILES[@]}"
|
||||||
|
|
||||||
- name: Upload release archive
|
- name: Upload zip archive
|
||||||
uses: softprops/action-gh-release@v2
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
name: zip-archive-${{ matrix.arch }}
|
||||||
tag_name: ${{ needs.prepare.outputs.tag }}
|
path: pwsp-*.zip
|
||||||
files: |
|
retention-days: 1
|
||||||
pwsp-*.zip
|
|
||||||
|
|
||||||
- name: Install cargo-deb and create .deb
|
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
|
||||||
|
with:
|
||||||
|
path: ~/.cargo/bin/cargo-deb
|
||||||
|
key: ${{ runner.os }}-${{ runner.arch }}-cargo-deb-v1
|
||||||
|
|
||||||
|
- name: Install cargo-deb
|
||||||
|
if: steps.cache-cargo-deb.outputs.cache-hit != 'true'
|
||||||
|
run: cargo install --locked cargo-deb
|
||||||
|
|
||||||
|
- name: Create .deb package (release binaries)
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
cargo install --locked cargo-deb
|
|
||||||
export PATH="$HOME/.cargo/bin:$PATH"
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
cargo-deb -p pwsp-gui --no-build
|
||||||
|
|
||||||
cargo-deb
|
- name: Upload deb package
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: deb-package-${{ matrix.arch }}
|
||||||
|
path: target/debian/*.deb
|
||||||
|
retention-days: 1
|
||||||
|
|
||||||
- name: Upload .deb(s) to release
|
publish-release:
|
||||||
|
needs: [prepare, linux-release, deb-release]
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Download zip archive (x64)
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
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
|
||||||
|
|
||||||
|
- name: Upload artifacts to Release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
tag_name: ${{ needs.prepare.outputs.tag }}
|
tag_name: ${{ needs.prepare.outputs.tag }}
|
||||||
files: |
|
files: |
|
||||||
target/debian/*.deb
|
./dist/pwsp-*.zip
|
||||||
|
./dist/*.deb
|
||||||
|
|
||||||
flatpak-release:
|
- name: Install copr-cli
|
||||||
needs: prepare
|
run: pip install copr-cli
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container:
|
|
||||||
image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-25.08
|
|
||||||
options: --privileged
|
|
||||||
|
|
||||||
steps:
|
- name: Trigger Copr Build
|
||||||
- uses: actions/checkout@v4
|
env:
|
||||||
with:
|
COPR_CONFIG: ${{ secrets.COPR_CONFIG }}
|
||||||
ref: ${{ needs.prepare.outputs.tag }}
|
run: |
|
||||||
|
mkdir -p ~/.config
|
||||||
|
echo "$COPR_CONFIG" > ~/.config/copr
|
||||||
|
copr-cli buildscm --clone-url https://github.com/arabianq/pipewire-soundpad.git \
|
||||||
|
--commit ${{ needs.prepare.outputs.tag }} \
|
||||||
|
--spec packages/rpm/pwsp.spec \
|
||||||
|
arabianq/pwsp
|
||||||
|
|
||||||
- name: Build Flatpak
|
|
||||||
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
|
|
||||||
with:
|
|
||||||
bundle: ru.arabianq.pwsp.flatpak
|
|
||||||
manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
|
|
||||||
cache: true
|
|
||||||
branch: master
|
|
||||||
build-bundle: true
|
|
||||||
|
|||||||
Generated
+193
-155
File diff suppressed because it is too large
Load Diff
+18
-54
@@ -1,17 +1,28 @@
|
|||||||
[package]
|
[workspace]
|
||||||
name = "pwsp"
|
members = [
|
||||||
version = "1.9.1"
|
"pwsp-lib",
|
||||||
|
"pwsp-daemon",
|
||||||
|
"pwsp-cli",
|
||||||
|
"pwsp-gui"
|
||||||
|
]
|
||||||
|
resolver = "2"
|
||||||
|
|
||||||
|
[workspace.package]
|
||||||
|
version = "1.12.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
authors = ["arabian"]
|
authors = ["arabian"]
|
||||||
description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
|
|
||||||
readme = "README.md"
|
|
||||||
homepage = "https://pwsp.arabianq.ru"
|
homepage = "https://pwsp.arabianq.ru"
|
||||||
repository = "https://github.com/arabianq/pipewire-soundpad"
|
repository = "https://github.com/arabianq/pipewire-soundpad"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
|
||||||
keywords = ["soundpad", "pipewire", "linux", "cli", "gui"]
|
keywords = ["soundpad", "pipewire", "linux", "cli", "gui"]
|
||||||
|
|
||||||
|
[workspace.dependencies]
|
||||||
|
pwsp-lib = { path = "pwsp-lib" }
|
||||||
|
pwsp-daemon = { path = "pwsp-daemon" }
|
||||||
|
pwsp-cli = { path = "pwsp-cli" }
|
||||||
|
pwsp-gui = { path = "pwsp-gui" }
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
tokio = { version = "1.52.3", features = ["full"] }
|
tokio = { version = "1.52.3", features = ["full"] }
|
||||||
async-trait = "0.1.89"
|
async-trait = "0.1.89"
|
||||||
|
|
||||||
@@ -31,9 +42,7 @@ dirs = "6.0.0"
|
|||||||
itertools = "0.14.0"
|
itertools = "0.14.0"
|
||||||
evdev = { version = "0.13.2", features = ["tokio"] }
|
evdev = { version = "0.13.2", features = ["tokio"] }
|
||||||
rfd = { version = "0.17.2", default-features = false, features = [
|
rfd = { version = "0.17.2", default-features = false, features = [
|
||||||
|
|
||||||
"xdg-portal",
|
"xdg-portal",
|
||||||
|
|
||||||
] }
|
] }
|
||||||
opener = { version = "0.8.4", features = ["reveal"] }
|
opener = { version = "0.8.4", features = ["reveal"] }
|
||||||
system-fonts = "0.1.1"
|
system-fonts = "0.1.1"
|
||||||
@@ -43,7 +52,7 @@ rustix = { version = "1.1.4", features = ["process"] }
|
|||||||
rust-i18n = "4.0.0"
|
rust-i18n = "4.0.0"
|
||||||
sys-locale = "0.3.2"
|
sys-locale = "0.3.2"
|
||||||
|
|
||||||
rodio = { git = "https://github.com/arabianq/rodio.git", rev = "33afba2a2d97bb730eb6537f09d2b3815bff0f33", default-features = false, features = [
|
rodio = { git = "https://github.com/arabianq/rodio.git", rev = "c6a81b5a46e00a6a682c0c431dff62e86f57d819", default-features = false, features = [
|
||||||
"symphonia-all",
|
"symphonia-all",
|
||||||
"symphonia-libopus",
|
"symphonia-libopus",
|
||||||
"playback",
|
"playback",
|
||||||
@@ -67,18 +76,6 @@ egui_dnd = "0.15.0"
|
|||||||
reqwest = "0.13.4"
|
reqwest = "0.13.4"
|
||||||
percent-encoding = "2.3.2"
|
percent-encoding = "2.3.2"
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "pwsp-daemon"
|
|
||||||
path = "src/bin/daemon.rs"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "pwsp-cli"
|
|
||||||
path = "src/bin/cli.rs"
|
|
||||||
|
|
||||||
[[bin]]
|
|
||||||
name = "pwsp-gui"
|
|
||||||
path = "src/main.rs"
|
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
strip = true
|
strip = true
|
||||||
lto = true
|
lto = true
|
||||||
@@ -86,36 +83,3 @@ codegen-units = 1
|
|||||||
opt-level = "z"
|
opt-level = "z"
|
||||||
panic = "abort"
|
panic = "abort"
|
||||||
|
|
||||||
[package.metadata.deb]
|
|
||||||
assets = [
|
|
||||||
[
|
|
||||||
"target/release/pwsp-daemon",
|
|
||||||
"usr/bin/",
|
|
||||||
"755",
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"target/release/pwsp-cli",
|
|
||||||
"usr/bin/",
|
|
||||||
"755",
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"target/release/pwsp-gui",
|
|
||||||
"usr/bin/",
|
|
||||||
"755",
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"assets/pwsp-gui.desktop",
|
|
||||||
"usr/share/applications/pwsp.desktop",
|
|
||||||
"644",
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"assets/icon.png",
|
|
||||||
"usr/share/icons/hicolor/256x256/apps/pwsp.png",
|
|
||||||
"644",
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"assets/pwsp-daemon.service",
|
|
||||||
"usr/lib/systemd/user/pwsp-daemon.service",
|
|
||||||
"644",
|
|
||||||
],
|
|
||||||
]
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<div align="center">
|
<div align="center">
|
||||||
<h1>🎵 PipeWire Soundpad (PWSP)</h1>
|
<h1>🎵 PipeWire Soundpad (PWSP)</h1>
|
||||||
<p><b>A simple, modern, and powerful soundboard for Linux, written in Rust.</b></p>
|
<p><b>A simple, modern, and powerful soundboard for Linux, written in Rust.</b></p>
|
||||||
<img src="assets/screenshot.png" alt="PWSP Screenshot" width="700"/>
|
<img src="pwsp-gui/assets/screenshot.png" alt="PWSP Screenshot" width="700"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
## 🌟 Overview
|
## 🌟 Overview
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
+17
-14
@@ -1,17 +1,20 @@
|
|||||||
pkgbase = pwsp-bin
|
pkgbase = pwsp-bin
|
||||||
pkgdesc = Lets you play audio files through your microphone (Pre-built binaries)
|
pkgdesc = Lets you play audio files through your microphone (Pre-built binaries)
|
||||||
pkgver = 1.9.1
|
pkgver = 1.12.0
|
||||||
pkgrel = 1
|
pkgrel = 2
|
||||||
url = https://github.com/arabianq/pipewire-soundpad
|
url = https://github.com/arabianq/pipewire-soundpad
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = MIT
|
arch = aarch64
|
||||||
depends = pipewire
|
license = MIT
|
||||||
depends = alsa-lib
|
depends = pipewire
|
||||||
provides = pwsp
|
depends = alsa-lib
|
||||||
conflicts = pwsp
|
provides = pwsp
|
||||||
source = pwsp-bin-1.9.1.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.9.1/pwsp-v1.9.1-linux-x64.zip
|
conflicts = pwsp
|
||||||
source = pipewire-soundpad-1.9.1.tar.gz :: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.9.1.tar.gz
|
source = pipewire-soundpad-1.12.0.tar.gz :: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.12.0.tar.gz
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = SKIP
|
source_x86_64 = pwsp-1.12.0-x86_64.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.12.0/pwsp-v1.12.0-linux-x64.zip
|
||||||
|
sha256sums_x86_64 = SKIP
|
||||||
|
source_aarch64 = pwsp-1.12.0-aarch64.zip :: https://github.com/arabianq/pipewire-soundpad/releases/download/v1.12.0/pwsp-v1.12.0-linux-arm64.zip
|
||||||
|
sha256sums_aarch64 = SKIP
|
||||||
|
|
||||||
pkgname = pwsp-bin
|
pkgname = pwsp-bin
|
||||||
|
|||||||
+12
-10
@@ -1,21 +1,23 @@
|
|||||||
# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
|
# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
|
||||||
pkgname=pwsp-bin
|
pkgname=pwsp-bin
|
||||||
_pkgname=pipewire-soundpad
|
_pkgname=pipewire-soundpad
|
||||||
pkgver=1.9.1
|
pkgver=1.12.0
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc="Lets you play audio files through your microphone (Pre-built binaries)"
|
pkgdesc="Lets you play audio files through your microphone (Pre-built binaries)"
|
||||||
arch=('x86_64')
|
arch=('x86_64' 'aarch64')
|
||||||
url="https://github.com/arabianq/pipewire-soundpad"
|
url="https://github.com/arabianq/pipewire-soundpad"
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
depends=('pipewire' 'alsa-lib')
|
depends=('pipewire' 'alsa-lib')
|
||||||
provides=('pwsp')
|
provides=('pwsp')
|
||||||
conflicts=('pwsp')
|
conflicts=('pwsp')
|
||||||
|
|
||||||
source=("${pkgname}-${pkgver}.zip::https://github.com/arabianq/$_pkgname/releases/download/v$pkgver/pwsp-v$pkgver-linux-x64.zip"
|
source_x86_64=("pwsp-${pkgver}-x86_64.zip::https://github.com/arabianq/$_pkgname/releases/download/v$pkgver/pwsp-v$pkgver-linux-x64.zip")
|
||||||
"${_pkgname}-${pkgver}.tar.gz::https://github.com/arabianq/$_pkgname/archive/refs/tags/v$pkgver.tar.gz")
|
source_aarch64=("pwsp-${pkgver}-aarch64.zip::https://github.com/arabianq/$_pkgname/releases/download/v$pkgver/pwsp-v$pkgver-linux-arm64.zip")
|
||||||
|
source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/arabianq/$_pkgname/archive/refs/tags/v$pkgver.tar.gz")
|
||||||
|
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP')
|
||||||
'SKIP')
|
sha256sums_x86_64=('SKIP')
|
||||||
|
sha256sums_aarch64=('SKIP')
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
_srcsrc="${srcdir}/${_pkgname}-${pkgver}"
|
_srcsrc="${srcdir}/${_pkgname}-${pkgver}"
|
||||||
@@ -24,9 +26,9 @@ package() {
|
|||||||
install -Dm755 "${srcdir}/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon"
|
install -Dm755 "${srcdir}/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon"
|
||||||
install -Dm755 "${srcdir}/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui"
|
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/pwsp-gui/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/pwsp-gui/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-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
||||||
|
|
||||||
install -Dm644 "$_srcsrc/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
install -Dm644 "$_srcsrc/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
pkgbase = pwsp
|
pkgbase = pwsp
|
||||||
pkgdesc = Lets you play audio files through your microphone
|
pkgdesc = Lets you play audio files through your microphone
|
||||||
pkgver = 1.9.1
|
pkgver = 1.12.0
|
||||||
pkgrel = 2
|
pkgrel = 1
|
||||||
url = https://github.com/arabianq/pipewire-soundpad
|
url = https://github.com/arabianq/pipewire-soundpad
|
||||||
arch = any
|
arch = x86_64
|
||||||
|
arch = aarch64
|
||||||
license = MIT
|
license = MIT
|
||||||
makedepends = clang
|
makedepends = clang
|
||||||
makedepends = rust
|
makedepends = rust
|
||||||
@@ -11,7 +12,7 @@ pkgbase = pwsp
|
|||||||
makedepends = cmake
|
makedepends = cmake
|
||||||
makedepends = pipewire
|
makedepends = pipewire
|
||||||
makedepends = alsa-lib
|
makedepends = alsa-lib
|
||||||
source = https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.9.1.tar.gz
|
source = https://github.com/arabianq/pipewire-soundpad/archive/refs/tags/v1.12.0.tar.gz
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
|
|
||||||
pkgname = pwsp
|
pkgname = pwsp
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
|
# Maintainer: Alexander Tarasov <a.tevg@ya.ru>
|
||||||
pkgsubn=pwsp
|
pkgsubn=pwsp
|
||||||
pkgname=pwsp
|
pkgname=pwsp
|
||||||
pkgver=1.9.1
|
pkgver=1.12.0
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc="Lets you play audio files through your microphone"
|
pkgdesc="Lets you play audio files through your microphone"
|
||||||
arch=('any')
|
arch=('x86_64' 'aarch64')
|
||||||
url="https://github.com/arabianq/pipewire-soundpad"
|
url="https://github.com/arabianq/pipewire-soundpad"
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
makedepends=(clang rust cargo cmake pipewire alsa-lib)
|
makedepends=(clang rust cargo cmake pipewire alsa-lib)
|
||||||
@@ -40,8 +40,8 @@ package() {
|
|||||||
install -Dm755 "target/release/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon"
|
install -Dm755 "target/release/pwsp-daemon" "${pkgdir}/usr/bin/pwsp-daemon"
|
||||||
install -Dm755 "target/release/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui"
|
install -Dm755 "target/release/pwsp-gui" "${pkgdir}/usr/bin/pwsp-gui"
|
||||||
|
|
||||||
install -Dm644 "assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop"
|
install -Dm644 "pwsp-gui/assets/pwsp-gui.desktop" "${pkgdir}/usr/share/applications/pwsp-gui.desktop"
|
||||||
install -Dm644 "assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/pwsp.png"
|
install -Dm644 "pwsp-gui/assets/icon.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/pwsp.png"
|
||||||
|
|
||||||
install -Dm644 "assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
install -Dm644 "pwsp-gui/assets/pwsp-daemon.service" "${pkgdir}/usr/lib/systemd/user/pwsp-daemon.service"
|
||||||
}
|
}
|
||||||
|
|||||||
+222
-209
File diff suppressed because one or more lines are too long
@@ -15,7 +15,7 @@
|
|||||||
<launchable type="desktop-id">ru.arabianq.pwsp.desktop</launchable>
|
<launchable type="desktop-id">ru.arabianq.pwsp.desktop</launchable>
|
||||||
<screenshots>
|
<screenshots>
|
||||||
<screenshot type="default">
|
<screenshot type="default">
|
||||||
<image>https://raw.githubusercontent.com/arabianq/pipewire-soundpad/master/assets/screenshot.png</image>
|
<image>https://raw.githubusercontent.com/arabianq/pipewire-soundpad/main/pwsp-gui/assets/screenshot.png</image>
|
||||||
</screenshot>
|
</screenshot>
|
||||||
</screenshots>
|
</screenshots>
|
||||||
<url type="homepage">https://pwsp.arabianq.ru</url>
|
<url type="homepage">https://pwsp.arabianq.ru</url>
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
<name>arabian</name>
|
<name>arabian</name>
|
||||||
</developer>
|
</developer>
|
||||||
<releases>
|
<releases>
|
||||||
<release version="1.9.1" date="2026-05-22" />
|
<release version="1.12.0" date="2026-06-04" />
|
||||||
</releases>
|
</releases>
|
||||||
<content_rating type="oars-1.1" />
|
<content_rating type="oars-1.1" />
|
||||||
</component>
|
</component>
|
||||||
@@ -35,7 +35,7 @@ modules:
|
|||||||
- install -Dm755 target/release/pwsp-cli /app/bin/pwsp-cli
|
- install -Dm755 target/release/pwsp-cli /app/bin/pwsp-cli
|
||||||
- install -Dm755 target/release/pwsp-gui /app/bin/pwsp-gui
|
- install -Dm755 target/release/pwsp-gui /app/bin/pwsp-gui
|
||||||
- install -Dm755 packages/flatpak/pwsp-wrapper.py /app/bin/pwsp-wrapper.py
|
- install -Dm755 packages/flatpak/pwsp-wrapper.py /app/bin/pwsp-wrapper.py
|
||||||
- install -Dm644 assets/icon.png /app/share/icons/hicolor/256x256/apps/ru.arabianq.pwsp.png
|
- install -Dm644 pwsp-gui/assets/icon.png /app/share/icons/hicolor/256x256/apps/ru.arabianq.pwsp.png
|
||||||
- install -Dm644 packages/flatpak/ru.arabianq.pwsp.desktop /app/share/applications/ru.arabianq.pwsp.desktop
|
- install -Dm644 packages/flatpak/ru.arabianq.pwsp.desktop /app/share/applications/ru.arabianq.pwsp.desktop
|
||||||
- install -Dm644 packages/flatpak/ru.arabianq.pwsp.metainfo.xml /app/share/metainfo/ru.arabianq.pwsp.metainfo.xml
|
- install -Dm644 packages/flatpak/ru.arabianq.pwsp.metainfo.xml /app/share/metainfo/ru.arabianq.pwsp.metainfo.xml
|
||||||
sources:
|
sources:
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
|
||||||
|
# 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
|
||||||
|
%else
|
||||||
|
BuildRequires: alsa-lib-devel
|
||||||
|
BuildRequires: dbus-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-gui/assets/pwsp-daemon.service %{buildroot}/usr/lib/systemd/user/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 }}}
|
||||||
|
|
||||||
+32
-8
@@ -1,10 +1,19 @@
|
|||||||
%bcond check 1
|
|
||||||
|
|
||||||
# prevent library files from being installed
|
# prevent library files from being installed
|
||||||
%global cargo_install_lib 0
|
%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
|
Name: pwsp
|
||||||
Version: 1.9.1
|
Version: 1.12.0
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
Summary: Lets you play audio files through your microphone
|
Summary: Lets you play audio files through your microphone
|
||||||
|
|
||||||
@@ -16,11 +25,21 @@ Source: https://github.com/arabianq/pipewire-soundpad/archive/refs/tags
|
|||||||
BuildRequires: rust
|
BuildRequires: rust
|
||||||
BuildRequires: cargo
|
BuildRequires: cargo
|
||||||
BuildRequires: pipewire-devel
|
BuildRequires: pipewire-devel
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
BuildRequires: alsa-devel
|
||||||
|
BuildRequires: dbus-1-devel
|
||||||
|
%else
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
|
BuildRequires: dbus-devel
|
||||||
|
%endif
|
||||||
BuildRequires: clang-devel
|
BuildRequires: clang-devel
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: dbus-devel
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconf-pkg-config
|
%if 0%{?suse_version} && 0%{?suse_version} <= 1500
|
||||||
|
BuildRequires: gcc13-c++
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%global _description %{expand:
|
%global _description %{expand:
|
||||||
PWSP lets you play audio files through your microphone. Has both CLI and
|
PWSP lets you play audio files through your microphone. Has both CLI and
|
||||||
@@ -32,17 +51,22 @@ GUI clients.}
|
|||||||
%autosetup -n pipewire-soundpad-%{version} -p1
|
%autosetup -n pipewire-soundpad-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%if 0%{?suse_version} && 0%{?suse_version} <= 1500
|
||||||
|
export CC=gcc-13
|
||||||
|
export CXX=g++-13
|
||||||
|
%endif
|
||||||
cargo build --release --locked
|
cargo build --release --locked
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -Dm755 target/release/pwsp-cli %{buildroot}%{_bindir}/pwsp-cli
|
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-daemon %{buildroot}%{_bindir}/pwsp-daemon
|
||||||
install -Dm755 target/release/pwsp-gui %{buildroot}%{_bindir}/pwsp-gui
|
install -Dm755 target/release/pwsp-gui %{buildroot}%{_bindir}/pwsp-gui
|
||||||
|
|
||||||
install -Dm644 assets/pwsp-gui.desktop %{buildroot}%{_datadir}/applications/pwsp.desktop
|
install -Dm644 pwsp-gui/assets/pwsp-gui.desktop %{buildroot}%{_datadir}/applications/pwsp.desktop
|
||||||
install -Dm644 assets/icon.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/pwsp.png
|
install -Dm644 pwsp-gui/assets/icon.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/pwsp.png
|
||||||
|
|
||||||
install -Dm644 assets/pwsp-daemon.service %{buildroot}/usr/lib/systemd/user/pwsp-daemon.service
|
install -Dm644 pwsp-gui/assets/pwsp-daemon.service %{buildroot}/usr/lib/systemd/user/pwsp-daemon.service
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
[package]
|
||||||
|
name = "pwsp-cli"
|
||||||
|
version.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
|
homepage.workspace = true
|
||||||
|
repository.workspace = true
|
||||||
|
license.workspace = true
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
pwsp-lib.workspace = true
|
||||||
|
|
||||||
|
tokio.workspace = true
|
||||||
|
|
||||||
|
anyhow.workspace = true
|
||||||
|
clap.workspace = true
|
||||||
|
|
||||||
|
serde_json.workspace = true
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
use anyhow::{Result, anyhow};
|
use anyhow::{Result, anyhow};
|
||||||
use clap::{Parser, Subcommand};
|
use clap::{Parser, Subcommand};
|
||||||
use pwsp::{
|
use pwsp_lib::{
|
||||||
types::socket::Request,
|
types::socket::Request,
|
||||||
utils::daemon::{make_request, wait_for_daemon},
|
utils::daemon::{make_request, wait_for_daemon},
|
||||||
};
|
};
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
[package]
|
||||||
|
name = "pwsp-daemon"
|
||||||
|
version.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
|
homepage.workspace = true
|
||||||
|
repository.workspace = true
|
||||||
|
license.workspace = true
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
pwsp-lib.workspace = true
|
||||||
|
|
||||||
|
tokio.workspace = true
|
||||||
|
|
||||||
|
serde_json.workspace = true
|
||||||
|
|
||||||
|
clap.workspace = true
|
||||||
|
anyhow.workspace = true
|
||||||
|
|
||||||
|
pipewire.workspace = true
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
use anyhow::{Result, anyhow};
|
use anyhow::{Result, anyhow};
|
||||||
use pwsp::{
|
use pwsp_lib::{
|
||||||
types::socket::{MAX_MESSAGE_SIZE, Request, Response},
|
types::socket::{MAX_MESSAGE_SIZE, Request, Response},
|
||||||
utils::{
|
utils::{
|
||||||
commands::parse_command,
|
commands::parse_command,
|
||||||
@@ -15,7 +15,7 @@ use std::os::unix::fs::PermissionsExt;
|
|||||||
use std::{fs, time::Duration};
|
use std::{fs, time::Duration};
|
||||||
use tokio::{
|
use tokio::{
|
||||||
io::{AsyncReadExt, AsyncWriteExt},
|
io::{AsyncReadExt, AsyncWriteExt},
|
||||||
net::UnixListener,
|
net::{UnixListener, UnixStream},
|
||||||
time::sleep,
|
time::sleep,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -83,9 +83,15 @@ async fn main() -> Result<()> {
|
|||||||
|
|
||||||
async fn commands_loop(listener: UnixListener) -> Result<()> {
|
async fn commands_loop(listener: UnixListener) -> Result<()> {
|
||||||
loop {
|
loop {
|
||||||
let (mut stream, _addr) = listener.accept().await?;
|
let (stream, _addr) = listener.accept().await?;
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
|
handle_connection(stream).await;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_connection(mut stream: UnixStream) {
|
||||||
// ---------- Read request (start) ----------
|
// ---------- Read request (start) ----------
|
||||||
let mut len_bytes = [0u8; 4];
|
let mut len_bytes = [0u8; 4];
|
||||||
if stream.read_exact(&mut len_bytes).await.is_err() {
|
if stream.read_exact(&mut len_bytes).await.is_err() {
|
||||||
@@ -103,8 +109,14 @@ async fn commands_loop(listener: UnixListener) -> Result<()> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut buffer = vec![0u8; request_len];
|
let mut buffer = Vec::new();
|
||||||
if stream.read_exact(&mut buffer).await.is_err() {
|
if (&mut stream)
|
||||||
|
.take(request_len as u64)
|
||||||
|
.read_to_end(&mut buffer)
|
||||||
|
.await
|
||||||
|
.is_err()
|
||||||
|
|| buffer.len() != request_len
|
||||||
|
{
|
||||||
eprintln!("Failed to read message from client!");
|
eprintln!("Failed to read message from client!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -112,8 +124,7 @@ async fn commands_loop(listener: UnixListener) -> Result<()> {
|
|||||||
let request: Request = match serde_json::from_slice(&buffer) {
|
let request: Request = match serde_json::from_slice(&buffer) {
|
||||||
Ok(req) => req,
|
Ok(req) => req,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
let response =
|
let response = Response::new(false, format!("Failed to parse request: {}", err));
|
||||||
Response::new(false, format!("Failed to parse request: {}", err));
|
|
||||||
let response_data = match serde_json::to_vec(&response) {
|
let response_data = match serde_json::to_vec(&response) {
|
||||||
Ok(data) => data,
|
Ok(data) => data,
|
||||||
Err(_) => return, // Should not happen with this simple Response
|
Err(_) => return, // Should not happen with this simple Response
|
||||||
@@ -159,8 +170,6 @@ async fn commands_loop(listener: UnixListener) -> Result<()> {
|
|||||||
if response.status && response.message.eq("killed") {
|
if response.status && response.message.eq("killed") {
|
||||||
std::process::exit(0);
|
std::process::exit(0);
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn player_loop() {
|
async fn player_loop() {
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
[package]
|
||||||
|
name = "pwsp-gui"
|
||||||
|
version.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
|
homepage.workspace = true
|
||||||
|
repository.workspace = true
|
||||||
|
license.workspace = true
|
||||||
|
description.workspace = true
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
pwsp-lib.workspace = true
|
||||||
|
|
||||||
|
tokio.workspace = true
|
||||||
|
|
||||||
|
opener.workspace = true
|
||||||
|
rfd.workspace = true
|
||||||
|
itertools.workspace = true
|
||||||
|
anyhow.workspace = true
|
||||||
|
|
||||||
|
serde.workspace = true
|
||||||
|
serde_json.workspace = true
|
||||||
|
|
||||||
|
egui.workspace = true
|
||||||
|
eframe.workspace = true
|
||||||
|
egui_extras.workspace = true
|
||||||
|
egui_material_icons.workspace = true
|
||||||
|
egui_dnd.workspace = true
|
||||||
|
|
||||||
|
system-fonts.workspace = true
|
||||||
|
rust-i18n.workspace = true
|
||||||
|
sys-locale.workspace = true
|
||||||
|
|
||||||
|
reqwest.workspace = true
|
||||||
|
percent-encoding.workspace = true
|
||||||
|
|
||||||
|
[package.metadata.deb]
|
||||||
|
assets = [
|
||||||
|
[
|
||||||
|
"target/release/pwsp-daemon",
|
||||||
|
"usr/bin/",
|
||||||
|
"755",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"target/release/pwsp-cli",
|
||||||
|
"usr/bin/",
|
||||||
|
"755",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"target/release/pwsp-gui",
|
||||||
|
"usr/bin/",
|
||||||
|
"755",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"assets/pwsp-gui.desktop",
|
||||||
|
"usr/share/applications/pwsp.desktop",
|
||||||
|
"644",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"assets/icon.png",
|
||||||
|
"usr/share/icons/hicolor/256x256/apps/pwsp.png",
|
||||||
|
"644",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"assets/pwsp-daemon.service",
|
||||||
|
"usr/lib/systemd/user/pwsp-daemon.service",
|
||||||
|
"644",
|
||||||
|
],
|
||||||
|
]
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 94 KiB |
@@ -70,6 +70,61 @@ kz = "Жою"
|
|||||||
he = "הסר"
|
he = "הסר"
|
||||||
pt-BR = "Remover"
|
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]
|
[gui.context.files.play_solo]
|
||||||
en = "Play Solo"
|
en = "Play Solo"
|
||||||
ru = "Играть"
|
ru = "Играть"
|
||||||
@@ -125,6 +180,17 @@ kz = "Ыстық пернені тағайындау"
|
|||||||
he = "הקצה מקש קיצור"
|
he = "הקצה מקש קיצור"
|
||||||
pt-BR = "Definir tecla de atalho"
|
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
|
# Settings
|
||||||
# ----------------
|
# ----------------
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::gui::SoundpadGui;
|
use crate::gui::SoundpadGui;
|
||||||
use egui::{Context, Id, Key, Modifiers};
|
use egui::{Context, Id, Key, Modifiers};
|
||||||
use pwsp::types::socket::Request;
|
use pwsp_lib::types::socket::Request;
|
||||||
use pwsp::utils::gui::make_request_async;
|
use pwsp_lib::utils::gui::make_request_async;
|
||||||
|
|
||||||
/// Convert an egui Key + Modifiers to a normalized chord string like "Ctrl+Shift+A".
|
/// Convert an egui Key + Modifiers to a normalized chord string like "Ctrl+Shift+A".
|
||||||
fn chord_from_event(modifiers: &Modifiers, key: &Key) -> Option<String> {
|
fn chord_from_event(modifiers: &Modifiers, key: &Key) -> Option<String> {
|
||||||
@@ -217,3 +217,70 @@ impl SoundpadGui {
|
|||||||
// });
|
// });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use egui::{Key, Modifiers};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_chord_from_event() {
|
||||||
|
// Valid modifier + key
|
||||||
|
let mut mods = Modifiers::NONE;
|
||||||
|
mods.ctrl = true;
|
||||||
|
let chord = chord_from_event(&mods, &Key::A);
|
||||||
|
assert_eq!(chord, Some("Ctrl+A".to_string()));
|
||||||
|
|
||||||
|
// Multiple modifiers
|
||||||
|
mods.shift = true;
|
||||||
|
let chord = chord_from_event(&mods, &Key::F1);
|
||||||
|
assert_eq!(chord, Some("Ctrl+Shift+F1".to_string()));
|
||||||
|
|
||||||
|
// Missing modifiers (requires at least one modifier)
|
||||||
|
let no_mods = Modifiers::NONE;
|
||||||
|
let chord = chord_from_event(&no_mods, &Key::A);
|
||||||
|
assert_eq!(chord, None);
|
||||||
|
|
||||||
|
// Invalid keys (e.g. Escape or Enter shouldn't be accepted by chord_from_event)
|
||||||
|
mods.shift = false;
|
||||||
|
let chord = chord_from_event(&mods, &Key::Escape);
|
||||||
|
assert_eq!(chord, None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parse_chord() {
|
||||||
|
// Valid Ctrl+A
|
||||||
|
let res = parse_chord("Ctrl+A");
|
||||||
|
assert!(res.is_some());
|
||||||
|
let (mods, key) = res.unwrap();
|
||||||
|
assert!(mods.ctrl);
|
||||||
|
assert!(!mods.alt);
|
||||||
|
assert!(!mods.shift);
|
||||||
|
assert_eq!(key, Key::A);
|
||||||
|
|
||||||
|
// Valid Ctrl+Shift+F12
|
||||||
|
let res = parse_chord("Ctrl+Shift+F12");
|
||||||
|
assert!(res.is_some());
|
||||||
|
let (mods, key) = res.unwrap();
|
||||||
|
assert!(mods.ctrl);
|
||||||
|
assert!(mods.shift);
|
||||||
|
assert!(!mods.alt);
|
||||||
|
assert_eq!(key, Key::F12);
|
||||||
|
|
||||||
|
// Valid Ctrl+Alt+Shift+Super+B
|
||||||
|
let res = parse_chord("Ctrl+Alt+Shift+Super+B");
|
||||||
|
assert!(res.is_some());
|
||||||
|
let (mods, key) = res.unwrap();
|
||||||
|
assert!(mods.ctrl);
|
||||||
|
assert!(mods.alt);
|
||||||
|
assert!(mods.shift);
|
||||||
|
assert!(mods.command); // Super maps to command in egui Modifiers
|
||||||
|
assert_eq!(key, Key::B);
|
||||||
|
|
||||||
|
// Invalid keys/chords
|
||||||
|
assert!(parse_chord("").is_none());
|
||||||
|
assert!(parse_chord("Ctrl+").is_none());
|
||||||
|
assert!(parse_chord("Ctrl+Escape").is_none());
|
||||||
|
assert!(parse_chord("Invalid+A").is_none());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,7 +6,7 @@ use anyhow::{Result, anyhow};
|
|||||||
use eframe::{HardwareAcceleration, NativeOptions, icon_data::from_png_bytes, run_native};
|
use eframe::{HardwareAcceleration, NativeOptions, icon_data::from_png_bytes, run_native};
|
||||||
use egui::{Context, FontData, FontDefinitions, FontFamily, FontTweak, Vec2, ViewportBuilder};
|
use egui::{Context, FontData, FontDefinitions, FontFamily, FontTweak, Vec2, ViewportBuilder};
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use pwsp::{
|
use pwsp_lib::{
|
||||||
types::{
|
types::{
|
||||||
audio_player::PlayerState,
|
audio_player::PlayerState,
|
||||||
config::GuiConfig,
|
config::GuiConfig,
|
||||||
@@ -159,6 +159,13 @@ impl SoundpadGui {
|
|||||||
|
|
||||||
pub fn get_filtered_files(&self) -> Vec<PathBuf> {
|
pub fn get_filtered_files(&self) -> Vec<PathBuf> {
|
||||||
let mut files: Vec<PathBuf> = self.app_state.listed_files.iter().cloned().collect();
|
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| {
|
files.sort_by(|a, b| {
|
||||||
let a_is_dir = a.is_dir();
|
let a_is_dir = a.is_dir();
|
||||||
let b_is_dir = b.is_dir();
|
let b_is_dir = b.is_dir();
|
||||||
@@ -167,7 +174,7 @@ impl SoundpadGui {
|
|||||||
} else if !a_is_dir && b_is_dir {
|
} else if !a_is_dir && b_is_dir {
|
||||||
Ordering::Greater
|
Ordering::Greater
|
||||||
} else {
|
} else {
|
||||||
a.cmp(b)
|
sort_order.compare(a, b)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -294,3 +301,59 @@ pub async fn run() -> Result<()> {
|
|||||||
Err(e) => Err(anyhow!(e.to_string())),
|
Err(e) => Err(anyhow!(e.to_string())),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_get_filtered_files() {
|
||||||
|
let mut gui = SoundpadGui {
|
||||||
|
app_state: AppState::default(),
|
||||||
|
config: GuiConfig::default(),
|
||||||
|
audio_player_state: AudioPlayerState::default(),
|
||||||
|
audio_player_state_shared: Arc::new(Mutex::new(AudioPlayerState::default())),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create some dummy paths
|
||||||
|
// We will mock path properties using standard Rust PathBuf
|
||||||
|
let dir_a = PathBuf::from("a_dir");
|
||||||
|
let file_b = PathBuf::from("b_file.mp3");
|
||||||
|
let file_c = PathBuf::from("c_file.wav");
|
||||||
|
let file_txt = PathBuf::from("invalid.txt");
|
||||||
|
|
||||||
|
gui.app_state.listed_files.insert(dir_a.clone());
|
||||||
|
gui.app_state.listed_files.insert(file_b.clone());
|
||||||
|
gui.app_state.listed_files.insert(file_c.clone());
|
||||||
|
gui.app_state.listed_files.insert(file_txt.clone());
|
||||||
|
|
||||||
|
// Note: is_dir() check in get_filtered_files relies on physical filesystem properties.
|
||||||
|
// 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();
|
||||||
|
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();
|
||||||
|
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();
|
||||||
|
assert_eq!(filtered_desc.len(), 2);
|
||||||
|
assert_eq!(filtered_desc[0], file_c);
|
||||||
|
assert_eq!(filtered_desc[1], file_b);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::gui::SoundpadGui;
|
use crate::gui::SoundpadGui;
|
||||||
use eframe::{App, Frame as EFrame};
|
use eframe::{App, Frame as EFrame};
|
||||||
use egui::{CentralPanel, Context, ThemePreference};
|
use egui::{CentralPanel, Context, ThemePreference};
|
||||||
use pwsp::{
|
use pwsp_lib::{
|
||||||
types::{config::PreferredTheme, socket::Request},
|
types::{config::PreferredTheme, socket::Request},
|
||||||
utils::{daemon::get_daemon_config, gui::make_request_async},
|
utils::{daemon::get_daemon_config, gui::make_request_async},
|
||||||
};
|
};
|
||||||
@@ -5,7 +5,10 @@ use egui::{
|
|||||||
};
|
};
|
||||||
use egui_dnd::dnd;
|
use egui_dnd::dnd;
|
||||||
use egui_material_icons::icons::*;
|
use egui_material_icons::icons::*;
|
||||||
use pwsp::types::{gui::AppState, gui::AudioPlayerState};
|
use pwsp_lib::types::{
|
||||||
|
config::{GuiConfig, SortOrder},
|
||||||
|
gui::{AppState, AudioPlayerState},
|
||||||
|
};
|
||||||
use rust_i18n::t;
|
use rust_i18n::t;
|
||||||
use std::{cmp::Ordering, path::Path, path::PathBuf};
|
use std::{cmp::Ordering, path::Path, path::PathBuf};
|
||||||
|
|
||||||
@@ -135,6 +138,65 @@ impl SoundpadGui {
|
|||||||
{
|
{
|
||||||
self.app_state.dirs_to_remove.insert(path.clone());
|
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);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -192,6 +254,7 @@ impl SoundpadGui {
|
|||||||
Self::draw_tree_node(
|
Self::draw_tree_node(
|
||||||
ui,
|
ui,
|
||||||
entry_path,
|
entry_path,
|
||||||
|
&self.config,
|
||||||
&mut self.app_state,
|
&mut self.app_state,
|
||||||
&self.audio_player_state,
|
&self.audio_player_state,
|
||||||
&mut actions,
|
&mut actions,
|
||||||
@@ -226,6 +289,7 @@ impl SoundpadGui {
|
|||||||
fn draw_tree_node_dir(
|
fn draw_tree_node_dir(
|
||||||
ui: &mut Ui,
|
ui: &mut Ui,
|
||||||
path: std::path::PathBuf,
|
path: std::path::PathBuf,
|
||||||
|
config: &GuiConfig,
|
||||||
app_state: &mut AppState,
|
app_state: &mut AppState,
|
||||||
audio_player_state: &AudioPlayerState,
|
audio_player_state: &AudioPlayerState,
|
||||||
actions: &mut Vec<FileAction>,
|
actions: &mut Vec<FileAction>,
|
||||||
@@ -244,9 +308,21 @@ impl SoundpadGui {
|
|||||||
let mut read = Vec::new();
|
let mut read = Vec::new();
|
||||||
if let Ok(entries) = std::fs::read_dir(&path) {
|
if let Ok(entries) = std::fs::read_dir(&path) {
|
||||||
for entry in entries.filter_map(|e| e.ok()) {
|
for entry in entries.filter_map(|e| e.ok()) {
|
||||||
read.push(entry.path());
|
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;
|
||||||
|
}
|
||||||
|
read.push(child_path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
let sort_order = config.get_sort_order(&path);
|
||||||
read.sort_by(|a, b| {
|
read.sort_by(|a, b| {
|
||||||
let a_is_dir = a.is_dir();
|
let a_is_dir = a.is_dir();
|
||||||
let b_is_dir = b.is_dir();
|
let b_is_dir = b.is_dir();
|
||||||
@@ -255,7 +331,7 @@ impl SoundpadGui {
|
|||||||
} else if !a_is_dir && b_is_dir {
|
} else if !a_is_dir && b_is_dir {
|
||||||
Ordering::Greater
|
Ordering::Greater
|
||||||
} else {
|
} else {
|
||||||
a.cmp(b)
|
sort_order.compare(a, b)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
app_state.dir_cache.insert(path.clone(), read.clone());
|
app_state.dir_cache.insert(path.clone(), read.clone());
|
||||||
@@ -266,17 +342,8 @@ impl SoundpadGui {
|
|||||||
let search_query = search_query.trim();
|
let search_query = search_query.trim();
|
||||||
|
|
||||||
for child in children {
|
for child in children {
|
||||||
if !child.is_dir() {
|
if !child.is_dir()
|
||||||
if !crate::gui::SUPPORTED_EXTENSIONS.contains(
|
&& !search_query.is_empty() {
|
||||||
&child
|
|
||||||
.extension()
|
|
||||||
.unwrap_or_default()
|
|
||||||
.to_str()
|
|
||||||
.unwrap_or_default(),
|
|
||||||
) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if !search_query.is_empty() {
|
|
||||||
let file_name = child
|
let file_name = child
|
||||||
.file_name()
|
.file_name()
|
||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
@@ -286,8 +353,7 @@ impl SoundpadGui {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
Self::draw_tree_node(ui, child, config, app_state, audio_player_state, actions);
|
||||||
Self::draw_tree_node(ui, child, app_state, audio_player_state, actions);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -412,6 +478,24 @@ impl SoundpadGui {
|
|||||||
actions.push(FileAction::AssignHotkey(path.clone()));
|
actions.push(FileAction::AssignHotkey(path.clone()));
|
||||||
ui.close();
|
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('"', "\\\"")
|
||||||
|
));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -419,12 +503,13 @@ impl SoundpadGui {
|
|||||||
fn draw_tree_node(
|
fn draw_tree_node(
|
||||||
ui: &mut Ui,
|
ui: &mut Ui,
|
||||||
path: std::path::PathBuf,
|
path: std::path::PathBuf,
|
||||||
|
config: &GuiConfig,
|
||||||
app_state: &mut AppState,
|
app_state: &mut AppState,
|
||||||
audio_player_state: &AudioPlayerState,
|
audio_player_state: &AudioPlayerState,
|
||||||
actions: &mut Vec<FileAction>,
|
actions: &mut Vec<FileAction>,
|
||||||
) {
|
) {
|
||||||
if path.is_dir() {
|
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);
|
||||||
} else {
|
} 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);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
use crate::gui::SoundpadGui;
|
||||||
|
use egui::{AtomExt, Button, ComboBox, Label, RichText, Slider, Ui, Vec2};
|
||||||
|
use egui_material_icons::icons::*;
|
||||||
|
use rust_i18n::t;
|
||||||
|
use std::time::Instant;
|
||||||
|
|
||||||
|
impl SoundpadGui {
|
||||||
|
pub fn draw_footer(&mut self, ui: &mut Ui) {
|
||||||
|
ui.add_space(5.0);
|
||||||
|
ui.horizontal(|ui| {
|
||||||
|
self.draw_mic_selection(ui);
|
||||||
|
self.draw_master_volume(ui);
|
||||||
|
|
||||||
|
ui.add_space(ui.available_width() - 18.0 * 2.0 - ui.spacing().item_spacing.x * 2.0);
|
||||||
|
|
||||||
|
self.draw_hotkeys_button(ui);
|
||||||
|
self.draw_settings_button(ui);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw_mic_selection(&mut self, ui: &mut Ui) {
|
||||||
|
let mics = &self.audio_player_state.all_inputs_sorted;
|
||||||
|
|
||||||
|
let mut selected_input = self.audio_player_state.current_input.to_owned();
|
||||||
|
let prev_input = selected_input.to_owned();
|
||||||
|
ComboBox::from_label(t!("gui.choose_mic_select"))
|
||||||
|
.height(30.0)
|
||||||
|
.selected_text(
|
||||||
|
self.audio_player_state
|
||||||
|
.all_inputs
|
||||||
|
.get(&selected_input)
|
||||||
|
.unwrap_or(&String::new()),
|
||||||
|
)
|
||||||
|
.show_ui(ui, |ui| {
|
||||||
|
for (name, nick) in mics {
|
||||||
|
ui.selectable_value(&mut selected_input, name.clone(), nick);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if selected_input != prev_input {
|
||||||
|
self.set_input(selected_input);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw_master_volume(&mut self, ui: &mut Ui) {
|
||||||
|
let volume_icon = Self::get_volume_icon(self.audio_player_state.volume);
|
||||||
|
let volume_label = Label::new(RichText::new(volume_icon).size(18.0));
|
||||||
|
ui.add_sized([18.0, 18.0], volume_label)
|
||||||
|
.on_hover_text(format!(
|
||||||
|
"Master Volume: {:.0}%",
|
||||||
|
self.audio_player_state.volume * 100.0
|
||||||
|
));
|
||||||
|
|
||||||
|
let should_update_volume = !self.app_state.volume_dragged
|
||||||
|
&& self
|
||||||
|
.app_state
|
||||||
|
.ignore_volume_update_until
|
||||||
|
.map(|t| Instant::now() > t)
|
||||||
|
.unwrap_or(true);
|
||||||
|
|
||||||
|
if should_update_volume {
|
||||||
|
self.app_state.volume_slider_value = self.audio_player_state.volume;
|
||||||
|
}
|
||||||
|
|
||||||
|
let volume_slider = Slider::new(&mut self.app_state.volume_slider_value, 0.0..=1.0)
|
||||||
|
.show_value(false)
|
||||||
|
.step_by(0.01);
|
||||||
|
let volume_slider_response = ui.add_sized([150.0, 18.0], volume_slider);
|
||||||
|
if volume_slider_response.drag_stopped() {
|
||||||
|
self.app_state.volume_dragged = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw_hotkeys_button(&mut self, ui: &mut Ui) {
|
||||||
|
let hotkeys_button =
|
||||||
|
Button::new(ICON_KEYBOARD.atom_size(Vec2::new(18.0, 18.0))).frame(false);
|
||||||
|
let hotkeys_button_response = ui.add_sized([18.0, 18.0], hotkeys_button);
|
||||||
|
if hotkeys_button_response.clicked() {
|
||||||
|
self.app_state.show_hotkeys = true;
|
||||||
|
}
|
||||||
|
hotkeys_button_response.on_hover_text("Hotkeys (H)");
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw_settings_button(&mut self, ui: &mut Ui) {
|
||||||
|
let settings_button =
|
||||||
|
Button::new(ICON_SETTINGS.atom_size(Vec2::new(18.0, 18.0))).frame(false);
|
||||||
|
let settings_button_response = ui.add_sized([18.0, 18.0], settings_button);
|
||||||
|
if settings_button_response.clicked() {
|
||||||
|
self.app_state.show_settings = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
use crate::gui::SoundpadGui;
|
use crate::gui::SoundpadGui;
|
||||||
use egui::{Button, CollapsingHeader, FontFamily, Label, RichText, Slider, Ui};
|
use egui::{Button, CollapsingHeader, FontFamily, Label, RichText, Slider, Ui};
|
||||||
use egui_material_icons::icons::*;
|
use egui_material_icons::icons::*;
|
||||||
use pwsp::types::{audio_player::TrackInfo, gui::AppState};
|
use pwsp_lib::types::{audio_player::TrackInfo, gui::AppState};
|
||||||
use pwsp::utils::gui::format_time_pair;
|
use pwsp_lib::utils::gui::format_time_pair;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
pub(crate) enum TrackAction {
|
pub(crate) enum TrackAction {
|
||||||
@@ -91,7 +91,7 @@ impl SoundpadGui {
|
|||||||
|
|
||||||
fn draw_position_control(
|
fn draw_position_control(
|
||||||
ui: &mut Ui,
|
ui: &mut Ui,
|
||||||
ui_state: &mut pwsp::types::gui::TrackUiState,
|
ui_state: &mut pwsp_lib::types::gui::TrackUiState,
|
||||||
track: &TrackInfo,
|
track: &TrackInfo,
|
||||||
default_slider_width: f32,
|
default_slider_width: f32,
|
||||||
) {
|
) {
|
||||||
@@ -117,7 +117,7 @@ impl SoundpadGui {
|
|||||||
|
|
||||||
fn draw_volume_control(
|
fn draw_volume_control(
|
||||||
ui: &mut Ui,
|
ui: &mut Ui,
|
||||||
ui_state: &mut pwsp::types::gui::TrackUiState,
|
ui_state: &mut pwsp_lib::types::gui::TrackUiState,
|
||||||
track: &TrackInfo,
|
track: &TrackInfo,
|
||||||
default_slider_width: f32,
|
default_slider_width: f32,
|
||||||
) {
|
) {
|
||||||
@@ -2,8 +2,8 @@ use crate::gui::SoundpadGui;
|
|||||||
use egui::{Button, Color32, Label, RichText, TextEdit, Ui};
|
use egui::{Button, Color32, Label, RichText, TextEdit, Ui};
|
||||||
use egui_extras::{Column, TableBuilder};
|
use egui_extras::{Column, TableBuilder};
|
||||||
use egui_material_icons::icons::*;
|
use egui_material_icons::icons::*;
|
||||||
use pwsp::types::socket::Request;
|
use pwsp_lib::types::socket::Request;
|
||||||
use pwsp::utils::gui::make_request_async;
|
use pwsp_lib::utils::gui::make_request_async;
|
||||||
use rust_i18n::t;
|
use rust_i18n::t;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
@@ -30,3 +30,26 @@ impl SoundpadGui {
|
|||||||
self.draw_footer(ui);
|
self.draw_footer(ui);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_get_volume_icon() {
|
||||||
|
assert_eq!(SoundpadGui::get_volume_icon(0.8), ICON_VOLUME_UP.codepoint);
|
||||||
|
assert_eq!(SoundpadGui::get_volume_icon(0.0), ICON_VOLUME_OFF.codepoint);
|
||||||
|
assert_eq!(
|
||||||
|
SoundpadGui::get_volume_icon(-0.1),
|
||||||
|
ICON_VOLUME_OFF.codepoint
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
SoundpadGui::get_volume_icon(0.2),
|
||||||
|
ICON_VOLUME_MUTE.codepoint
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
SoundpadGui::get_volume_icon(0.5),
|
||||||
|
ICON_VOLUME_DOWN.codepoint
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::gui::SoundpadGui;
|
use crate::gui::SoundpadGui;
|
||||||
use egui::{Align, Button, Color32, ComboBox, Layout, RichText, Ui};
|
use egui::{Align, Button, Color32, ComboBox, Layout, RichText, Ui};
|
||||||
use egui_material_icons::icons::ICON_ARROW_BACK;
|
use egui_material_icons::icons::ICON_ARROW_BACK;
|
||||||
use pwsp::types::config::PreferredTheme;
|
use pwsp_lib::types::config::PreferredTheme;
|
||||||
use rust_i18n::t;
|
use rust_i18n::t;
|
||||||
|
|
||||||
impl SoundpadGui {
|
impl SoundpadGui {
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
mod gui;
|
mod gui;
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use pwsp::utils::gui::ensure_pwsp_audio_dir;
|
use pwsp_lib::utils::gui::ensure_pwsp_audio_dir;
|
||||||
use rust_i18n::i18n;
|
use rust_i18n::i18n;
|
||||||
use std::{env, path::PathBuf};
|
use std::{env, path::PathBuf};
|
||||||
|
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
[package]
|
||||||
|
name = "pwsp-lib"
|
||||||
|
version.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
authors.workspace = true
|
||||||
|
homepage.workspace = true
|
||||||
|
repository.workspace = true
|
||||||
|
license.workspace = true
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
tokio.workspace = true
|
||||||
|
async-trait.workspace = true
|
||||||
|
|
||||||
|
serde.workspace = true
|
||||||
|
serde_json.workspace = true
|
||||||
|
|
||||||
|
dirs.workspace = true
|
||||||
|
itertools.workspace = true
|
||||||
|
evdev.workspace = true
|
||||||
|
anyhow.workspace = true
|
||||||
|
rustix.workspace = true
|
||||||
|
|
||||||
|
rodio.workspace = true
|
||||||
|
pipewire.workspace = true
|
||||||
|
|
||||||
|
egui.workspace = true
|
||||||
|
|
||||||
|
reqwest.workspace = true
|
||||||
@@ -349,7 +349,11 @@ impl AudioPlayer {
|
|||||||
|
|
||||||
let duration = source.total_duration().map(|d| d.as_secs_f32());
|
let duration = source.total_duration().map(|d| d.as_secs_f32());
|
||||||
|
|
||||||
let mixer = self.stream_handle.as_ref().unwrap().mixer();
|
let mixer = self
|
||||||
|
.stream_handle
|
||||||
|
.as_ref()
|
||||||
|
.ok_or_else(|| anyhow::anyhow!("stream_handle is unexpectedly missing"))?
|
||||||
|
.mixer();
|
||||||
let sink = Player::connect_new(mixer);
|
let sink = Player::connect_new(mixer);
|
||||||
sink.set_volume(self.volume); // Default volume is 1.0 * master
|
sink.set_volume(self.volume); // Default volume is 1.0 * master
|
||||||
sink.append(source);
|
sink.append(source);
|
||||||
@@ -4,7 +4,13 @@ use crate::{
|
|||||||
};
|
};
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use serde::{Deserialize, Serialize};
|
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)]
|
#[derive(Default, Clone, Serialize, Deserialize)]
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
@@ -45,6 +51,21 @@ pub enum PreferredTheme {
|
|||||||
Dark,
|
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)]
|
#[derive(Clone, Serialize, Deserialize)]
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub struct GuiConfig {
|
pub struct GuiConfig {
|
||||||
@@ -57,10 +78,38 @@ pub struct GuiConfig {
|
|||||||
pub pause_on_exit: bool,
|
pub pause_on_exit: bool,
|
||||||
|
|
||||||
pub dirs: Vec<PathBuf>,
|
pub dirs: Vec<PathBuf>,
|
||||||
|
pub dirs_settings: HashMap<PathBuf, DirSettings>,
|
||||||
|
|
||||||
pub preferred_theme: PreferredTheme,
|
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 {
|
impl Default for GuiConfig {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
GuiConfig {
|
GuiConfig {
|
||||||
@@ -75,11 +124,23 @@ impl Default for GuiConfig {
|
|||||||
dirs: vec![ensure_pwsp_audio_dir()],
|
dirs: vec![ensure_pwsp_audio_dir()],
|
||||||
|
|
||||||
preferred_theme: PreferredTheme::System,
|
preferred_theme: PreferredTheme::System,
|
||||||
|
dirs_settings: HashMap::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl GuiConfig {
|
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<()> {
|
pub fn save_to_file(&mut self) -> Result<()> {
|
||||||
let config_path = get_config_path()?.join("gui.json");
|
let config_path = get_config_path()?.join("gui.json");
|
||||||
|
|
||||||
@@ -218,3 +279,82 @@ impl HotkeyConfig {
|
|||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_gui_config_default() {
|
||||||
|
let config = GuiConfig::default();
|
||||||
|
assert_eq!(config.scale_factor, 1.0);
|
||||||
|
assert_eq!(config.left_panel_width, 280.0);
|
||||||
|
assert!(!config.save_volume);
|
||||||
|
assert_eq!(config.preferred_theme, PreferredTheme::System);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_hotkey_config_operations() {
|
||||||
|
let mut config = HotkeyConfig::default();
|
||||||
|
assert!(config.slots.is_empty());
|
||||||
|
|
||||||
|
let req = Request::ping();
|
||||||
|
config.set_slot("slot1".to_string(), req.clone());
|
||||||
|
assert_eq!(config.slots.len(), 1);
|
||||||
|
assert_eq!(config.slots[0].slot, "slot1");
|
||||||
|
assert_eq!(config.slots[0].action, req);
|
||||||
|
assert!(config.slots[0].key_chord.is_none());
|
||||||
|
|
||||||
|
// Test find_slot
|
||||||
|
let found = config.find_slot("slot1");
|
||||||
|
assert!(found.is_some());
|
||||||
|
assert_eq!(found.unwrap().slot, "slot1");
|
||||||
|
|
||||||
|
// Test set_key_chord
|
||||||
|
let updated = config.set_key_chord("slot1", Some("Ctrl+A".to_string()));
|
||||||
|
assert!(updated);
|
||||||
|
assert_eq!(config.slots[0].key_chord.as_deref(), Some("Ctrl+A"));
|
||||||
|
|
||||||
|
// Test set_key_chord for non-existent slot
|
||||||
|
let updated_non_existent = config.set_key_chord("slot2", Some("Ctrl+B".to_string()));
|
||||||
|
assert!(!updated_non_existent);
|
||||||
|
|
||||||
|
// Test find_slot_mut
|
||||||
|
let found_mut = config.find_slot_mut("slot1");
|
||||||
|
assert!(found_mut.is_some());
|
||||||
|
found_mut.unwrap().key_chord = Some("Ctrl+B".to_string());
|
||||||
|
assert_eq!(config.slots[0].key_chord.as_deref(), Some("Ctrl+B"));
|
||||||
|
|
||||||
|
// Test slots_for_chord
|
||||||
|
let slots = config.slots_for_chord("Ctrl+B");
|
||||||
|
assert_eq!(slots.len(), 1);
|
||||||
|
assert_eq!(slots[0].slot, "slot1");
|
||||||
|
|
||||||
|
let empty_slots = config.slots_for_chord("Ctrl+A");
|
||||||
|
assert!(empty_slots.is_empty());
|
||||||
|
|
||||||
|
// Test remove_slot
|
||||||
|
let removed = config.remove_slot("slot1");
|
||||||
|
assert!(removed);
|
||||||
|
assert!(config.slots.is_empty());
|
||||||
|
|
||||||
|
let removed_non_existent = config.remove_slot("slot1");
|
||||||
|
assert!(!removed_non_existent);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_hotkey_config_conflicts() {
|
||||||
|
let mut config = HotkeyConfig::default();
|
||||||
|
config.set_slot("slot1".to_string(), Request::ping());
|
||||||
|
config.set_slot("slot2".to_string(), Request::ping());
|
||||||
|
config.set_slot("slot3".to_string(), Request::ping());
|
||||||
|
|
||||||
|
config.set_key_chord("slot1", Some("Ctrl+A".to_string()));
|
||||||
|
config.set_key_chord("slot2", Some("Ctrl+A".to_string())); // Conflict with slot1
|
||||||
|
config.set_key_chord("slot3", Some("Ctrl+B".to_string()));
|
||||||
|
|
||||||
|
let conflicts = config.find_conflicts();
|
||||||
|
assert_eq!(conflicts.len(), 1);
|
||||||
|
assert!(conflicts.contains(&("slot1", "slot2")) || conflicts.contains(&("slot2", "slot1")));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Terminate {}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
|
||||||
|
pub struct Port {
|
||||||
|
pub node_id: u32,
|
||||||
|
pub port_id: u32,
|
||||||
|
|
||||||
|
pub name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
|
||||||
|
pub enum DeviceType {
|
||||||
|
Input,
|
||||||
|
Output,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
|
||||||
|
pub struct AudioDevice {
|
||||||
|
pub id: u32,
|
||||||
|
|
||||||
|
pub nick: String,
|
||||||
|
pub name: String,
|
||||||
|
|
||||||
|
pub device_type: DeviceType,
|
||||||
|
|
||||||
|
pub input_fl: Option<Port>,
|
||||||
|
pub input_fr: Option<Port>,
|
||||||
|
pub output_fl: Option<Port>,
|
||||||
|
pub output_fr: Option<Port>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AudioDevice {
|
||||||
|
pub fn new(
|
||||||
|
id: u32,
|
||||||
|
nick: Option<&str>,
|
||||||
|
description: Option<&str>,
|
||||||
|
name: Option<&str>,
|
||||||
|
device_type: DeviceType,
|
||||||
|
) -> Self {
|
||||||
|
Self {
|
||||||
|
id,
|
||||||
|
nick: nick
|
||||||
|
.or(description)
|
||||||
|
.or(name)
|
||||||
|
.unwrap_or_default()
|
||||||
|
.to_string(),
|
||||||
|
name: name.unwrap_or_default().to_string(),
|
||||||
|
device_type,
|
||||||
|
input_fl: None,
|
||||||
|
input_fr: None,
|
||||||
|
output_fl: None,
|
||||||
|
output_fr: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_port(&mut self, port: Port) {
|
||||||
|
match port.name.as_str() {
|
||||||
|
"input_FL" => self.input_fl = Some(port),
|
||||||
|
"input_FR" => self.input_fr = Some(port),
|
||||||
|
"output_FL" | "capture_FL" => self.output_fl = Some(port),
|
||||||
|
"output_FR" | "capture_FR" => self.output_fr = Some(port),
|
||||||
|
"input_MONO" => {
|
||||||
|
self.input_fl = Some(port.clone());
|
||||||
|
self.input_fr = Some(port);
|
||||||
|
}
|
||||||
|
"output_MONO" | "capture_MONO" => {
|
||||||
|
self.output_fl = Some(port.clone());
|
||||||
|
self.output_fr = Some(port);
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_audio_device_new() {
|
||||||
|
let device = AudioDevice::new(
|
||||||
|
1,
|
||||||
|
Some("NickName"),
|
||||||
|
Some("Description"),
|
||||||
|
Some("Name"),
|
||||||
|
DeviceType::Input,
|
||||||
|
);
|
||||||
|
assert_eq!(device.id, 1);
|
||||||
|
assert_eq!(device.nick, "NickName");
|
||||||
|
assert_eq!(device.name, "Name");
|
||||||
|
assert_eq!(device.device_type, DeviceType::Input);
|
||||||
|
|
||||||
|
// Fallbacks for nick
|
||||||
|
let device_no_nick =
|
||||||
|
AudioDevice::new(2, None, Some("Desc"), Some("Name"), DeviceType::Output);
|
||||||
|
assert_eq!(device_no_nick.nick, "Desc");
|
||||||
|
|
||||||
|
let device_no_desc = AudioDevice::new(3, None, None, Some("Name"), DeviceType::Output);
|
||||||
|
assert_eq!(device_no_desc.nick, "Name");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_audio_device_add_port() {
|
||||||
|
let mut device = AudioDevice::new(1, None, None, Some("device-name"), DeviceType::Input);
|
||||||
|
|
||||||
|
let port_fl = Port {
|
||||||
|
node_id: 1,
|
||||||
|
port_id: 10,
|
||||||
|
name: "input_FL".to_string(),
|
||||||
|
};
|
||||||
|
let port_fr = Port {
|
||||||
|
node_id: 1,
|
||||||
|
port_id: 11,
|
||||||
|
name: "input_FR".to_string(),
|
||||||
|
};
|
||||||
|
|
||||||
|
device.add_port(port_fl.clone());
|
||||||
|
device.add_port(port_fr.clone());
|
||||||
|
|
||||||
|
assert_eq!(device.input_fl, Some(port_fl));
|
||||||
|
assert_eq!(device.input_fr, Some(port_fr));
|
||||||
|
|
||||||
|
// Test output ports
|
||||||
|
let port_out_fl = Port {
|
||||||
|
node_id: 1,
|
||||||
|
port_id: 12,
|
||||||
|
name: "output_FL".to_string(),
|
||||||
|
};
|
||||||
|
let port_out_fr = Port {
|
||||||
|
node_id: 1,
|
||||||
|
port_id: 13,
|
||||||
|
name: "capture_FR".to_string(),
|
||||||
|
};
|
||||||
|
|
||||||
|
device.add_port(port_out_fl.clone());
|
||||||
|
device.add_port(port_out_fr.clone());
|
||||||
|
|
||||||
|
assert_eq!(device.output_fl, Some(port_out_fl));
|
||||||
|
assert_eq!(device.output_fr, Some(port_out_fr));
|
||||||
|
|
||||||
|
// Test MONO ports
|
||||||
|
let mut device_mono =
|
||||||
|
AudioDevice::new(2, None, None, Some("mono-device"), DeviceType::Input);
|
||||||
|
let port_mono = Port {
|
||||||
|
node_id: 2,
|
||||||
|
port_id: 20,
|
||||||
|
name: "input_MONO".to_string(),
|
||||||
|
};
|
||||||
|
device_mono.add_port(port_mono.clone());
|
||||||
|
|
||||||
|
assert_eq!(device_mono.input_fl, Some(port_mono.clone()));
|
||||||
|
assert_eq!(device_mono.input_fr, Some(port_mono));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -238,3 +238,88 @@ impl Response {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_response_new() {
|
||||||
|
let res = Response::new(true, "success-msg");
|
||||||
|
assert!(res.status);
|
||||||
|
assert_eq!(res.message, "success-msg");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_request_constructors() {
|
||||||
|
// test ping
|
||||||
|
let req_ping = Request::ping();
|
||||||
|
assert_eq!(req_ping.name, "ping");
|
||||||
|
assert!(req_ping.args.is_empty());
|
||||||
|
|
||||||
|
// test kill
|
||||||
|
let req_kill = Request::kill();
|
||||||
|
assert_eq!(req_kill.name, "kill");
|
||||||
|
|
||||||
|
// test pause (with and without id)
|
||||||
|
let req_pause_no_id = Request::pause(None);
|
||||||
|
assert_eq!(req_pause_no_id.name, "pause");
|
||||||
|
assert!(req_pause_no_id.args.is_empty());
|
||||||
|
|
||||||
|
let req_pause_with_id = Request::pause(Some(42));
|
||||||
|
assert_eq!(req_pause_with_id.name, "pause");
|
||||||
|
assert_eq!(
|
||||||
|
req_pause_with_id.args.get("id").map(|s| s.as_str()),
|
||||||
|
Some("42")
|
||||||
|
);
|
||||||
|
|
||||||
|
// test play
|
||||||
|
let req_play = Request::play("/path/to/sound.mp3", true);
|
||||||
|
assert_eq!(req_play.name, "play");
|
||||||
|
assert_eq!(
|
||||||
|
req_play.args.get("file_path").map(|s| s.as_str()),
|
||||||
|
Some("/path/to/sound.mp3")
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
req_play.args.get("concurrent").map(|s| s.as_str()),
|
||||||
|
Some("true")
|
||||||
|
);
|
||||||
|
|
||||||
|
// test set_volume
|
||||||
|
let req_volume = Request::set_volume(0.8, Some(10));
|
||||||
|
assert_eq!(req_volume.name, "set_volume");
|
||||||
|
assert_eq!(
|
||||||
|
req_volume.args.get("volume").map(|s| s.as_str()),
|
||||||
|
Some("0.8")
|
||||||
|
);
|
||||||
|
assert_eq!(req_volume.args.get("id").map(|s| s.as_str()), Some("10"));
|
||||||
|
|
||||||
|
// test set_hotkey_action_and_key
|
||||||
|
let action = Request::ping();
|
||||||
|
let req_hotkey_action_and_key =
|
||||||
|
Request::set_hotkey_action_and_key("slot1", &action, "Ctrl+P");
|
||||||
|
assert_eq!(req_hotkey_action_and_key.name, "set_hotkey_action_and_key");
|
||||||
|
assert_eq!(
|
||||||
|
req_hotkey_action_and_key
|
||||||
|
.args
|
||||||
|
.get("slot")
|
||||||
|
.map(|s| s.as_str()),
|
||||||
|
Some("slot1")
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
req_hotkey_action_and_key
|
||||||
|
.args
|
||||||
|
.get("key_chord")
|
||||||
|
.map(|s| s.as_str()),
|
||||||
|
Some("Ctrl+P")
|
||||||
|
);
|
||||||
|
let action_json = serde_json::to_string(&action).unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
req_hotkey_action_and_key
|
||||||
|
.args
|
||||||
|
.get("action")
|
||||||
|
.map(|s| s.as_str()),
|
||||||
|
Some(action_json.as_str())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -199,3 +199,79 @@ pub async fn start_global_hotkey_listener() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_modifier_state() {
|
||||||
|
let mut state = ModifierState::new();
|
||||||
|
assert!(!state.any_active());
|
||||||
|
|
||||||
|
// Press Ctrl
|
||||||
|
state.update(KeyCode::KEY_LEFTCTRL, true);
|
||||||
|
assert!(state.ctrl);
|
||||||
|
assert!(state.any_active());
|
||||||
|
|
||||||
|
// Release Ctrl
|
||||||
|
state.update(KeyCode::KEY_LEFTCTRL, false);
|
||||||
|
assert!(!state.ctrl);
|
||||||
|
assert!(!state.any_active());
|
||||||
|
|
||||||
|
// Press multiple modifiers
|
||||||
|
state.update(KeyCode::KEY_RIGHTALT, true);
|
||||||
|
state.update(KeyCode::KEY_LEFTSHIFT, true);
|
||||||
|
assert!(state.alt);
|
||||||
|
assert!(state.shift);
|
||||||
|
assert!(state.any_active());
|
||||||
|
|
||||||
|
// Update a non-modifier key
|
||||||
|
state.update(KeyCode::KEY_A, true);
|
||||||
|
// Modifier states should remain unchanged
|
||||||
|
assert!(state.alt);
|
||||||
|
assert!(state.shift);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_is_modifier() {
|
||||||
|
assert!(ModifierState::is_modifier(KeyCode::KEY_LEFTCTRL));
|
||||||
|
assert!(ModifierState::is_modifier(KeyCode::KEY_RIGHTCTRL));
|
||||||
|
assert!(ModifierState::is_modifier(KeyCode::KEY_LEFTALT));
|
||||||
|
assert!(ModifierState::is_modifier(KeyCode::KEY_RIGHTALT));
|
||||||
|
assert!(ModifierState::is_modifier(KeyCode::KEY_LEFTSHIFT));
|
||||||
|
assert!(ModifierState::is_modifier(KeyCode::KEY_RIGHTSHIFT));
|
||||||
|
assert!(ModifierState::is_modifier(KeyCode::KEY_LEFTMETA));
|
||||||
|
assert!(ModifierState::is_modifier(KeyCode::KEY_RIGHTMETA));
|
||||||
|
|
||||||
|
assert!(!ModifierState::is_modifier(KeyCode::KEY_A));
|
||||||
|
assert!(!ModifierState::is_modifier(KeyCode::KEY_1));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_evdev_key_name() {
|
||||||
|
assert_eq!(evdev_key_name(KeyCode::KEY_A), Some("A"));
|
||||||
|
assert_eq!(evdev_key_name(KeyCode::KEY_Z), Some("Z"));
|
||||||
|
assert_eq!(evdev_key_name(KeyCode::KEY_0), Some("0"));
|
||||||
|
assert_eq!(evdev_key_name(KeyCode::KEY_F1), Some("F1"));
|
||||||
|
assert_eq!(evdev_key_name(KeyCode::KEY_F12), Some("F12"));
|
||||||
|
assert_eq!(evdev_key_name(KeyCode::KEY_ENTER), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_build_chord() {
|
||||||
|
let mut modifiers = ModifierState::new();
|
||||||
|
|
||||||
|
assert_eq!(build_chord(&modifiers, "A"), "A");
|
||||||
|
|
||||||
|
modifiers.ctrl = true;
|
||||||
|
assert_eq!(build_chord(&modifiers, "A"), "Ctrl+A");
|
||||||
|
|
||||||
|
modifiers.shift = true;
|
||||||
|
assert_eq!(build_chord(&modifiers, "B"), "Ctrl+Shift+B");
|
||||||
|
|
||||||
|
modifiers.alt = true;
|
||||||
|
modifiers.meta = true;
|
||||||
|
assert_eq!(build_chord(&modifiers, "F5"), "Ctrl+Alt+Shift+Super+F5");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -139,3 +139,16 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_format_time_pair() {
|
||||||
|
assert_eq!(format_time_pair(0.0, 0.0), "00:00/00:00");
|
||||||
|
assert_eq!(format_time_pair(5.4, 10.0), "00:05/00:10");
|
||||||
|
assert_eq!(format_time_pair(59.9, 125.1), "01:00/02:05");
|
||||||
|
assert_eq!(format_time_pair(3600.0, 7205.0), "60:00/120:05");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,51 +20,40 @@ pub fn setup_pipewire_context() -> Result<(MainLoopRc, ContextRc), String> {
|
|||||||
fn parse_global_object(
|
fn parse_global_object(
|
||||||
global_object: &GlobalObject<&DictRef>,
|
global_object: &GlobalObject<&DictRef>,
|
||||||
) -> (Option<AudioDevice>, Option<Port>) {
|
) -> (Option<AudioDevice>, Option<Port>) {
|
||||||
// Only objects with props can be devices/ports
|
let props = match global_object.props {
|
||||||
if let Some(props) = global_object.props {
|
Some(p) => p,
|
||||||
// Only objects with media.class can be devices
|
None => return (None, None),
|
||||||
|
};
|
||||||
|
|
||||||
if let Some(media_class) = props.get("media.class") {
|
if let Some(media_class) = props.get("media.class") {
|
||||||
let node_id = global_object.id;
|
let node_id = global_object.id;
|
||||||
let node_nick = props.get("node.nick");
|
let node_nick = props.get("node.nick");
|
||||||
let node_name = props.get("node.name");
|
let node_name = props.get("node.name");
|
||||||
let node_description = props.get("node.description");
|
let node_description = props.get("node.description");
|
||||||
|
|
||||||
// Check if the device is an input or output
|
if media_class.starts_with("Audio/Source") {
|
||||||
return if media_class.starts_with("Audio/Source") {
|
let input_device = AudioDevice::new(
|
||||||
let input_device = AudioDevice {
|
node_id,
|
||||||
id: node_id,
|
node_nick,
|
||||||
nick: node_nick
|
node_description,
|
||||||
.unwrap_or(node_description.unwrap_or(node_name.unwrap_or_default()))
|
node_name,
|
||||||
.to_string(),
|
DeviceType::Input,
|
||||||
name: node_name.unwrap_or_default().to_string(),
|
);
|
||||||
device_type: DeviceType::Input,
|
return (Some(input_device), None);
|
||||||
|
|
||||||
input_fl: None,
|
|
||||||
input_fr: None,
|
|
||||||
output_fl: None,
|
|
||||||
output_fr: None,
|
|
||||||
};
|
|
||||||
(Some(input_device), None)
|
|
||||||
} else if media_class.starts_with("Stream/Output/Audio") {
|
} else if media_class.starts_with("Stream/Output/Audio") {
|
||||||
let output_device = AudioDevice {
|
let output_device = AudioDevice::new(
|
||||||
id: node_id,
|
node_id,
|
||||||
nick: node_nick
|
node_nick,
|
||||||
.unwrap_or(node_description.unwrap_or(node_name.unwrap_or_default()))
|
node_description,
|
||||||
.to_string(),
|
node_name,
|
||||||
name: node_name.unwrap_or_default().to_string(),
|
DeviceType::Output,
|
||||||
device_type: DeviceType::Output,
|
);
|
||||||
|
return (Some(output_device), None);
|
||||||
|
}
|
||||||
|
return (None, None);
|
||||||
|
}
|
||||||
|
|
||||||
input_fl: None,
|
if props.get("port.direction").is_some()
|
||||||
input_fr: None,
|
|
||||||
output_fl: None,
|
|
||||||
output_fr: None,
|
|
||||||
};
|
|
||||||
(Some(output_device), None)
|
|
||||||
} else {
|
|
||||||
(None, None)
|
|
||||||
};
|
|
||||||
// Check if the object is a port
|
|
||||||
} else if props.get("port.direction").is_some()
|
|
||||||
&& let (Some(node_id), Some(port_id), Some(port_name)) = (
|
&& let (Some(node_id), Some(port_id), Some(port_name)) = (
|
||||||
props.get("node.id").and_then(|id| id.parse::<u32>().ok()),
|
props.get("node.id").and_then(|id| id.parse::<u32>().ok()),
|
||||||
props.get("port.id").and_then(|id| id.parse::<u32>().ok()),
|
props.get("port.id").and_then(|id| id.parse::<u32>().ok()),
|
||||||
@@ -76,10 +65,9 @@ fn parse_global_object(
|
|||||||
port_id,
|
port_id,
|
||||||
name: port_name.to_string(),
|
name: port_name.to_string(),
|
||||||
};
|
};
|
||||||
|
|
||||||
return (None, Some(port));
|
return (None, Some(port));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
(None, None)
|
(None, None)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,47 +176,14 @@ pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>)> {
|
|||||||
let node_id = port.node_id;
|
let node_id = port.node_id;
|
||||||
|
|
||||||
if let Some(input_device) = input_devices.get_mut(&node_id) {
|
if let Some(input_device) = input_devices.get_mut(&node_id) {
|
||||||
match port.name.as_str() {
|
input_device.add_port(port);
|
||||||
"input_FL" => input_device.input_fl = Some(port),
|
|
||||||
"input_FR" => input_device.input_fr = Some(port),
|
|
||||||
"output_FL" => input_device.output_fl = Some(port),
|
|
||||||
"output_FR" => input_device.output_fr = Some(port),
|
|
||||||
"capture_FL" => input_device.output_fl = Some(port),
|
|
||||||
"capture_FR" => input_device.output_fr = Some(port),
|
|
||||||
"input_MONO" => {
|
|
||||||
input_device.input_fl = Some(port.clone());
|
|
||||||
input_device.input_fr = Some(port)
|
|
||||||
}
|
|
||||||
"capture_MONO" => {
|
|
||||||
input_device.output_fl = Some(port.clone());
|
|
||||||
input_device.output_fr = Some(port);
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
} else if let Some(output_device) = output_devices.get_mut(&node_id) {
|
} else if let Some(output_device) = output_devices.get_mut(&node_id) {
|
||||||
match port.name.as_str() {
|
output_device.add_port(port);
|
||||||
"input_FL" => output_device.input_fl = Some(port),
|
|
||||||
"input_FR" => output_device.input_fr = Some(port),
|
|
||||||
"output_FL" => output_device.output_fl = Some(port),
|
|
||||||
"output_FR" => output_device.output_fr = Some(port),
|
|
||||||
"capture_FL" => output_device.output_fl = Some(port),
|
|
||||||
"capture_FR" => output_device.output_fr = Some(port),
|
|
||||||
"output_MONO" => {
|
|
||||||
output_device.output_fl = Some(port.clone());
|
|
||||||
output_device.output_fr = Some(port)
|
|
||||||
}
|
|
||||||
"capture_MONO" => {
|
|
||||||
output_device.output_fl = Some(port.clone());
|
|
||||||
output_device.output_fr = Some(port)
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut input_devices: Vec<AudioDevice> = input_devices.values().cloned().collect();
|
let mut input_devices: Vec<AudioDevice> = input_devices.into_values().collect();
|
||||||
let mut output_devices: Vec<AudioDevice> =
|
let mut output_devices: Vec<AudioDevice> = output_devices.into_values().collect();
|
||||||
output_devices.values().cloned().collect();
|
|
||||||
|
|
||||||
input_devices.sort_by_key(|a| a.id);
|
input_devices.sort_by_key(|a| a.id);
|
||||||
output_devices.sort_by_key(|a| a.id);
|
output_devices.sort_by_key(|a| a.id);
|
||||||
Executable
+175
@@ -0,0 +1,175 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import sys
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
import shutil
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
|
# Helper to print errors and exit
|
||||||
|
def fatal(msg):
|
||||||
|
print(f"Error: {msg}", file=sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
|
# Get the root directory of the project
|
||||||
|
root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
os.chdir(root_dir)
|
||||||
|
|
||||||
|
# Read current version from Cargo.toml
|
||||||
|
cargo_toml_path = "Cargo.toml"
|
||||||
|
if not os.path.exists(cargo_toml_path):
|
||||||
|
fatal("Cargo.toml not found in the root directory.")
|
||||||
|
|
||||||
|
with open(cargo_toml_path, "r", encoding="utf-8") as f:
|
||||||
|
cargo_toml_content = f.read()
|
||||||
|
|
||||||
|
# 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
|
||||||
|
)
|
||||||
|
if not workspace_package_match:
|
||||||
|
fatal("Could not find [workspace.package] section in Cargo.toml.")
|
||||||
|
|
||||||
|
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)
|
||||||
|
print(f"Current version detected: {current_version}")
|
||||||
|
|
||||||
|
# Get new version
|
||||||
|
if len(sys.argv) < 2:
|
||||||
|
try:
|
||||||
|
new_version = input(f"Enter new version: ").strip()
|
||||||
|
except (KeyboardInterrupt, EOFError):
|
||||||
|
print()
|
||||||
|
sys.exit(0)
|
||||||
|
if not new_version:
|
||||||
|
fatal("No version provided.")
|
||||||
|
else:
|
||||||
|
new_version = sys.argv[1].strip()
|
||||||
|
|
||||||
|
if not re.match(r"^\d+\.\d+\.\d+(-[a-zA-Z0-9.]+)?$", new_version):
|
||||||
|
fatal(f"Invalid version format: '{new_version}'. Should be like '1.10.1'.")
|
||||||
|
|
||||||
|
# 1. Update Cargo.toml
|
||||||
|
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
|
||||||
|
)
|
||||||
|
return f"[workspace.package]{updated_section_content}"
|
||||||
|
|
||||||
|
|
||||||
|
new_cargo_toml = re.sub(
|
||||||
|
r"\[workspace\.package\](.*?)(?=\n\[|$)",
|
||||||
|
replace_version_in_workspace,
|
||||||
|
cargo_toml_content,
|
||||||
|
flags=re.DOTALL,
|
||||||
|
)
|
||||||
|
|
||||||
|
with open(cargo_toml_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(new_cargo_toml)
|
||||||
|
|
||||||
|
# Update Cargo.lock using cargo
|
||||||
|
print("Updating Cargo.lock using cargo generate-lockfile...")
|
||||||
|
try:
|
||||||
|
subprocess.run(["cargo", "generate-lockfile"], check=True)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Warning: Failed to update Cargo.lock using cargo: {e}")
|
||||||
|
|
||||||
|
# 2. Update packages/aur/bin/PKGBUILD
|
||||||
|
pkgbuild_bin_path = "packages/aur/bin/PKGBUILD"
|
||||||
|
if os.path.exists(pkgbuild_bin_path):
|
||||||
|
print(f"Updating {pkgbuild_bin_path}...")
|
||||||
|
with open(pkgbuild_bin_path, "r", encoding="utf-8") as f:
|
||||||
|
content = f.read()
|
||||||
|
content = re.sub(r"pkgver=[^\n]+", f"pkgver={new_version}", content)
|
||||||
|
content = re.sub(r"pkgrel=[^\n]+", "pkgrel=1", content)
|
||||||
|
with open(pkgbuild_bin_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(content)
|
||||||
|
|
||||||
|
# 3. Update packages/aur/standart/PKGBUILD
|
||||||
|
pkgbuild_std_path = "packages/aur/standart/PKGBUILD"
|
||||||
|
if os.path.exists(pkgbuild_std_path):
|
||||||
|
print(f"Updating {pkgbuild_std_path}...")
|
||||||
|
with open(pkgbuild_std_path, "r", encoding="utf-8") as f:
|
||||||
|
content = f.read()
|
||||||
|
content = re.sub(r"pkgver=[^\n]+", f"pkgver={new_version}", content)
|
||||||
|
content = re.sub(r"pkgrel=[^\n]+", "pkgrel=1", content)
|
||||||
|
with open(pkgbuild_std_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(content)
|
||||||
|
|
||||||
|
|
||||||
|
# Update AUR .SRCINFO files
|
||||||
|
def update_srcinfo(directory, pkgbuild_path, srcinfo_path):
|
||||||
|
if not os.path.exists(srcinfo_path):
|
||||||
|
return
|
||||||
|
print(f"Updating {srcinfo_path}...")
|
||||||
|
if shutil.which("makepkg"):
|
||||||
|
try:
|
||||||
|
print(f"Running makepkg --printsrcinfo in {directory}...")
|
||||||
|
result = subprocess.run(
|
||||||
|
["makepkg", "--printsrcinfo"],
|
||||||
|
cwd=directory,
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
check=True,
|
||||||
|
)
|
||||||
|
with open(srcinfo_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(result.stdout)
|
||||||
|
return
|
||||||
|
except Exception as e:
|
||||||
|
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:
|
||||||
|
content = f.read()
|
||||||
|
content = re.sub(r"pkgver\s*=\s*[^\n]+", f"pkgver = {new_version}", content)
|
||||||
|
content = re.sub(r"pkgrel\s*=\s*[^\n]+", "pkgrel = 1", content)
|
||||||
|
content = content.replace(current_version, new_version)
|
||||||
|
with open(srcinfo_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(content)
|
||||||
|
|
||||||
|
|
||||||
|
update_srcinfo("packages/aur/bin", pkgbuild_bin_path, "packages/aur/bin/.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"
|
||||||
|
if os.path.exists(flatpak_xml_path):
|
||||||
|
print(f"Updating {flatpak_xml_path}...")
|
||||||
|
with open(flatpak_xml_path, "r", encoding="utf-8") as f:
|
||||||
|
content = f.read()
|
||||||
|
|
||||||
|
today_str = datetime.today().strftime("%Y-%m-%d")
|
||||||
|
content = re.sub(
|
||||||
|
r'<release\s+version="[^"]+"\s+date="[^"]+"\s*/?>',
|
||||||
|
f'<release version="{new_version}" date="{today_str}" />',
|
||||||
|
content,
|
||||||
|
)
|
||||||
|
with open(flatpak_xml_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(content)
|
||||||
|
|
||||||
|
# 5. Update packages/rpm/pwsp.spec
|
||||||
|
rpm_spec_path = "packages/rpm/pwsp.spec"
|
||||||
|
if os.path.exists(rpm_spec_path):
|
||||||
|
print(f"Updating {rpm_spec_path}...")
|
||||||
|
with open(rpm_spec_path, "r", encoding="utf-8") as f:
|
||||||
|
content = f.read()
|
||||||
|
content = re.sub(r"Version:\s*[^\n]+", f"Version: {new_version}", content)
|
||||||
|
with open(rpm_spec_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(content)
|
||||||
|
|
||||||
|
print(f"Successfully updated all versions to {new_version}!")
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
use crate::gui::SoundpadGui;
|
|
||||||
use egui::{AtomExt, Button, ComboBox, Label, RichText, Slider, Ui, Vec2};
|
|
||||||
use egui_material_icons::icons::*;
|
|
||||||
use rust_i18n::t;
|
|
||||||
use std::time::Instant;
|
|
||||||
|
|
||||||
impl SoundpadGui {
|
|
||||||
pub fn draw_footer(&mut self, ui: &mut Ui) {
|
|
||||||
ui.add_space(5.0);
|
|
||||||
ui.horizontal(|ui| {
|
|
||||||
// ---------- Microphone selection ----------
|
|
||||||
let mics = &self.audio_player_state.all_inputs_sorted;
|
|
||||||
|
|
||||||
let mut selected_input = self.audio_player_state.current_input.to_owned();
|
|
||||||
let prev_input = selected_input.to_owned();
|
|
||||||
ComboBox::from_label(t!("gui.choose_mic_select"))
|
|
||||||
.height(30.0)
|
|
||||||
.selected_text(
|
|
||||||
self.audio_player_state
|
|
||||||
.all_inputs
|
|
||||||
.get(&selected_input)
|
|
||||||
.unwrap_or(&String::new()),
|
|
||||||
)
|
|
||||||
.show_ui(ui, |ui| {
|
|
||||||
for (name, nick) in mics {
|
|
||||||
ui.selectable_value(&mut selected_input, name.clone(), nick);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if selected_input != prev_input {
|
|
||||||
self.set_input(selected_input);
|
|
||||||
}
|
|
||||||
// --------------------------------
|
|
||||||
|
|
||||||
// ---------- Master Volume Slider ----------
|
|
||||||
let volume_icon = Self::get_volume_icon(self.audio_player_state.volume);
|
|
||||||
let volume_label = Label::new(RichText::new(volume_icon).size(18.0));
|
|
||||||
ui.add_sized([18.0, 18.0], volume_label)
|
|
||||||
.on_hover_text(format!(
|
|
||||||
"Master Volume: {:.0}%",
|
|
||||||
self.audio_player_state.volume * 100.0
|
|
||||||
));
|
|
||||||
|
|
||||||
let should_update_volume = !self.app_state.volume_dragged
|
|
||||||
&& self
|
|
||||||
.app_state
|
|
||||||
.ignore_volume_update_until
|
|
||||||
.map(|t| Instant::now() > t)
|
|
||||||
.unwrap_or(true);
|
|
||||||
|
|
||||||
if should_update_volume {
|
|
||||||
self.app_state.volume_slider_value = self.audio_player_state.volume;
|
|
||||||
}
|
|
||||||
|
|
||||||
let volume_slider = Slider::new(&mut self.app_state.volume_slider_value, 0.0..=1.0)
|
|
||||||
.show_value(false)
|
|
||||||
.step_by(0.01);
|
|
||||||
let volume_slider_response = ui.add_sized([150.0, 18.0], volume_slider);
|
|
||||||
if volume_slider_response.drag_stopped() {
|
|
||||||
self.app_state.volume_dragged = true;
|
|
||||||
}
|
|
||||||
// ------------------------------------------
|
|
||||||
|
|
||||||
ui.add_space(ui.available_width() - 18.0 * 2.0 - ui.spacing().item_spacing.x * 2.0);
|
|
||||||
|
|
||||||
// ---------- Hotkeys button ----------
|
|
||||||
let hotkeys_button =
|
|
||||||
Button::new(ICON_KEYBOARD.atom_size(Vec2::new(18.0, 18.0))).frame(false);
|
|
||||||
let hotkeys_button_response = ui.add_sized([18.0, 18.0], hotkeys_button);
|
|
||||||
if hotkeys_button_response.clicked() {
|
|
||||||
self.app_state.show_hotkeys = true;
|
|
||||||
}
|
|
||||||
hotkeys_button_response.on_hover_text("Hotkeys (H)");
|
|
||||||
// --------------------------------
|
|
||||||
|
|
||||||
// ---------- Settings button ----------
|
|
||||||
let settings_button =
|
|
||||||
Button::new(ICON_SETTINGS.atom_size(Vec2::new(18.0, 18.0))).frame(false);
|
|
||||||
let settings_button_response = ui.add_sized([18.0, 18.0], settings_button);
|
|
||||||
if settings_button_response.clicked() {
|
|
||||||
self.app_state.show_settings = true;
|
|
||||||
}
|
|
||||||
// --------------------------------
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
#[derive(Debug)]
|
|
||||||
pub struct Terminate {}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
|
|
||||||
pub struct Port {
|
|
||||||
pub node_id: u32,
|
|
||||||
pub port_id: u32,
|
|
||||||
|
|
||||||
pub name: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
|
|
||||||
pub enum DeviceType {
|
|
||||||
Input,
|
|
||||||
Output,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
|
|
||||||
pub struct AudioDevice {
|
|
||||||
pub id: u32,
|
|
||||||
|
|
||||||
pub nick: String,
|
|
||||||
pub name: String,
|
|
||||||
|
|
||||||
pub device_type: DeviceType,
|
|
||||||
|
|
||||||
pub input_fl: Option<Port>,
|
|
||||||
pub input_fr: Option<Port>,
|
|
||||||
pub output_fl: Option<Port>,
|
|
||||||
pub output_fr: Option<Port>,
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user