diff options
| author | krolxon <krolyxon@tutanota.com> | 2024-06-13 15:31:40 +0530 |
|---|---|---|
| committer | krolxon <krolyxon@tutanota.com> | 2024-06-13 15:31:40 +0530 |
| commit | e1dc925ecc9c9bd0be67bbb15937db6c470be13b (patch) | |
| tree | cbeb6b368799acfb5a66a80a32c587235b1eec97 /src/event | |
| parent | 3862d5d32458582e612d3b5d88c4a9174fc3fafc (diff) | |
comply with clippy
Diffstat (limited to 'src/event')
| -rwxr-xr-x | src/event/handler.rs | 7 | ||||
| -rwxr-xr-x | src/event/pl_append_keys.rs | 12 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/event/handler.rs b/src/event/handler.rs index 8fd4286..f34a5f2 100755 --- a/src/event/handler.rs +++ b/src/event/handler.rs @@ -6,7 +6,7 @@ use crate::{ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers, MouseEvent, MouseEventKind}; use std::time::Duration; -use super::{pl_append_keys, pl_rename_keys, new_pl_keys, search_keys}; +use super::{new_pl_keys, pl_append_keys, pl_rename_keys, search_keys}; pub fn handle_key_events(key_event: KeyEvent, app: &mut App) -> AppResult<()> { // searching, playlist renaming, playlist appending @@ -325,9 +325,8 @@ pub fn handle_mouse_events(mouse_event: MouseEvent, app: &mut App) -> AppResult< MouseEventKind::ScrollDown => app.handle_scroll_down(), MouseEventKind::Down(button) => { let (x, y) = (mouse_event.column, mouse_event.row); - match button { - crossterm::event::MouseButton::Left => app.handle_mouse_left_click(x, y)?, - _ => {} + if button == crossterm::event::MouseButton::Left { + app.handle_mouse_left_click(x, y)?; } } _ => {} diff --git a/src/event/pl_append_keys.rs b/src/event/pl_append_keys.rs index 0f7df81..3d2702c 100755 --- a/src/event/pl_append_keys.rs +++ b/src/event/pl_append_keys.rs @@ -29,14 +29,14 @@ pub fn hande_pl_append_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> let option_song = songs.first(); if let Some(song) = option_song { if *pl_name == "Current Playlist" { - app.conn.conn.push(&song)?; + app.conn.conn.push(song)?; app.update_queue(); } else if *pl_name == "New Playlist" { app.pl_new_pl_songs_buffer.clear(); app.pl_new_pl_songs_buffer.push(song.clone()); app.inputmode = InputMode::NewPlaylist; } else { - app.conn.add_to_playlist(pl_name, &song)?; + app.conn.add_to_playlist(pl_name, song)?; } } } @@ -47,7 +47,7 @@ pub fn hande_pl_append_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> if t == "file" { let short_path = f; if let Some(full_path) = app.conn.get_full_path(short_path) { - let song = app.conn.get_song_with_only_filename(&full_path); + let song = app.conn.get_song_with_only_filename(full_path); if *pl_name == "Current Playlist" { app.conn.conn.push(&song)?; @@ -72,7 +72,7 @@ pub fn hande_pl_append_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> ]) { let full_path = app.conn.get_full_path(f).unwrap_or_default(); - let song = app.conn.get_song_with_only_filename(&full_path); + let song = app.conn.get_song_with_only_filename(full_path); if *pl_name == "Current Playlist" { app.conn.conn.push(&song)?; } else if *pl_name == "New Playlist" { @@ -98,9 +98,7 @@ pub fn hande_pl_append_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> for song in songs { // We ignore the Err() since there could be songs in playlists, which do not exist in the db anymore. // So instead of panicking, we just ignore if the song does not exists - app.conn - .add_to_playlist(*pl_name, &song) - .unwrap_or_else(|_| {}); + app.conn.add_to_playlist(pl_name, &song).unwrap_or(()); } } } |
