fix: crash when setting negative position

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pwsp"
-version = "1.0.1"
+version = "1.1.0"
 edition = "2024"
 authors = ["arabian"]
 description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
@@ -12,23 +12,23 @@ 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.227", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
 
-clap = { version = "4.5.48", default-features = false, features = ["std", "suggestions", "help", "usage", "error-context", "derive"] }
+clap = { version = "4.5.51", 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"
 
-egui = { version = "0.32.3", default-features = false, features = ["default_fonts", "rayon"] }
+egui = { version = "0.33.0", default-features = false, features = ["default_fonts", "rayon"] }
-eframe = { version = "0.32.3", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] }
+eframe = { version = "0.33.0", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] }
-egui_material_icons = "0.4.0"
+egui_material_icons = "0.5.0"
 
 [[bin]]
 name = "pwsp-daemon"

assets/pwsp-daemon.service

@@ -1,7 +1,9 @@
 [Unit]
 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.1
+Version:         1.0.3
 Release:         %autorelease
 Summary:         Lets you play audio files through your microphone
 

src/bin/cli.rs

@@ -72,7 +72,7 @@ enum SetCommands {
     /// Playback position
     Position { position: f32 },
     /// Input
-    Input { id: u32 },
+    Input { name: String },
 }
 
 #[tokio::main]
@@ -102,7 +102,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         Commands::Set { parameter } => match parameter {
             SetCommands::Volume { volume } => Request::set_volume(volume),
             SetCommands::Position { position } => Request::seek(position),
-            SetCommands::Input { id } => Request::set_input(id),
+            SetCommands::Input { name } => Request::set_input(&name),
         },
     };
 

src/gui/draw.rs

@@ -191,19 +191,26 @@ 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());
                         }
                     });
                 }
@@ -226,10 +233,12 @@ impl SoundpadGui {
 
         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,18 +248,17 @@ 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();
 
+                    for entry_path in files {
                         if entry_path.is_dir() {
                             continue;
                         }
 
-                            if !extensions.contains(
+                        if !extensions
-                                &entry_path.extension().unwrap_or_default().to_str().unwrap(),
+                            .contains(&entry_path.extension().unwrap_or_default().to_str().unwrap())
-                            ) {
+                        {
                             continue;
                         }
 
@@ -271,11 +279,18 @@ impl SoundpadGui {
                             continue;
                         }
 
-                            let file_button = Button::new(file_name).frame(false);
+                        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);
+                            }
+                        }
+
+                        let file_button = Button::new(file_button_text).frame(false);
                         let file_button_response = ui.add(file_button);
                         if file_button_response.clicked() {
-                                self.play_file(entry_path);
+                            self.play_file(&entry_path);
-                            }
+                            self.app_state.selected_file = Some(entry_path);
                         }
                     }
                 });
