change version to 1.2.0

fix .deb uploading

Cargo.lock

@@ -1726,13 +1726,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50"
 dependencies = [
  "bitflags 2.10.0",
  "libc",
- "redox_syscall 0.5.18",
+ "redox_syscall 0.6.0",
 ]
 
 [[package]]
@@ -1864,9 +1864,9 @@ dependencies = [
 
 [[package]]
 name = "moxcms"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80986bbbcf925ebd3be54c26613d861255284584501595cf418320c078945608"
+checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -2601,7 +2601,7 @@ checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 
 [[package]]
 name = "pwsp"
-version = "1.1.4"
+version = "1.2.0"
 dependencies = [
  "async-trait",
  "clap",
@@ -2730,6 +2730,15 @@ dependencies = [
  "bitflags 2.10.0",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec96166dafa0886eb81fe1c0a388bece180fbef2135f97c1e2cf8302e74b43b5"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.5.2"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pwsp"
-version = "1.1.4"
+version = "1.2.0"
 edition = "2024"
 authors = ["arabian"]
 description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."

pwsp.spec

@@ -4,7 +4,7 @@
 %global cargo_install_lib 0
 
 Name:            pwsp
-Version:         1.1.4
+Version:         1.2.0
 Release:         %autorelease
 Summary:         Lets you play audio files through your microphone
 

src/bin/cli.rs

@@ -14,17 +14,17 @@ struct Cli {
 
 #[derive(Subcommand, Debug)]
 enum Commands {
-    /// Perform an action (ping, pause, resume, stop, play)
+    /// Perform an action (ping, pause, resume, toggle-pause, stop, play)
     Action {
         #[clap(subcommand)]
         action: Actions,
     },
-    /// Get information from the player (is paused, volume, position, state)
+    /// 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)
+    /// Set information in the player (volume, position, input)
     Set {
         #[clap(subcommand)]
         parameter: SetCommands,
@@ -39,6 +39,8 @@ enum Actions {
     Pause,
     /// Resume audio playback
     Resume,
+    /// Toggle pause
+    TogglePause,
     /// Stop audio playback and clear the queue
     Stop,
     /// Play a file
@@ -51,11 +53,11 @@ enum GetCommands {
     IsPaused,
     /// Playback volume
     Volume,
-    /// Playback position
+    /// Playback position (in seconds)
     Position,
     /// Duration of the current file
     Duration,
-    /// Player state
+    /// Player state (Playing, Paused or Stopped)
     State,
     /// Current playing file path
     CurrentFilePath,
@@ -69,9 +71,9 @@ enum GetCommands {
 enum SetCommands {
     /// Playback volume
     Volume { volume: f32 },
-    /// Playback position
+    /// Playback position (in seconds)
     Position { position: f32 },
-    /// Input
+    /// Audio input id (see pwsp-cli get inputs)
     Input { name: String },
 }
 
@@ -86,6 +88,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
             Actions::Ping => Request::ping(),
             Actions::Pause => Request::pause(),
             Actions::Resume => Request::resume(),
+            Actions::TogglePause => Request::toggle_pause(),
             Actions::Stop => Request::stop(),
             Actions::Play { file_path } => Request::play(file_path.to_str().unwrap()),
         },

src/gui/draw.rs

@@ -1,7 +1,7 @@
-use crate::gui::SoundpadGui;
+use crate::gui::{SUPPORTED_EXTENSIONS, SoundpadGui};
 use egui::{
-    AtomExt, Button, Color32, ComboBox, FontFamily, Label, RichText, ScrollArea, Slider, TextEdit,
+    Align, AtomExt, Button, Color32, ComboBox, FontFamily, Label, Layout, RichText, ScrollArea,
-    Ui, Vec2,
+    Slider, TextEdit, Ui, Vec2,
 };
 use egui_material_icons::icons;
 use pwsp::types::audio_player::PlayerState;
@@ -48,10 +48,15 @@ impl SoundpadGui {
                 &mut self.config.save_scale_factor,
                 "Always remember UI scale factor",
             );
+            let pause_on_exit_response = ui.checkbox(
+                &mut self.config.pause_on_exit,
+                "Pause audio playback when the window is closed",
+            );
 
             if save_volume_response.changed()
                 || save_input_response.changed()
                 || save_scale_response.changed()
+                || pause_on_exit_response.changed()
             {
                 self.config.save_to_file().ok();
             }
@@ -182,6 +187,8 @@ impl SoundpadGui {
             ui.set_min_height(area_size.y);
 
             ScrollArea::vertical().id_salt(0).show(ui, |ui| {
+                ui.set_min_width(area_size.x);
+
                 let mut dirs: Vec<PathBuf> = self.app_state.dirs.iter().cloned().collect();
                 dirs.sort();
                 for path in dirs.iter() {
@@ -216,10 +223,18 @@ impl SoundpadGui {
                 }
 
                 ui.horizontal(|ui| {
-                    let add_dir_button = egui::Button::new(icons::ICON_ADD).frame(false);
+                    let add_dirs_button = Button::new(icons::ICON_ADD).frame(false);
-                    let add_dir_button_response = ui.add_sized([18.0, 18.0], add_dir_button);
+                    let add_dirs_button_response = ui.add_sized([18.0, 18.0], add_dirs_button);
-                    if add_dir_button_response.clicked() {
+                    if add_dirs_button_response.clicked() {
-                        self.add_dir();
+                        self.add_dirs();
+                    }
+                });
+
+                ui.with_layout(Layout::bottom_up(Align::Min), |ui| {
+                    let play_file_button = Button::new("Play file");
+                    let play_file_button_response = ui.add(play_file_button);
+                    if play_file_button_response.clicked() {
+                        self.open_file();
                     }
                 });
             });
@@ -227,10 +242,6 @@ impl SoundpadGui {
     }
 
     fn draw_files(&mut self, ui: &mut Ui, area_size: Vec2) {
-        let extensions = [
-            "mp3", "wav", "ogg", "flac", "mp4", "m4a", "aac", "mov", "mkv", "webm", "avi",
-        ];
-
         ui.vertical(|ui| {
             ui.horizontal(|ui| {
                 let search_field = ui.add_sized(
@@ -256,7 +267,7 @@ impl SoundpadGui {
                             continue;
                         }
 
-                        if !extensions
+                        if !SUPPORTED_EXTENSIONS
                             .contains(&entry_path.extension().unwrap_or_default().to_str().unwrap())
                         {
                             continue;

src/gui/mod.rs

@@ -23,6 +23,10 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+const SUPPORTED_EXTENSIONS: [&str; 11] = [
+    "mp3", "wav", "ogg", "flac", "mp4", "m4a", "aac", "mov", "mkv", "webm", "avi",
+];
+
 struct SoundpadGui {
     pub app_state: AppState,
     pub config: GuiConfig,
@@ -68,10 +72,19 @@ impl SoundpadGui {
         };
     }
 
-    pub fn add_dir(&mut self) {
+    pub fn open_file(&mut self) {
+        let file_dialog = FileDialog::new().add_filter("Audio File", &SUPPORTED_EXTENSIONS);
+        if let Some(path) = file_dialog.pick_file() {
+            self.play_file(&path);
+        }
+    }
+
+    pub fn add_dirs(&mut self) {
         let file_dialog = FileDialog::new();
-        if let Some(path) = file_dialog.pick_folder() {
+        if let Some(paths) = file_dialog.pick_folders() {
-            self.app_state.dirs.insert(path);
+            for path in paths {
+                self.app_state.dirs.insert(path);
+            }
             self.config.dirs = self.app_state.dirs.clone();
             self.config.save_to_file().ok();
         }
@@ -83,6 +96,7 @@ impl SoundpadGui {
             && current_dir == path
         {
             self.app_state.current_dir = None;
+            self.app_state.files.clear();
         }
         self.config.dirs = self.app_state.dirs.clone();
         self.config.save_to_file().ok();
@@ -138,7 +152,13 @@ pub async fn run() -> Result<(), Box<dyn Error>> {
             Ok(Box::new(SoundpadGui::new(&cc.egui_ctx)))
         }),
     ) {
-        Ok(_) => Ok(()),
+        Ok(_) => {
+            let config = get_gui_config();
+            if config.pause_on_exit {
+                make_request_sync(Request::pause()).ok();
+            }
+            Ok(())
+        }
         Err(e) => Err(e.into()),
     }
 }

src/types/commands.rs

@@ -1,5 +1,5 @@
 use crate::{
-    types::socket::Response,
+    types::{audio_player::PlayerState, socket::Response},
     utils::{daemon::get_audio_player, pipewire::get_all_devices},
 };
 use async_trait::async_trait;
@@ -16,6 +16,8 @@ pub struct PauseCommand {}
 
 pub struct ResumeCommand {}
 
+pub struct TogglePauseCommand {}
+
 pub struct StopCommand {}
 
 pub struct IsPausedCommand {}
@@ -75,6 +77,25 @@ impl Executable for ResumeCommand {
     }
 }
 
+#[async_trait]
+impl Executable for TogglePauseCommand {
+    async fn execute(&self) -> Response {
+        let mut audio_player = get_audio_player().await.lock().await;
+
+        if audio_player.get_state() == PlayerState::Stopped {
+            return Response::new(false, "Audio is not playing");
+        }
+
+        if audio_player.is_paused() {
+            audio_player.resume();
+            Response::new(true, "Audio was resumed")
+        } else {
+            audio_player.pause();
+            Response::new(true, "Audio was paused")
+        }
+    }
+}
+
 #[async_trait]
 impl Executable for StopCommand {
     async fn execute(&self) -> Response {

src/types/config.rs

@@ -36,6 +36,7 @@ pub struct GuiConfig {
     pub save_volume: bool,
     pub save_input: bool,
     pub save_scale_factor: bool,
+    pub pause_on_exit: bool,
 
     pub dirs: HashSet<PathBuf>,
 }
@@ -48,6 +49,7 @@ impl Default for GuiConfig {
             save_volume: false,
             save_input: false,
             save_scale_factor: false,
+            pause_on_exit: false,
 
             dirs: HashSet::default(),
         }

src/types/socket.rs

@@ -32,6 +32,10 @@ impl Request {
         Request::new("resume", vec![])
     }
 
+    pub fn toggle_pause() -> Self {
+        Request::new("toggle_pause", vec![])
+    }
+
     pub fn stop() -> Self {
         Request::new("stop", vec![])
     }

src/utils/commands.rs

@@ -7,6 +7,7 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
         "ping" => Some(Box::new(PingCommand {})),
         "pause" => Some(Box::new(PauseCommand {})),
         "resume" => Some(Box::new(ResumeCommand {})),
+        "toggle_pause" => Some(Box::new(TogglePauseCommand {})),
         "stop" => Some(Box::new(StopCommand {})),
         "is_paused" => Some(Box::new(IsPausedCommand {})),
         "get_state" => Some(Box::new(GetStateCommand {})),