change version to 1.2.0

fix .deb uploading

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pwsp"
-version = "1.0.3"
+version = "1.2.0"
 edition = "2024"
 authors = ["arabian"]
 description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
@@ -12,22 +12,22 @@ keywords = ["soundpad", "pipewire", "linux", "cli", "gui"]
 
 
 [dependencies]
-tokio = { version = "1.47.1", features = ["full"] }
+tokio = { version = "1.48.0", features = ["full"] }
 futures = { version = "0.3.31", features = ["thread-pool"] }
 async-trait = "0.1.89"
 
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
 
-clap = { version = "4.5.49", default-features = false, features = ["std", "suggestions", "help", "usage", "error-context", "derive"] }
+clap = { version = "4.5.53", default-features = false, features = ["std", "suggestions", "help", "usage", "error-context", "derive"] }
 dirs = "6.0.0"
 
 rodio = { version = "0.21.1", default-features = false, features = ["symphonia-all", "playback"] }
 pipewire = "0.9.2"
-rfd = "0.15.4"
+rfd = "0.16.0"
 
-egui = { version = "0.33.0", default-features = false, features = ["default_fonts", "rayon"] }
+egui = { version = "0.33.3", default-features = false, features = ["default_fonts", "rayon"] }
-eframe = { version = "0.33.0", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] }
+eframe = { version = "0.33.3", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] }
 egui_material_icons = "0.5.0"
 
 [[bin]]

assets/pwsp-daemon.service

@@ -3,6 +3,7 @@ Description=Pipewire Soundpad Daemon
 After=pipewire.service
 
 [Service]
+ExecStartPre=/usr/bin/sleep 10
 ExecStart=/usr/bin/pwsp-daemon
 Restart=no
 RuntimeDirectory=pwsp

pwsp.spec

@@ -4,7 +4,7 @@
 %global cargo_install_lib 0
 
 Name:            pwsp
-Version:         1.0.3
+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();
             }
@@ -115,7 +120,7 @@ impl SoundpadGui {
             let position_slider_width = ui.available_width()
                 - (30.0 * 3.0)
                 - default_slider_width
-                - (ui.spacing().item_spacing.x * 5.0);
+                - (ui.spacing().item_spacing.x * 6.0);
             ui.spacing_mut().slider_width = position_slider_width;
             let position_slider_response = ui.add_sized([30.0, 30.0], position_slider);
             if position_slider_response.drag_stopped() {
@@ -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() {
@@ -191,28 +198,43 @@ impl SoundpadGui {
                             .map(|s| s.to_string_lossy().to_string())
                             .unwrap_or_else(|| path.to_string_lossy().to_string());
 
+                        let mut dir_button_text = RichText::new(name.clone());
+                        if let Some(current_dir) = &self.app_state.current_dir {
+                            if current_dir.eq(path) {
+                                dir_button_text = dir_button_text.color(Color32::WHITE);
+                            }
+                        }
+
                         let dir_button =
-                            Button::new(RichText::new(name).atom_max_width(area_size.x))
+                            Button::new(dir_button_text.atom_max_width(area_size.x)).frame(false);
-                                .frame(false);
+
                         let dir_button_response = ui.add(dir_button);
                         if dir_button_response.clicked() {
-                            self.app_state.current_dir = Some(path.clone());
+                            self.open_dir(path);
                         }
 
                         let delete_dir_button = Button::new(icons::ICON_DELETE).frame(false);
                         let delete_dir_button_response =
                             ui.add_sized([18.0, 18.0], delete_dir_button);
                         if delete_dir_button_response.clicked() {
-                            self.remove_dir(path.clone());
+                            self.remove_dir(&path.clone());
                         }
                     });
                 }
 
                 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();
                     }
                 });
             });
@@ -220,16 +242,14 @@ 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| {
-                ui.add_sized(
+                let search_field = ui.add_sized(
                     [ui.available_width(), 22.0],
                     TextEdit::singleline(&mut self.app_state.search_query).hint_text("Search..."),
                 );
+
+                self.app_state.search_field_id = Some(search_field.id);
             });
 
             ui.separator();
