mirror of
https://github.com/arabianq/pipewire-soundpad.git
synced 2026-06-19 04:03:33 +00:00
Refactor to Cargo Workspace (#129)
* Refactor project into a Cargo workspace with distinct packages - Created a root `Cargo.toml` defining a workspace. - Moved `src/types` and `src/utils` into a new `pwsp-lib` crate for shared logic. - Split binaries into their own crates: `pwsp-daemon`, `pwsp-cli`, and `pwsp-gui`. - Shifted all dependencies into `[workspace.dependencies]` for centralized version management. - Updated import paths across all crates (e.g. from `pwsp::` to `pwsp_lib::`). - Updated build scripts, GitHub actions, Flatpak manifest, and AUR PKGBUILD to support the new workspace structure. - Ensured no core application logic was altered. Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * Fix cargo-deb build process in GitHub actions for workspace architecture Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * Fix cargo-deb asset discovery by using exact target/release paths Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * refactor deps in Cargo.toml files * fix incorrect assets path --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
This commit is contained in:
Tarasov Aleksandr
committed by
GitHub
GitHub
parent
6c59137639
commit
0476329798
@@ -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
|
||||
@@ -0,0 +1,212 @@
|
||||
use anyhow::{Result, anyhow};
|
||||
use clap::{Parser, Subcommand};
|
||||
use pwsp_lib::{
|
||||
types::socket::Request,
|
||||
utils::daemon::{make_request, wait_for_daemon},
|
||||
};
|
||||
use std::path::PathBuf;
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about, long_about = None)]
|
||||
struct Cli {
|
||||
#[clap(subcommand)]
|
||||
command: Commands,
|
||||
}
|
||||
|
||||
#[derive(Subcommand, Debug)]
|
||||
enum Commands {
|
||||
/// Perform an action (ping, pause, resume, toggle-pause, stop, play)
|
||||
Action {
|
||||
#[clap(subcommand)]
|
||||
action: Actions,
|
||||
},
|
||||
/// Get information from the player (is paused, volume, position, duration, state, current-file-path, input, inputs)
|
||||
Get {
|
||||
#[clap(subcommand)]
|
||||
parameter: GetCommands,
|
||||
},
|
||||
/// Set information in the player (volume, position, input)
|
||||
Set {
|
||||
#[clap(subcommand)]
|
||||
parameter: SetCommands,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Subcommand, Debug)]
|
||||
enum Actions {
|
||||
/// Ping the daemon
|
||||
Ping,
|
||||
/// Kill the daemon
|
||||
Kill,
|
||||
/// Pause audio playback
|
||||
Pause {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Resume audio playback
|
||||
Resume {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Toggle pause
|
||||
TogglePause {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Stop audio playback and clear the queue
|
||||
Stop {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Play a file
|
||||
Play {
|
||||
file_path: PathBuf,
|
||||
#[clap(short, long)]
|
||||
concurrent: bool,
|
||||
},
|
||||
/// Toggle loop
|
||||
ToggleLoop {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Play a sound by hotkey slot name
|
||||
PlayHotkey { slot: String },
|
||||
/// Remove the hotkey slot
|
||||
ClearHotkey { slot: String },
|
||||
/// Clear the key chord for a hotkey slot
|
||||
ClearHotkeyKey { slot: String },
|
||||
}
|
||||
|
||||
#[derive(Subcommand, Debug)]
|
||||
enum GetCommands {
|
||||
/// Check if the player is paused
|
||||
IsPaused,
|
||||
/// Playback volume
|
||||
Volume {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Playback position (in seconds)
|
||||
Position {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Duration of the current file
|
||||
Duration {
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Player state (Playing, Paused or Stopped)
|
||||
State,
|
||||
/// Get all playing tracks
|
||||
Tracks,
|
||||
/// Current audio input
|
||||
Input,
|
||||
/// All audio inputs
|
||||
Inputs,
|
||||
/// Version of the daemon
|
||||
DaemonVersion,
|
||||
/// Full player state
|
||||
FullState,
|
||||
/// All hotkey slots
|
||||
Hotkeys,
|
||||
}
|
||||
|
||||
#[derive(Subcommand, Debug)]
|
||||
enum SetCommands {
|
||||
/// Playback volume
|
||||
Volume {
|
||||
volume: f32,
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Playback position (in seconds)
|
||||
Position {
|
||||
position: f32,
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Audio input id (see pwsp-cli get inputs)
|
||||
Input { name: String },
|
||||
/// Enable or disable loop (true or false)
|
||||
Loop {
|
||||
enabled: String,
|
||||
#[clap(short, long)]
|
||||
id: Option<u32>,
|
||||
},
|
||||
/// Assign a sound file to a hotkey slot
|
||||
Hotkey { slot: String, file_path: PathBuf },
|
||||
/// Set the key chord for a hotkey slot (e.g. "Ctrl+Alt+1")
|
||||
HotkeyKey { slot: String, key_chord: String },
|
||||
/// Atomically set the action and key chord for a hotkey slot
|
||||
HotkeyActionAndKey {
|
||||
slot: String,
|
||||
action: String,
|
||||
key_chord: String,
|
||||
},
|
||||
}
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<()> {
|
||||
let cli = Cli::parse();
|
||||
|
||||
wait_for_daemon().await?;
|
||||
|
||||
let request = match cli.command {
|
||||
Commands::Action { action } => match action {
|
||||
Actions::Ping => Request::ping(),
|
||||
Actions::Kill => Request::kill(),
|
||||
Actions::Pause { id } => Request::pause(id),
|
||||
Actions::Resume { id } => Request::resume(id),
|
||||
Actions::TogglePause { id } => Request::toggle_pause(id),
|
||||
Actions::Stop { id } => Request::stop(id),
|
||||
Actions::Play {
|
||||
file_path,
|
||||
concurrent,
|
||||
} => Request::play(&file_path.to_string_lossy(), concurrent),
|
||||
Actions::ToggleLoop { id } => Request::toggle_loop(id),
|
||||
Actions::PlayHotkey { slot } => Request::play_hotkey(&slot),
|
||||
Actions::ClearHotkey { slot } => Request::clear_hotkey(&slot),
|
||||
Actions::ClearHotkeyKey { slot } => Request::clear_hotkey_key(&slot),
|
||||
},
|
||||
Commands::Get { parameter } => match parameter {
|
||||
GetCommands::IsPaused => Request::get_is_paused(),
|
||||
GetCommands::Volume { id } => Request::get_volume(id),
|
||||
GetCommands::Position { id } => Request::get_position(id),
|
||||
GetCommands::Duration { id } => Request::get_duration(id),
|
||||
GetCommands::State => Request::get_state(),
|
||||
GetCommands::Tracks => Request::get_tracks(),
|
||||
GetCommands::Input => Request::get_input(),
|
||||
GetCommands::Inputs => Request::get_inputs(),
|
||||
GetCommands::DaemonVersion => Request::get_daemon_version(),
|
||||
GetCommands::FullState => Request::get_full_state(),
|
||||
GetCommands::Hotkeys => Request::get_hotkeys(),
|
||||
},
|
||||
Commands::Set { parameter } => match parameter {
|
||||
SetCommands::Volume { volume, id } => Request::set_volume(volume, id),
|
||||
SetCommands::Position { position, id } => Request::seek(position, id),
|
||||
SetCommands::Input { name } => Request::set_input(&name),
|
||||
SetCommands::Loop { enabled, id } => Request::set_loop(&enabled, id),
|
||||
SetCommands::Hotkey { slot, file_path } => {
|
||||
Request::set_hotkey(&slot, &file_path.to_string_lossy())
|
||||
}
|
||||
SetCommands::HotkeyKey { slot, key_chord } => {
|
||||
Request::set_hotkey_key(&slot, &key_chord)
|
||||
}
|
||||
SetCommands::HotkeyActionAndKey {
|
||||
slot,
|
||||
action,
|
||||
key_chord,
|
||||
} => Request::set_hotkey_action_and_key(
|
||||
&slot,
|
||||
&serde_json::from_str::<Request>(&action)?,
|
||||
&key_chord,
|
||||
),
|
||||
},
|
||||
};
|
||||
|
||||
let response = make_request(request).await.map_err(|e| anyhow!(e))?;
|
||||
println!("{} : {}", response.status, response.message);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
Reference in New Issue
Block a user