@@ -287,7 +302,7 @@ impl SoundpadGui {
         ui.add_space(5.0);
         ui.horizontal_top(|ui| {
             // ---------- Microphone selection ----------
-            let mut mics: Vec<(&u32, &String)> =
+            let mut mics: Vec<(&String, &String)> =
                 self.audio_player_state.all_inputs.iter().collect();
             mics.sort_by_key(|(k, _)| *k);
 
@@ -301,8 +316,8 @@ impl SoundpadGui {
                         .unwrap_or(&String::new()),
                 )
                 .show_ui(ui, |ui| {
-                    for (index, device) in mics {
+                    for (name, nick) in mics {
-                        ui.selectable_value(&mut selected_input, index.to_owned(), device);
+                        ui.selectable_value(&mut selected_input, name.to_owned(), nick);
                     }
                 });
 

src/gui/input.rs

@@ -1,23 +1,102 @@
 use crate::gui::SoundpadGui;
 use egui::{Context, Key};
 
+use std::path::PathBuf;
+
 impl SoundpadGui {
     pub fn handle_input(&mut self, ctx: &Context) {
         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

@@ -77,10 +77,10 @@ impl SoundpadGui {
         }
     }
 
-    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;
         }
@@ -88,16 +88,26 @@ impl SoundpadGui {
         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();
     }
 
-    pub fn set_input(&mut self, id: u32) {
+    pub fn set_input(&mut self, name: String) {
-        make_request_sync(Request::set_input(id)).ok();
+        make_request_sync(Request::set_input(&name)).ok();
 
         if self.config.save_input {
             let mut daemon_config = get_daemon_config();
-            daemon_config.default_input_id = Some(id);
+            daemon_config.default_input_name = Some(name);
             daemon_config.save_to_file().ok();
         }
     }

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

@@ -40,8 +40,8 @@ impl AudioPlayer {
         let daemon_config = get_daemon_config();
         let default_volume = daemon_config.default_volume.unwrap_or(1.0);
         let mut default_input_device: Option<AudioDevice> = None;
-        if let Some(id) = daemon_config.default_input_id
+        if let Some(name) = daemon_config.default_input_name
-            && let Ok(device) = get_device(id).await
+            && let Ok(device) = get_device(&name).await
             && device.device_type == DeviceType::Input
         {
             default_input_device = Some(device);
@@ -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()),
@@ -224,8 +228,8 @@ impl AudioPlayer {
         &self.current_file_path
     }
 
-    pub async fn set_current_input_device(&mut self, id: u32) -> Result<(), Box<dyn Error>> {
+    pub async fn set_current_input_device(&mut self, name: &str) -> Result<(), Box<dyn Error>> {
-        let input_device = get_device(id).await?;
+        let input_device = get_device(name).await?;
 
         if input_device.device_type != DeviceType::Input {
             return Err("Selected device is not an input device".into());

src/types/commands.rs

@@ -47,7 +47,7 @@ pub struct GetCurrentInputCommand {}
 pub struct GetAllInputsCommand {}
 
 pub struct SetCurrentInputCommand {
-    pub id: Option<u32>,
+    pub name: Option<String>,
 }
 
 #[async_trait]
@@ -192,7 +192,10 @@ impl Executable for GetCurrentInputCommand {
     async fn execute(&self) -> Response {
         let audio_player = get_audio_player().await.lock().await;
         if let Some(input_device) = &audio_player.current_input_device {
-            Response::new(true, format!("{} - {}", input_device.id, input_device.nick))
+            Response::new(
+                true,
+                format!("{} - {}", input_device.name, input_device.nick),
+            )
         } else {
             Response::new(false, "No input device selected")
         }
@@ -209,7 +212,7 @@ impl Executable for GetAllInputsCommand {
                 continue;
             }
 
-            let string = format!("{} - {}", device.id, device.nick);
+            let string = format!("{} - {}", device.name, device.nick);
             input_devices_strings.push(string);
         }
         let response_message = input_devices_strings.join("; ");
@@ -221,9 +224,9 @@ impl Executable for GetAllInputsCommand {
 #[async_trait]
 impl Executable for SetCurrentInputCommand {
     async fn execute(&self) -> Response {
-        if let Some(id) = self.id {
+        if let Some(name) = &self.name {
             let mut audio_player = get_audio_player().await.lock().await;
-            match audio_player.set_current_input_device(id).await {
+            match audio_player.set_current_input_device(name).await {
                 Ok(_) => Response::new(true, "Input device was set"),
                 Err(err) => Response::new(false, err.to_string()),
             }

src/types/config.rs

@@ -4,7 +4,7 @@ use std::{collections::HashSet, error::Error, fs, path::PathBuf};
 
 #[derive(Default, Clone, Serialize, Deserialize)]
 pub struct DaemonConfig {
-    pub default_input_id: Option<u32>,
+    pub default_input_name: Option<String>,
     pub default_volume: Option<f32>,
 }
 

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)]
@@ -34,6 +43,6 @@ pub struct AudioPlayerState {
     pub new_position: Option<f32>,
     pub duration: f32,
 
-    pub current_input: u32,
+    pub current_input: String,
-    pub all_inputs: HashMap<u32, String>,
+    pub all_inputs: HashMap<String, String>,
 }

src/types/socket.rs

@@ -80,8 +80,8 @@ impl Request {
         Request::new("seek", vec![("position", &position.to_string())])
     }
 
-    pub fn set_input(id: u32) -> Self {
+    pub fn set_input(name: &str) -> Self {
-        Request::new("set_input", vec![("input_id", &id.to_string())])
+        Request::new("set_input", vec![("input_name", name)])
     }
 }
 

src/utils/commands.rs

@@ -44,13 +44,8 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
         "get_input" => Some(Box::new(GetCurrentInputCommand {})),
         "get_inputs" => Some(Box::new(GetAllInputsCommand {})),
         "set_input" => {
-            let id = request
+            let name = Some(request.args.get("input_name").unwrap_or(&String::new())).cloned();
-                .args
+            Some(Box::new(SetCurrentInputCommand { name }))
-                .get("input_id")
-                .unwrap_or(&String::new())
-                .parse::<u32>()
-                .ok();
-            Some(Box::new(SetCurrentInputCommand { id }))
         }
         _ => None,
     }

src/utils/gui.rs

@@ -96,10 +96,8 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
                     .collect::<Vec<&str>>()
                     .first()
                     .unwrap()
-                    .to_string()
+                    .to_string(),
-                    .parse::<u32>()
+                false => String::new(),
-                    .unwrap_or_default(),
-                false => 0,
             };
             let all_inputs = match all_inputs_res.status {
                 true => all_inputs_res
@@ -111,14 +109,11 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
                         if entry.is_empty() {
                             return None;
                         }
-                        entry.split_once(" - ").and_then(|(k, v)| {
+                        entry
-                            k.trim()
+                            .split_once(" - ")
-                                .parse::<u32>()
+                            .map(|(k, v)| (k.trim().to_string(), v.trim().to_string()))
-                                .ok()
-                                .map(|key| (key, v.trim().to_string()))
                     })
-                    })
+                    .collect::<HashMap<String, String>>(),
-                    .collect(),
                 false => HashMap::new(),
             };
 

src/utils/pipewire.rs

@@ -77,6 +77,8 @@ async fn pw_get_global_objects_thread(
     main_sender: mpsc::Sender<(Option<AudioDevice>, Option<Port>)>,
     pw_receiver: pipewire::channel::Receiver<Terminate>,
 ) {
+    pipewire::init();
+
     let main_loop = MainLoopRc::new(None).expect("Failed to initialize pipewire main loop");
 
     // Stop main loop on Terminate message
@@ -199,12 +201,12 @@ pub async fn get_all_devices() -> Result<(Vec<AudioDevice>, Vec<AudioDevice>), B
     }
 }
 
-pub async fn get_device(node_id: u32) -> Result<AudioDevice, Box<dyn Error>> {
+pub async fn get_device(device_name: &str) -> Result<AudioDevice, Box<dyn Error>> {
     let (mut input_devices, output_devices) = get_all_devices().await?;
     input_devices.extend(output_devices);
 
     for device in input_devices {
-        if device.id == node_id {
+        if device.name == device_name {
             return Ok(device);
         }
     }
@@ -216,6 +218,8 @@ pub fn create_virtual_mic() -> Result<pipewire::channel::Sender<Terminate>, Box<
     let (pw_sender, pw_receiver) = pipewire::channel::channel::<Terminate>();
 
     let _pw_thread = thread::spawn(move || {
+        pipewire::init();
+
         let main_loop = MainLoopRc::new(None).expect("Failed to initialize pipewire main loop");
         let context = ContextRc::new(&main_loop, None).expect("Failed to create pipewire context");
         let core = context
@@ -257,6 +261,8 @@ pub fn create_link(
     let (pw_sender, pw_receiver) = pipewire::channel::channel::<Terminate>();
 
     let _pw_thread = thread::spawn(move || {
+        pipewire::init();
+
         let main_loop = MainLoopRc::new(None).expect("Failed to initialize pipewire main loop");
         let context = ContextRc::new(&main_loop, None).expect("Failed to create pipewire context");
         let core = context