@@ -239,43 +259,49 @@ impl SoundpadGui {
                 ui.set_min_height(area_size.y);
 
                 ui.vertical(|ui| {
-                    if let Some(path) = self.app_state.current_dir.clone() {
+                    let mut files: Vec<PathBuf> = self.app_state.files.iter().cloned().collect();
-                        for entry in path.read_dir().unwrap() {
+                    files.sort();
-                            let entry = entry.unwrap();
-                            let entry_path = entry.path();
 
-                            if entry_path.is_dir() {
+                    for entry_path in files {
-                                continue;
+                        if entry_path.is_dir() {
+                            continue;
+                        }
+
+                        if !SUPPORTED_EXTENSIONS
+                            .contains(&entry_path.extension().unwrap_or_default().to_str().unwrap())
+                        {
+                            continue;
+                        }
+
+                        let file_name = entry_path
+                            .file_name()
+                            .unwrap()
+                            .to_string_lossy()
+                            .to_string();
+
+                        let search_query = self
+                            .app_state
+                            .search_query
+                            .to_lowercase()
+                            .trim()
+                            .to_string();
+
+                        if !file_name.to_lowercase().contains(search_query.as_str()) {
+                            continue;
+                        }
+
+                        let mut file_button_text = RichText::new(file_name);
+                        if let Some(current_file) = &self.app_state.selected_file {
+                            if current_file.eq(&entry_path) {
+                                file_button_text = file_button_text.color(Color32::WHITE);
                             }
+                        }
 
-                            if !extensions.contains(
+                        let file_button = Button::new(file_button_text).frame(false);
-                                &entry_path.extension().unwrap_or_default().to_str().unwrap(),
+                        let file_button_response = ui.add(file_button);
-                            ) {
+                        if file_button_response.clicked() {
-                                continue;
+                            self.play_file(&entry_path);
-                            }
+                            self.app_state.selected_file = Some(entry_path);
-
-                            let file_name = entry_path
-                                .file_name()
-                                .unwrap()
-                                .to_string_lossy()
-                                .to_string();
-
-                            let search_query = self
-                                .app_state
-                                .search_query
-                                .to_lowercase()
-                                .trim()
-                                .to_string();
-
-                            if !file_name.to_lowercase().contains(search_query.as_str()) {
-                                continue;
-                            }
-
-                            let file_button = Button::new(file_name).frame(false);
-                            let file_button_response = ui.add(file_button);
-                            if file_button_response.clicked() {
-                                self.play_file(entry_path);
-                            }
                         }
                     }
                 });

src/gui/input.rs

@@ -1,23 +1,106 @@
 use crate::gui::SoundpadGui;
 use egui::{Context, Key};
 
+use std::path::PathBuf;
+
 impl SoundpadGui {
     pub fn handle_input(&mut self, ctx: &Context) {
+        if ctx.memory(|reader| { reader.focused() }.is_some()) {
+            return;
+        }
+
         ctx.input(|i| {
+            // Close app on espace
             if i.key_pressed(Key::Escape) {
                 std::process::exit(0);
             }
 
-            if !self.app_state.show_settings && i.key_pressed(Key::Space) {
+            // Open/close settings
-                self.play_toggle();
+            if i.key_pressed(Key::I) {
-            }
-
-            if i.key_pressed(Key::Slash) {
                 self.app_state.show_settings = !self.app_state.show_settings;
             }
 
-            if self.app_state.show_settings && i.key_pressed(Key::Backspace) {
+            if i.key_pressed(Key::Enter) && self.app_state.selected_file.is_some() {
-                self.app_state.show_settings = false;
+                self.play_file(&self.app_state.selected_file.clone().unwrap());
+            }
+
+            if !self.app_state.show_settings {
+                // Pause / resume audio on space
+                if i.key_pressed(Key::Space) {
+                    self.play_toggle();
+                }
+
+                // Focus search field
+                if i.key_pressed(Key::Slash) && self.app_state.search_field_id.is_some() {
+                    self.app_state.force_focus_id = self.app_state.search_field_id;
+                }
+
+                // Iterate through dirs if there are some
+                if i.modifiers.ctrl {
+                    let arrow_up_pressed = i.key_pressed(Key::ArrowUp);
+                    let arrow_down_pressed = i.key_pressed(Key::ArrowDown);
+
+                    if arrow_up_pressed || arrow_down_pressed {
+                        if i.modifiers.shift && !self.app_state.dirs.is_empty() {
+                            let mut dirs: Vec<PathBuf> =
+                                self.app_state.dirs.iter().cloned().collect();
+                            dirs.sort();
+
+                            let current_dir_index: i8;
+                            if let Some(current_dir) = &self.app_state.current_dir {
+                                if let Some(index) = dirs.iter().position(|x| x == current_dir) {
+                                    current_dir_index = index as i8;
+                                } else {
+                                    current_dir_index = -1;
+                                }
+                            } else {
+                                current_dir_index = -1;
+                            }
+
+                            let mut new_dir_index: i8;
+
+                            new_dir_index = current_dir_index - arrow_up_pressed as i8
+                                + arrow_down_pressed as i8;
+
+                            if new_dir_index < 0 {
+                                new_dir_index = (dirs.len() - 1) as i8;
+                            } else if new_dir_index >= dirs.len() as i8 {
+                                new_dir_index = 0;
+                            }
+
+                            self.open_dir(&dirs[new_dir_index as usize]);
+                        } else if self.app_state.current_dir.is_some() {
+                            let mut files: Vec<PathBuf> =
+                                self.app_state.files.iter().cloned().collect();
+                            files.sort();
+
+                            let current_files_index: i64;
+                            if let Some(selected_file) = &self.app_state.selected_file {
+                                if let Some(index) = files.iter().position(|x| x == selected_file) {
+                                    current_files_index = index as i64;
+                                } else {
+                                    current_files_index = -1;
+                                }
+                            } else {
+                                current_files_index = -1;
+                            }
+
+                            let mut new_files_index: i64;
+
+                            new_files_index = current_files_index - arrow_up_pressed as i64
+                                + arrow_down_pressed as i64;
+
+                            if new_files_index < 0 {
+                                new_files_index = (files.len() - 1) as i64;
+                            } else if new_files_index >= files.len() as i64 {
+                                new_files_index = 0;
+                            }
+
+                            self.app_state.selected_file =
+                                Some(files[new_files_index as usize].clone());
+                        }
+                    }
+                }
             }
         });
     }

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,27 +72,47 @@ 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();
         }
     }
 
-    pub fn remove_dir(&mut self, path: PathBuf) {
+    pub fn remove_dir(&mut self, path: &PathBuf) {
-        self.app_state.dirs.remove(&path);
+        self.app_state.dirs.remove(path);
         if let Some(current_dir) = &self.app_state.current_dir
-            && current_dir == &path
+            && current_dir == path
         {
             self.app_state.current_dir = None;
+            self.app_state.files.clear();
         }
         self.config.dirs = self.app_state.dirs.clone();
         self.config.save_to_file().ok();
     }
 
-    pub fn play_file(&mut self, path: PathBuf) {
+    pub fn open_dir(&mut self, path: &PathBuf) {
+        self.app_state.current_dir = Some(path.clone());
+        self.app_state.files = path
+            .read_dir()
+            .unwrap()
+            .filter_map(|res| res.ok())
+            .map(|entry| entry.path())
+            .collect();
+    }
+
+    pub fn play_file(&mut self, path: &PathBuf) {
         make_request_sync(Request::play(path.to_str().unwrap())).ok();
     }
 
@@ -128,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/gui/update.rs

@@ -40,6 +40,13 @@ impl App for SoundpadGui {
             }
 
             self.draw(ui).ok();
+
+            if let Some(force_focus_id) = self.app_state.force_focus_id {
+                ui.memory_mut(|reder| {
+                    reder.request_focus(force_focus_id);
+                });
+                self.app_state.force_focus_id = None;
+            }
         });
 
         if self.app_state.position_dragged {

src/types/audio_player.rs

@@ -172,7 +172,11 @@ impl AudioPlayer {
         self.sink.get_pos().as_secs_f32()
     }
 
-    pub fn seek(&mut self, position: f32) -> Result<(), Box<dyn Error>> {
+    pub fn seek(&mut self, mut position: f32) -> Result<(), Box<dyn Error>> {
+        if position < 0.0 {
+            position = 0.0;
+        }
+
         match self.sink.try_seek(Duration::from_secs_f32(position)) {
             Ok(_) => Ok(()),
             Err(err) => Err(err.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/gui.rs

@@ -1,4 +1,7 @@
 use crate::types::audio_player::PlayerState;
+
+use egui::Id;
+
 use std::{
     collections::{HashMap, HashSet},
     path::PathBuf,
@@ -18,6 +21,12 @@ pub struct AppState {
 
     pub current_dir: Option<PathBuf>,
     pub dirs: HashSet<PathBuf>,
+
+    pub selected_file: Option<PathBuf>,
+    pub files: HashSet<PathBuf>,
+
+    pub search_field_id: Option<Id>,
+    pub force_focus_id: Option<Id>,
 }
 
 #[derive(Default, Debug, Clone)]

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 {})),

src/utils/pipewire.rs

@@ -164,6 +164,10 @@ pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>), B
                                 input_device.input_fl = Some(port.clone());
                                 input_device.input_fr = Some(port)
                             }
+                            "capture_MONO" => {
+                                input_device.input_fl = Some(port.clone());
+                                input_device.input_fr = Some(port);
+                            }
                             _ => {}
                         }
                     } else if output_devices.contains_key(&node_id) {