From b7fc6bc1a70da169f80afdc790c1a8ccf853d319 Mon Sep 17 00:00:00 2001 From: krolxon Date: Wed, 1 May 2024 23:45:05 +0530 Subject: [PATCH] move the keymaps to thier individual files --- src/{ => event}/event.rs | 0 src/event/handler.rs | 220 ++++++++++++++++++ src/event/mod.rs | 5 + src/event/pl_append_keys.rs | 82 +++++++ src/event/pl_rename_keys.rs | 43 ++++ src/event/search_keys.rs | 110 +++++++++ src/handler.rs | 429 ------------------------------------ src/lib.rs | 5 +- src/main.rs | 6 +- src/tui.rs | 2 +- 10 files changed, 465 insertions(+), 437 deletions(-) rename src/{ => event}/event.rs (100%) create mode 100755 src/event/handler.rs create mode 100755 src/event/mod.rs create mode 100755 src/event/pl_append_keys.rs create mode 100755 src/event/pl_rename_keys.rs create mode 100755 src/event/search_keys.rs delete mode 100755 src/handler.rs diff --git a/src/event.rs b/src/event/event.rs similarity index 100% rename from src/event.rs rename to src/event/event.rs diff --git a/src/event/handler.rs b/src/event/handler.rs new file mode 100755 index 0000000..8fd41c3 --- /dev/null +++ b/src/event/handler.rs @@ -0,0 +1,220 @@ +use crate::{ + app::{App, AppResult, SelectedTab}, + ui::InputMode, +}; +use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; +use std::time::Duration; + +use super::{pl_append_keys, pl_rename_keys, search_keys}; + +pub fn handle_key_events(key_event: KeyEvent, app: &mut App) -> AppResult<()> { + // Live search update + if app.inputmode == InputMode::Editing { + search_keys::handle_search_keys(key_event, app)?; + } else if app.inputmode == InputMode::PlaylistRename { + pl_rename_keys::handle_pl_rename_keys(key_event, app)?; + } else if app.playlist_popup { + pl_append_keys::hande_pl_append_keys(key_event, app)?; + } else { + // General KeyMaps + match key_event.code { + // Quit + KeyCode::Char('q') => app.quit(), + KeyCode::Char('c') | KeyCode::Char('C') => { + if key_event.modifiers == KeyModifiers::CONTROL { + app.quit(); + } else { + app.conn.conn.clear()?; + app.conn.update_status(); + app.queue_list.list.clear(); + app.queue_list.reset_index(); + } + } + + // Go Up + KeyCode::Char('j') | KeyCode::Down => match app.selected_tab { + SelectedTab::DirectoryBrowser => app.browser.next(), + SelectedTab::Queue => app.queue_list.next(), + SelectedTab::Playlists => app.pl_list.next(), + }, + + // Go down + KeyCode::Char('k') | KeyCode::Up => match app.selected_tab { + SelectedTab::DirectoryBrowser => app.browser.prev(), + SelectedTab::Queue => app.queue_list.prev(), + SelectedTab::Playlists => app.pl_list.prev(), + }, + + // Next directory + KeyCode::Enter | KeyCode::Char('l') | KeyCode::Right => { + // app.update_queue(); + + match app.selected_tab { + SelectedTab::DirectoryBrowser => { + app.handle_enter()?; + } + + SelectedTab::Queue => { + app.conn.conn.switch(app.queue_list.index as u32)?; + } + + SelectedTab::Playlists => { + app.conn + .load_playlist(app.pl_list.list.get(app.pl_list.index).unwrap())?; + } + } + app.conn.update_status(); + } + + // head back to previous directory + KeyCode::Char('h') | KeyCode::Left => match app.selected_tab { + SelectedTab::DirectoryBrowser => { + app.browser.handle_go_back(&mut app.conn)?; + } + SelectedTab::Queue => {} + SelectedTab::Playlists => {} + }, + + // Playback controls + // Toggle Pause + KeyCode::Char('p') => app.conn.toggle_pause(), + + // Pause + KeyCode::Char('s') => app.conn.pause(), + + // Toggle rpeat + KeyCode::Char('r') => { + app.conn.toggle_repeat(); + app.conn.update_status(); + } + + // Toggle random + KeyCode::Char('z') => { + app.conn.toggle_random(); + app.conn.update_status(); + } + + // Dmenu prompt + KeyCode::Char('D') => app.conn.play_dmenu()?, + + // add to queue + KeyCode::Char('a') => app.playlist_popup = true, + + // Fast forward + KeyCode::Char('f') => { + let place = app.conn.conn.status().unwrap().song.unwrap().pos; + let (pos, _) = app.conn.conn.status().unwrap().time.unwrap(); + let pos = Duration::from_secs(pos.as_secs().wrapping_add(2)); + app.conn.conn.seek(place, pos)?; + } + + // backward + KeyCode::Char('b') => { + let place = app.conn.conn.status().unwrap().song.unwrap().pos; + let (pos, _) = app.conn.conn.status().unwrap().time.unwrap(); + let pos = Duration::from_secs(pos.as_secs().wrapping_add(2)); + app.conn.conn.seek(place, pos)?; + } + + // Cycle through tabs + KeyCode::Tab => { + app.cycle_tabls(); + } + + // Directory browser tab + KeyCode::Char('1') => { + app.selected_tab = SelectedTab::Queue; + } + + // Playing queue tab + KeyCode::Char('2') => { + app.selected_tab = SelectedTab::DirectoryBrowser; + } + + // Playlists tab + KeyCode::Char('3') => { + app.selected_tab = SelectedTab::Playlists; + } + + // Play next song + KeyCode::Char('>') => { + if !app.queue_list.list.is_empty() { + app.conn.conn.next()?; + app.update_queue(); + } + } + + // Play previous song + KeyCode::Char('<') => { + if !app.queue_list.list.is_empty() { + app.conn.conn.prev()?; + app.update_queue(); + } + } + + // Volume controls + KeyCode::Char('=') => { + app.conn.inc_volume(2); + app.conn.update_status(); + } + + KeyCode::Char('-') => { + app.conn.dec_volume(2); + app.conn.update_status(); + } + + // Delete highlighted song from the queue + KeyCode::Char('d') => { + if app.queue_list.index >= app.queue_list.list.len() - 1 + && app.queue_list.index != 0 + { + app.queue_list.index -= 1; + } + + app.conn.conn.delete(app.queue_list.index as u32)?; + app.update_queue(); + } + + // Update MPD database + KeyCode::Char('U') => { + app.conn.conn.rescan()?; + app.browser.update_directory(&mut app.conn)?; + } + + // Search for songs + KeyCode::Char('/') => { + if app.inputmode == InputMode::Normal { + app.inputmode = InputMode::Editing; + } else { + app.inputmode = InputMode::Normal; + } + } + + // Remove from Current Playlsit + KeyCode::Char(' ') | KeyCode::Backspace => { + app.handle_add_or_remove_from_current_playlist()?; + } + + // go to top of list + KeyCode::Char('g') => match app.selected_tab { + SelectedTab::Queue => app.queue_list.index = 0, + SelectedTab::DirectoryBrowser => app.browser.selected = 0, + SelectedTab::Playlists => app.pl_list.index = 0, + }, + + // go to bottom of list + KeyCode::Char('G') => match app.selected_tab { + SelectedTab::Queue => app.queue_list.index = app.queue_list.list.len() - 1, + SelectedTab::DirectoryBrowser => { + app.browser.selected = app.browser.filetree.len() - 1 + } + SelectedTab::Playlists => app.pl_list.index = app.pl_list.list.len() - 1, + }, + + // Change playlist name + KeyCode::Char('e') => app.change_playlist_name()?, + _ => {} + } + } + Ok(()) +} diff --git a/src/event/mod.rs b/src/event/mod.rs new file mode 100755 index 0000000..e0f3b13 --- /dev/null +++ b/src/event/mod.rs @@ -0,0 +1,5 @@ +pub mod event; +pub mod handler; +pub mod search_keys; +pub mod pl_rename_keys; +pub mod pl_append_keys; diff --git a/src/event/pl_append_keys.rs b/src/event/pl_append_keys.rs new file mode 100755 index 0000000..47fd2f4 --- /dev/null +++ b/src/event/pl_append_keys.rs @@ -0,0 +1,82 @@ +use crate::app::{App, AppResult, SelectedTab}; +use crate::browser::FileExtension; +use crossterm::event::{KeyCode, KeyEvent}; +use std::path::Path; + +pub fn hande_pl_append_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> { + match key_event.code { + KeyCode::Char('q') | KeyCode::Esc => { + app.playlist_popup = false; + } + + KeyCode::Char('j') | KeyCode::Down => app.append_list.next(), + KeyCode::Char('k') | KeyCode::Up => app.append_list.prev(), + + KeyCode::Enter => { + let pl_index = app.append_list.index; + let pl_name = &app.append_list.list.get(pl_index).unwrap(); + + let s_index: usize; + match app.selected_tab { + SelectedTab::Queue => { + s_index = app.queue_list.index; + let short_path = &app.queue_list.list.get(s_index).unwrap().file; + + if let Some(full_path) = app.conn.get_full_path(short_path) { + let song = app.conn.get_song_with_only_filename(&full_path); + + if *pl_name == "Current Playlist" { + app.conn.conn.push(&song)?; + app.update_queue(); + } else { + app.conn.add_to_playlist(pl_name, &song)?; + } + } + } + + SelectedTab::DirectoryBrowser => { + let (t, f) = app.browser.filetree.get(app.browser.selected).unwrap(); + 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); + + if *pl_name == "Current Playlist" { + app.conn.conn.push(&song)?; + app.update_queue(); + } else { + app.conn.add_to_playlist(pl_name, &song)?; + } + } + } else if t == "directory" { + for (t, f) in app.conn.conn.listfiles(f)?.iter() { + // dir_vec.push((t, f)); + if t == "file" + && Path::new(&f).has_extension(&[ + "mp3", "ogg", "flac", "m4a", "wav", "aac", "opus", "ape", + "wma", "mpc", "aiff", "dff", "mp2", "mka", + ]) + { + let full_path = app.conn.get_full_path(f).unwrap_or_default(); + let song = app.conn.get_song_with_only_filename(&full_path); + if *pl_name == "Current Playlist" { + app.conn.conn.push(&song)?; + } else { + app.conn.add_to_playlist(pl_name, &song)?; + } + } + } + } + } + _ => {} + } + + // hide the playlist popup + app.playlist_popup = false; + app.append_list.index = 0; + } + _ => {} + } + + Ok(()) +} diff --git a/src/event/pl_rename_keys.rs b/src/event/pl_rename_keys.rs new file mode 100755 index 0000000..fff1582 --- /dev/null +++ b/src/event/pl_rename_keys.rs @@ -0,0 +1,43 @@ +use crate::{ + app::{App, AppResult}, + ui::InputMode, +}; +use crossterm::event::{KeyCode, KeyEvent}; + +pub fn handle_pl_rename_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> { + match key_event.code { + KeyCode::Esc => { + app.pl_newname_input.clear(); + app.reset_cursor(); + app.inputmode = InputMode::Normal; + } + KeyCode::Char(to_insert) => { + app.enter_char(to_insert); + } + KeyCode::Enter => { + app.conn.conn.pl_rename( + app.pl_list.list.get(app.pl_list.index).unwrap(), + &app.pl_newname_input, + )?; + app.pl_list.list = App::get_playlist(&mut app.conn.conn)?; + app.pl_newname_input.clear(); + app.reset_cursor(); + app.inputmode = InputMode::Normal; + } + + KeyCode::Backspace => { + app.delete_char(); + } + + KeyCode::Left => { + app.move_cursor_left(); + } + + KeyCode::Right => { + app.move_cursor_right(); + } + + _ => {} + } + Ok(()) +} diff --git a/src/event/search_keys.rs b/src/event/search_keys.rs new file mode 100755 index 0000000..db59fa5 --- /dev/null +++ b/src/event/search_keys.rs @@ -0,0 +1,110 @@ +use crate::{ + app::{App, AppResult, SelectedTab}, + ui::InputMode, +}; +use crossterm::event::{KeyCode, KeyEvent}; +use rust_fuzzy_search::{self, fuzzy_search_sorted}; + +pub fn handle_search_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> { + match app.selected_tab { + SelectedTab::DirectoryBrowser => { + let list: Vec<&str> = app + .browser + .filetree + .iter() + .map(|(_, f)| f.as_str()) + .collect::>(); + + let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list); + let res = res.iter().map(|(x, _)| *x).collect::>(); + + for (i, (_, item)) in app.browser.filetree.iter().enumerate() { + if item.contains(res.first().unwrap()) { + app.browser.selected = i; + } + } + } + + SelectedTab::Queue => { + let list: Vec<&str> = app + .queue_list + .list + .iter() + .map(|f| f.file.as_str()) + .collect::>(); + let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list); + let res = res.iter().map(|(x, _)| *x).collect::>(); + + for (i, item) in app.queue_list.list.iter().enumerate() { + if item.file.contains(res.first().unwrap()) { + app.queue_list.index = i; + } + } + } + + SelectedTab::Playlists => { + let list: Vec<&str> = app + .pl_list + .list + .iter() + .map(|f| f.as_str()) + .collect::>(); + let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list); + let res = res.iter().map(|(x, _)| *x).collect::>(); + + for (i, item) in app.pl_list.list.iter().enumerate() { + if item.contains(res.first().unwrap()) { + app.pl_list.index = i; + } + } + } + } + + // Keybind for searching + // + // Keybinds for when the search prompt is visible + match key_event.code { + KeyCode::Esc => { + app.inputmode = InputMode::Normal; + } + KeyCode::Char(to_insert) => { + app.enter_char(to_insert); + } + KeyCode::Enter => { + let list: Vec<&str> = app + .browser + .filetree + .iter() + .map(|(_, f)| f.as_str()) + .collect::>(); + + let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list); + let (res, _) = res.first().unwrap(); + + for (i, (_, item)) in app.browser.filetree.iter().enumerate() { + if item.contains(res) { + app.browser.selected = i; + } + } + + app.search_input.clear(); + app.reset_cursor(); + app.inputmode = InputMode::Normal; + } + + KeyCode::Backspace => { + app.delete_char(); + } + + KeyCode::Left => { + app.move_cursor_left(); + } + + KeyCode::Right => { + app.move_cursor_right(); + } + + _ => {} + } + Ok(()) +} diff --git a/src/handler.rs b/src/handler.rs deleted file mode 100755 index d32aa94..0000000 --- a/src/handler.rs +++ /dev/null @@ -1,429 +0,0 @@ -use crate::browser::FileExtension; -use crate::{ - app::{App, AppResult, SelectedTab}, - ui::InputMode, -}; -use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; -use rust_fuzzy_search::{self, fuzzy_search_sorted}; -use std::{path::Path, time::Duration}; - -pub fn handle_key_events(key_event: KeyEvent, app: &mut App) -> AppResult<()> { - if app.inputmode == InputMode::Editing { - // Live search update - match app.selected_tab { - SelectedTab::DirectoryBrowser => { - let list: Vec<&str> = app - .browser - .filetree - .iter() - .map(|(_, f)| f.as_str()) - .collect::>(); - - let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list); - let res = res.iter().map(|(x, _)| *x).collect::>(); - - for (i, (_, item)) in app.browser.filetree.iter().enumerate() { - if item.contains(res.first().unwrap()) { - app.browser.selected = i; - } - } - } - - SelectedTab::Queue => { - let list: Vec<&str> = app - .queue_list - .list - .iter() - .map(|f| f.file.as_str()) - .collect::>(); - let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list); - let res = res.iter().map(|(x, _)| *x).collect::>(); - - for (i, item) in app.queue_list.list.iter().enumerate() { - if item.file.contains(res.first().unwrap()) { - app.queue_list.index = i; - } - } - } - - SelectedTab::Playlists => { - let list: Vec<&str> = app - .pl_list - .list - .iter() - .map(|f| f.as_str()) - .collect::>(); - let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list); - let res = res.iter().map(|(x, _)| *x).collect::>(); - - for (i, item) in app.pl_list.list.iter().enumerate() { - if item.contains(res.first().unwrap()) { - app.pl_list.index = i; - } - } - } - } - - // Keybind for searching - // - // Keybinds for when the search prompt is visible - match key_event.code { - KeyCode::Esc => { - app.inputmode = InputMode::Normal; - } - KeyCode::Char(to_insert) => { - app.enter_char(to_insert); - } - KeyCode::Enter => { - let list: Vec<&str> = app - .browser - .filetree - .iter() - .map(|(_, f)| f.as_str()) - .collect::>(); - - let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list); - let (res, _) = res.first().unwrap(); - - for (i, (_, item)) in app.browser.filetree.iter().enumerate() { - if item.contains(res) { - app.browser.selected = i; - } - } - - app.search_input.clear(); - app.reset_cursor(); - app.inputmode = InputMode::Normal; - } - - KeyCode::Backspace => { - app.delete_char(); - } - - KeyCode::Left => { - app.move_cursor_left(); - } - - KeyCode::Right => { - app.move_cursor_right(); - } - - _ => {} - } - } else if app.inputmode == InputMode::PlaylistRename { - match key_event.code { - KeyCode::Esc => { - app.pl_newname_input.clear(); - app.reset_cursor(); - app.inputmode = InputMode::Normal; - } - KeyCode::Char(to_insert) => { - app.enter_char(to_insert); - } - KeyCode::Enter => { - app.conn.conn.pl_rename( - app.pl_list.list.get(app.pl_list.index).unwrap(), - &app.pl_newname_input, - )?; - app.pl_list.list = App::get_playlist(&mut app.conn.conn)?; - app.pl_newname_input.clear(); - app.reset_cursor(); - app.inputmode = InputMode::Normal; - } - - KeyCode::Backspace => { - app.delete_char(); - } - - KeyCode::Left => { - app.move_cursor_left(); - } - - KeyCode::Right => { - app.move_cursor_right(); - } - - _ => {} - } - // Playlist popup keybinds - // - // Keybind for when the "append to playlist" popup is visible - } else if app.playlist_popup { - match key_event.code { - KeyCode::Char('q') | KeyCode::Esc => { - app.playlist_popup = false; - } - - KeyCode::Char('j') | KeyCode::Down => app.append_list.next(), - KeyCode::Char('k') | KeyCode::Up => app.append_list.prev(), - - KeyCode::Enter => { - let pl_index = app.append_list.index; - let pl_name = &app.append_list.list.get(pl_index).unwrap(); - - let s_index: usize; - match app.selected_tab { - SelectedTab::Queue => { - s_index = app.queue_list.index; - let short_path = &app.queue_list.list.get(s_index).unwrap().file; - - if let Some(full_path) = app.conn.get_full_path(short_path) { - let song = app.conn.get_song_with_only_filename(&full_path); - - if *pl_name == "Current Playlist" { - app.conn.conn.push(&song)?; - app.update_queue(); - } else { - app.conn.add_to_playlist(pl_name, &song)?; - } - } - } - - SelectedTab::DirectoryBrowser => { - let (t, f) = app.browser.filetree.get(app.browser.selected).unwrap(); - 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); - - if *pl_name == "Current Playlist" { - app.conn.conn.push(&song)?; - app.update_queue(); - } else { - app.conn.add_to_playlist(pl_name, &song)?; - } - } - } else if t == "directory" { - for (t, f) in app.conn.conn.listfiles(f)?.iter() { - // dir_vec.push((t, f)); - if t == "file" - && Path::new(&f).has_extension(&[ - "mp3", "ogg", "flac", "m4a", "wav", "aac", "opus", "ape", - "wma", "mpc", "aiff", "dff", "mp2", "mka", - ]) - { - let full_path = app.conn.get_full_path(f).unwrap_or_default(); - let song = app.conn.get_song_with_only_filename(&full_path); - if *pl_name == "Current Playlist" { - app.conn.conn.push(&song)?; - } else { - app.conn.add_to_playlist(pl_name, &song)?; - } - } - } - } - } - _ => {} - } - - // hide the playlist popup - app.playlist_popup = false; - app.append_list.index = 0; - } - _ => {} - } - } else { - // Global keymaps - // - // Keymaps related to all the tabs - match key_event.code { - // Quit - KeyCode::Char('q') => app.quit(), - KeyCode::Char('c') | KeyCode::Char('C') => { - if key_event.modifiers == KeyModifiers::CONTROL { - app.quit(); - } else { - app.conn.conn.clear()?; - app.conn.update_status(); - app.queue_list.list.clear(); - app.queue_list.reset_index(); - } - } - - // Go Up - KeyCode::Char('j') | KeyCode::Down => match app.selected_tab { - SelectedTab::DirectoryBrowser => app.browser.next(), - SelectedTab::Queue => app.queue_list.next(), - SelectedTab::Playlists => app.pl_list.next(), - }, - - // Go down - KeyCode::Char('k') | KeyCode::Up => match app.selected_tab { - SelectedTab::DirectoryBrowser => app.browser.prev(), - SelectedTab::Queue => app.queue_list.prev(), - SelectedTab::Playlists => app.pl_list.prev(), - }, - - // Next directory - KeyCode::Enter | KeyCode::Char('l') | KeyCode::Right => { - // app.update_queue(); - - match app.selected_tab { - SelectedTab::DirectoryBrowser => { - app.handle_enter()?; - } - - SelectedTab::Queue => { - app.conn.conn.switch(app.queue_list.index as u32)?; - } - - SelectedTab::Playlists => { - app.conn - .load_playlist(app.pl_list.list.get(app.pl_list.index).unwrap())?; - } - } - app.conn.update_status(); - } - - // head back to previous directory - KeyCode::Char('h') | KeyCode::Left => match app.selected_tab { - SelectedTab::DirectoryBrowser => { - app.browser.handle_go_back(&mut app.conn)?; - } - SelectedTab::Queue => {} - SelectedTab::Playlists => {} - }, - - // Playback controls - // Toggle Pause - KeyCode::Char('p') => app.conn.toggle_pause(), - - // Pause - KeyCode::Char('s') => app.conn.pause(), - - // Toggle rpeat - KeyCode::Char('r') => { - app.conn.toggle_repeat(); - app.conn.update_status(); - } - - // Toggle random - KeyCode::Char('z') => { - app.conn.toggle_random(); - app.conn.update_status(); - } - - // Dmenu prompt - KeyCode::Char('D') => app.conn.play_dmenu()?, - - // add to queue - KeyCode::Char('a') => app.playlist_popup = true, - - // Fast forward - KeyCode::Char('f') => { - let place = app.conn.conn.status().unwrap().song.unwrap().pos; - let (pos, _) = app.conn.conn.status().unwrap().time.unwrap(); - let pos = Duration::from_secs(pos.as_secs().wrapping_add(2)); - app.conn.conn.seek(place, pos)?; - } - - // backward - KeyCode::Char('b') => { - let place = app.conn.conn.status().unwrap().song.unwrap().pos; - let (pos, _) = app.conn.conn.status().unwrap().time.unwrap(); - let pos = Duration::from_secs(pos.as_secs().wrapping_add(2)); - app.conn.conn.seek(place, pos)?; - } - - // Cycle through tabs - KeyCode::Tab => { - app.cycle_tabls(); - } - - // Directory browser tab - KeyCode::Char('1') => { - app.selected_tab = SelectedTab::Queue; - } - - // Playing queue tab - KeyCode::Char('2') => { - app.selected_tab = SelectedTab::DirectoryBrowser; - } - - // Playlists tab - KeyCode::Char('3') => { - app.selected_tab = SelectedTab::Playlists; - } - - // Play next song - KeyCode::Char('>') => { - if !app.queue_list.list.is_empty() { - app.conn.conn.next()?; - app.update_queue(); - } - } - - // Play previous song - KeyCode::Char('<') => { - if !app.queue_list.list.is_empty() { - app.conn.conn.prev()?; - app.update_queue(); - } - } - - // Volume controls - KeyCode::Char('=') => { - app.conn.inc_volume(2); - app.conn.update_status(); - } - - KeyCode::Char('-') => { - app.conn.dec_volume(2); - app.conn.update_status(); - } - - // Delete highlighted song from the queue - KeyCode::Char('d') => { - if app.queue_list.index >= app.queue_list.list.len() - 1 - && app.queue_list.index != 0 - { - app.queue_list.index -= 1; - } - - app.conn.conn.delete(app.queue_list.index as u32)?; - app.update_queue(); - } - - // Update MPD database - KeyCode::Char('U') => { - app.conn.conn.rescan()?; - app.browser.update_directory(&mut app.conn)?; - } - - // Search for songs - KeyCode::Char('/') => { - if app.inputmode == InputMode::Normal { - app.inputmode = InputMode::Editing; - } else { - app.inputmode = InputMode::Normal; - } - } - - // Remove from Current Playlsit - KeyCode::Char(' ') | KeyCode::Backspace => { - app.handle_add_or_remove_from_current_playlist()?; - } - - // go to top of list - KeyCode::Char('g') => match app.selected_tab { - SelectedTab::Queue => app.queue_list.index = 0, - SelectedTab::DirectoryBrowser => app.browser.selected = 0, - SelectedTab::Playlists => app.pl_list.index = 0, - }, - - // go to bottom of list - KeyCode::Char('G') => match app.selected_tab { - SelectedTab::Queue => app.queue_list.index = app.queue_list.list.len() - 1, - SelectedTab::DirectoryBrowser => { - app.browser.selected = app.browser.filetree.len() - 1 - } - SelectedTab::Playlists => app.pl_list.index = app.pl_list.list.len() - 1, - }, - - // Change playlist name - KeyCode::Char('e') => app.change_playlist_name()?, - _ => {} - } - } - Ok(()) -} diff --git a/src/lib.rs b/src/lib.rs index 71a2e93..f06847f 100755 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,11 +16,8 @@ pub mod list; /// File Browser pub mod browser; -/// Event Handler +/// Event Handler/ keymaps pub mod event; -/// KeyEvent Handler -pub mod handler; - /// Application pub mod app; diff --git a/src/main.rs b/src/main.rs index 467af46..ce64c85 100755 --- a/src/main.rs +++ b/src/main.rs @@ -6,9 +6,9 @@ use rmptui::app::AppResult; use rmptui::cli::Args; use rmptui::cli::Command; use rmptui::connection::Connection; -use rmptui::event::Event; -use rmptui::event::EventHandler; -use rmptui::handler; +use rmptui::event::event::Event; +use rmptui::event::event::EventHandler; +use rmptui::event::handler; use rmptui::tui; use std::env; use std::io; diff --git a/src/tui.rs b/src/tui.rs index 9ebd34f..48e438c 100755 --- a/src/tui.rs +++ b/src/tui.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{self, *}; use std::panic; use crate::app::{App, AppResult}; -use crate::event::EventHandler; +use crate::event::event::EventHandler; pub type CrosstermTerminal = ratatui::Terminal>;