refactor(collection_details_handler): use the new handle_table_events macro

This commit is contained in:
2024-12-08 14:22:59 -07:00
parent 87a652d911
commit 048877bbb6
9 changed files with 129 additions and 78 deletions
+15 -9
View File
@@ -3,12 +3,12 @@ use crate::app::App;
use crate::event::Key;
use crate::handle_table_events;
use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, BLOCKLIST_BLOCKS};
use crate::models::sonarr_models::BlocklistItem;
use crate::models::stateful_table::SortOption;
use crate::models::{Scrollable, HorizontallyScrollableText};
use crate::models::Scrollable;
use crate::network::sonarr_network::SonarrEvent;
#[cfg(test)]
@@ -23,21 +23,27 @@ pub(super) struct BlocklistHandler<'a, 'b> {
}
impl<'a, 'b> BlocklistHandler<'a, 'b> {
handle_table_events!(self, blocklist, self.app.data.sonarr_data.blocklist, BlocklistItem);
handle_table_events!(
self,
blocklist,
self.app.data.sonarr_data.blocklist,
BlocklistItem
);
}
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a, 'b> {
fn handle(&mut self) {
let blocklist_table_handling_props = TableHandlingProps::new(ActiveSonarrBlock::Blocklist.into())
.sorting_block(ActiveSonarrBlock::BlocklistSortPrompt.into())
.sort_by_fn(|a: &BlocklistItem, b: &BlocklistItem| a.id.cmp(&b.id))
.sort_options(blocklist_sorting_options());
let blocklist_table_handling_props =
TableHandlingProps::new(ActiveSonarrBlock::Blocklist.into())
.sorting_block(ActiveSonarrBlock::BlocklistSortPrompt.into())
.sort_by_fn(|a: &BlocklistItem, b: &BlocklistItem| a.id.cmp(&b.id))
.sort_options(blocklist_sorting_options());
if !self.handle_blocklist_table_events(blocklist_table_handling_props) {
self.handle_key_event();
}
}
fn accepts(active_block: ActiveSonarrBlock) -> bool {
BLOCKLIST_BLOCKS.contains(&active_block)
}
+16 -15
View File
@@ -1,14 +1,13 @@
use crate::models::HorizontallyScrollableText;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handle_table_events;
use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DOWNLOADS_BLOCKS};
use crate::models::Scrollable;
use crate::models::sonarr_models::DownloadRecord;
use crate::models::Scrollable;
use crate::network::sonarr_network::SonarrEvent;
#[cfg(test)]
@@ -23,18 +22,24 @@ pub(super) struct DownloadsHandler<'a, 'b> {
}
impl<'a, 'b> DownloadsHandler<'a, 'b> {
handle_table_events!(self, downloads, self.app.data.sonarr_data.downloads, DownloadRecord);
handle_table_events!(
self,
downloads,
self.app.data.sonarr_data.downloads,
DownloadRecord
);
}
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DownloadsHandler<'a, 'b> {
fn handle(&mut self) {
let download_table_handling_props = TableHandlingProps::new(ActiveSonarrBlock::Downloads.into());
let download_table_handling_props =
TableHandlingProps::new(ActiveSonarrBlock::Downloads.into());
if !self.handle_downloads_table_events(download_table_handling_props) {
self.handle_key_event();
}
}
fn accepts(active_block: ActiveSonarrBlock) -> bool {
DOWNLOADS_BLOCKS.contains(&active_block)
}
@@ -61,17 +66,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DownloadsHandler<'a,
!self.app.is_loading && !self.app.data.sonarr_data.downloads.is_empty()
}
fn handle_scroll_up(&mut self) {
}
fn handle_scroll_up(&mut self) {}
fn handle_scroll_down(&mut self) {
}
fn handle_scroll_down(&mut self) {}
fn handle_home(&mut self) {
}
fn handle_home(&mut self) {}
fn handle_end(&mut self) {
}
fn handle_end(&mut self) {}
fn handle_delete(&mut self) {
if self.active_sonarr_block == ActiveSonarrBlock::Downloads {
+4 -5
View File
@@ -1,14 +1,14 @@
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handle_table_events;
use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::{handle_clear_errors, KeyEventHandler};
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, HISTORY_BLOCKS};
use crate::models::sonarr_models::SonarrHistoryItem;
use crate::models::stateful_table::SortOption;
use crate::models::{HorizontallyScrollableText, Scrollable};
use crate::handle_table_events;
use crate::models::Scrollable;
#[cfg(test)]
#[path = "history_handler_tests.rs"]
@@ -85,9 +85,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, '
fn handle_delete(&mut self) {}
fn handle_left_right_action(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::History => handle_change_tab_left_right_keys(self.app, self.key),
_ => {}
if self.active_sonarr_block == ActiveSonarrBlock::History {
handle_change_tab_left_right_keys(self.app, self.key)
}
}
@@ -14,7 +14,6 @@ use crate::models::servarr_data::sonarr::sonarr_data::{
};
use crate::models::servarr_models::Indexer;
use crate::models::BlockSelectionState;
use crate::models::HorizontallyScrollableText;
use crate::models::Scrollable;
use crate::network::sonarr_network::SonarrEvent;
@@ -9,7 +9,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, EDIT_SERIES_SELECTION_BLOCKS, SERIES_DETAILS_BLOCKS,
};
use crate::models::sonarr_models::{Season, SonarrHistoryItem};
use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable};
use crate::models::{BlockSelectionState, Scrollable};
use crate::network::sonarr_network::SonarrEvent;
#[cfg(test)]