fix: simplify handling with a boolean instead of keymap

- add `enable_mouse_scroll_volume` to config
- fix error handling to properly propagate errors
- remove `VolumeUp` and `VolumeDown` entirely

Author: Alimedhat000

spotify_player/src/client/mod.rs

@@ -332,22 +332,6 @@ impl AppClient {
                 playback.volume = Some(u32::from(volume));
                 playback.mute_state = None;
             }
-            PlayerRequest::VolumeUp => {
-                let step = u32::from(config::get_config().app_config.volume_scroll_step);
-                let volume = std::cmp::min(playback.volume.unwrap_or_default() + step, 100_u32);
-                self.volume(volume as u8, device_id).await?;
-
-                playback.volume = Some(volume);
-                playback.mute_state = None;
-            }
-            PlayerRequest::VolumeDown => {
-                let step = u32::from(config::get_config().app_config.volume_scroll_step);
-                let volume = playback.volume.unwrap_or_default().saturating_sub(step);
-                self.volume(volume as u8, device_id).await?;
-
-                playback.volume = Some(volume);
-                playback.mute_state = None;
-            }
             PlayerRequest::ToggleMute => {
                 let new_mute_state = match playback.mute_state {
                     None => {

spotify_player/src/client/request.rs

@@ -14,8 +14,6 @@ pub enum PlayerRequest {
     Repeat,
     Shuffle,
     Volume(u8),
-    VolumeUp,
-    VolumeDown,
     ToggleMute,
     TransferPlayback(String, bool),
     StartPlayback(Playback, Option<bool>),

spotify_player/src/command.rs

@@ -18,8 +18,6 @@ pub enum Command {
     VolumeChange {
         offset: i32,
     },
-    VolumeUp,
-    VolumeDown,
     Mute,
     SeekStart,
     SeekForward {
@@ -308,8 +306,6 @@ impl Command {
             Self::PlayRandom => "play a random track in the current context",
             Self::Repeat => "cycle the repeat mode",
             Self::Shuffle => "toggle the shuffle mode",
-            Self::VolumeUp => "increase playback volume",
-            Self::VolumeDown => "decrease playback volume",
             Self::Mute => "toggle playback volume between 0% and previous level",
             Self::SeekStart => "seek to track start",
             Self::SeekForward { duration } => { return format!("seek forward by {}s", duration.unwrap_or(5)) },

spotify_player/src/config/keymap.rs

@@ -67,14 +67,6 @@ impl Default for KeymapConfig {
                     key_sequence: "-".into(),
                     command: Command::VolumeChange { offset: -5 },
                 },
-                Keymap {
-                    key_sequence: "m s u".into(),
-                    command: Command::VolumeUp,
-                },
-                Keymap {
-                    key_sequence: "m s d".into(),
-                    command: Command::VolumeDown,
-                },
                 Keymap {
                     key_sequence: "_".into(),
                     command: Command::Mute,

spotify_player/src/config/mod.rs

@@ -129,6 +129,7 @@ pub struct AppConfig {
     pub sort_artist_albums_by_type: bool,
 
     pub volume_scroll_step: u8,
+    pub enable_mouse_scroll_volume: bool,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
@@ -376,6 +377,7 @@ impl Default for AppConfig {
             sort_artist_albums_by_type: false,
 
             volume_scroll_step: 5,
+            enable_mouse_scroll_volume: true,
         }
     }
 }

spotify_player/src/event/mod.rs

@@ -67,30 +67,33 @@ fn handle_mouse_event(
 ) -> Result<()> {
     tracing::debug!("Handling mouse event: {event:?}");
 
+    let enable_scroll = config::get_config().app_config.enable_mouse_scroll_volume;
+
     match event.kind {
-        crossterm::event::MouseEventKind::ScrollUp => {
-            let key_sequence: KeySequence = "m s u".into();
-            let keymap_config = &config::get_config().keymap_config;
-            if keymap_config
-                .find_command_or_action_from_key_sequence(&key_sequence)
-                .is_some()
-            {
-                let _ = client_pub.try_send(ClientRequest::Player(PlayerRequest::VolumeUp));
+        crossterm::event::MouseEventKind::ScrollUp if enable_scroll => {
+            let step = i32::from(config::get_config().app_config.volume_scroll_step);
+            if let Some(ref playback) = state.player.read().buffered_playback {
+                if let Some(volume) = playback.volume {
+                    let new_volume = std::cmp::min(volume as i32 + step, 100_i32) as u8;
+                    client_pub.send(ClientRequest::Player(PlayerRequest::Volume(new_volume)))?;
+                }
             }
         }
-        crossterm::event::MouseEventKind::ScrollDown => {
-            let key_sequence: KeySequence = "m s d".into();
-            let keymap_config = &config::get_config().keymap_config;
-            if keymap_config
-                .find_command_or_action_from_key_sequence(&key_sequence)
-                .is_some()
-            {
-                let _ = client_pub.try_send(ClientRequest::Player(PlayerRequest::VolumeDown));
+        crossterm::event::MouseEventKind::ScrollDown if enable_scroll => {
+            let step = i32::from(config::get_config().app_config.volume_scroll_step);
+            if let Some(ref playback) = state.player.read().buffered_playback {
+                if let Some(volume) = playback.volume {
+                    let new_volume = std::cmp::max(volume as i32 - step, 0_i32) as u8;
+                    client_pub.send(ClientRequest::Player(PlayerRequest::Volume(new_volume)))?;
+                }
             }
         }
+        // a left click event
         crossterm::event::MouseEventKind::Down(crossterm::event::MouseButton::Left) => {
             let rect = state.ui.lock().playback_progress_bar_rect;
             if event.row == rect.y {
+                // calculate the seek position (in ms) based on the mouse click position,
+                // the progress bar's width and the track's duration (in ms)
                 let player = state.player.read();
                 let duration = match player.currently_playing() {
                     Some(rspotify::model::PlayableItem::Track(track)) => Some(track.duration),
@@ -598,12 +601,6 @@ fn handle_global_command(
                 }
             }
         }
-        Command::VolumeUp => {
-            client_pub.send(ClientRequest::Player(PlayerRequest::VolumeUp))?;
-        }
-        Command::VolumeDown => {
-            client_pub.send(ClientRequest::Player(PlayerRequest::VolumeDown))?;
-        }
         Command::Mute => {
             client_pub.send(ClientRequest::Player(PlayerRequest::ToggleMute))?;
         }