Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(handlers): Refactored the handlers to all use the handle_table_events macro when appropriate and created tests for the macro so tests don't have to be duplicated across each handler

Browse Source
This commit is contained in:
Alex Clarke
2024-12-11 17:03:52 -07:00
parent c09950d0af
commit ed2211586e
44 changed files with 1592 additions and 9288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs
-334
View File
@@ -14,242 +14,6 @@ mod tests {
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, BLOCKLIST_BLOCKS};
use crate::models::servarr_models::{Language, Quality, QualityWrapper};
use crate::models::sonarr_models::BlocklistItem;
use crate::models::stateful_table::SortOption;
mod test_handle_scroll_up_and_down {
use pretty_assertions::{assert_eq, assert_str_eq};
use rstest::rstest;
use crate::models::sonarr_models::BlocklistItem;
use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
use super::*;
test_iterable_scroll!(
test_blocklist_scroll,
BlocklistHandler,
sonarr_data,
blocklist,
simple_stateful_iterable_vec!(BlocklistItem, String, source_title),
ActiveSonarrBlock::Blocklist,
None,
source_title,
to_string
);
#[rstest]
fn test_blocklist_scroll_no_op_when_not_ready(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
app.is_loading = true;
app
.data
.sonarr_data
.blocklist
.set_items(simple_stateful_iterable_vec!(
BlocklistItem,
String,
source_title
));
BlocklistHandler::with(key, &mut app, ActiveSonarrBlock::Blocklist, None).handle();
assert_str_eq!(
app
.data
.sonarr_data
.blocklist
.current_selection()
.source_title
.to_string(),
"Test 1"
);
BlocklistHandler::with(key, &mut app, ActiveSonarrBlock::Blocklist, None).handle();
assert_str_eq!(
app
.data
.sonarr_data
.blocklist
.current_selection()
.source_title
.to_string(),
"Test 1"
);
}
#[rstest]
fn test_blocklist_sort_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let blocklist_field_vec = sort_options();
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
app.data.sonarr_data.blocklist.sorting(sort_options());
if key == Key::Up {
for i in (0..blocklist_field_vec.len()).rev() {
BlocklistHandler::with(key, &mut app, ActiveSonarrBlock::BlocklistSortPrompt, None)
.handle();
assert_eq!(
app
.data
.sonarr_data
.blocklist
.sort
.as_ref()
.unwrap()
.current_selection(),
&blocklist_field_vec[i]
);
}
} else {
for i in 0..blocklist_field_vec.len() {
BlocklistHandler::with(key, &mut app, ActiveSonarrBlock::BlocklistSortPrompt, None)
.handle();
assert_eq!(
app
.data
.sonarr_data
.blocklist
.sort
.as_ref()
.unwrap()
.current_selection(),
&blocklist_field_vec[(i + 1) % blocklist_field_vec.len()]
);
}
}
}
}
mod test_handle_home_end {
use pretty_assertions::{assert_eq, assert_str_eq};
use crate::models::sonarr_models::BlocklistItem;
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use super::*;
test_iterable_home_and_end!(
test_blocklist_home_and_end,
BlocklistHandler,
sonarr_data,
blocklist,
extended_stateful_iterable_vec!(BlocklistItem, String, source_title),
ActiveSonarrBlock::Blocklist,
None,
source_title,
to_string
);
#[test]
fn test_blocklist_home_and_end_no_op_when_not_ready() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
app.is_loading = true;
app
.data
.sonarr_data
.blocklist
.set_items(extended_stateful_iterable_vec!(
BlocklistItem,
String,
source_title
));
BlocklistHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::Blocklist,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.blocklist
.current_selection()
.source_title
.to_string(),
"Test 1"
);
BlocklistHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::Blocklist,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.blocklist
.current_selection()
.source_title
.to_string(),
"Test 1"
);
}
#[test]
fn test_blocklist_sort_home_end() {
let blocklist_field_vec = sort_options();
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
app.data.sonarr_data.blocklist.sorting(sort_options());
BlocklistHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::BlocklistSortPrompt,
None,
)
.handle();
assert_eq!(
app
.data
.sonarr_data
.blocklist
.sort
.as_ref()
.unwrap()
.current_selection(),
&blocklist_field_vec[blocklist_field_vec.len() - 1]
);
BlocklistHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::BlocklistSortPrompt,
None,
)
.handle();
assert_eq!(
app
.data
.sonarr_data
.blocklist
.sort
.as_ref()
.unwrap()
.current_selection(),
&blocklist_field_vec[0]
);
}
}
mod test_handle_delete {
use pretty_assertions::assert_eq;
@@ -444,31 +208,6 @@ mod tests {
assert_eq!(app.data.sonarr_data.prompt_confirm_action, None);
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
}
#[test]
fn test_blocklist_sort_prompt_submit() {
let mut app = App::default();
app.data.sonarr_data.blocklist.sort_asc = true;
app.data.sonarr_data.blocklist.sorting(sort_options());
app.data.sonarr_data.blocklist.set_items(blocklist_vec());
app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
app.push_navigation_stack(ActiveSonarrBlock::BlocklistSortPrompt.into());
let mut expected_vec = blocklist_vec();
expected_vec.sort_by(|a, b| a.id.cmp(&b.id));
expected_vec.reverse();
BlocklistHandler::with(
SUBMIT_KEY,
&mut app,
ActiveSonarrBlock::BlocklistSortPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
assert_eq!(app.data.sonarr_data.blocklist.items, expected_vec);
}
}
mod test_handle_esc {
@@ -520,23 +259,6 @@ mod tests {
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
}
#[test]
fn test_blocklist_sort_prompt_block_esc() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
app.push_navigation_stack(ActiveSonarrBlock::BlocklistSortPrompt.into());
BlocklistHandler::with(
ESC_KEY,
&mut app,
ActiveSonarrBlock::BlocklistSortPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
}
#[rstest]
fn test_default_esc(#[values(true, false)] is_ready: bool) {
let mut app = App::default();
@@ -635,51 +357,6 @@ mod tests {
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
}
#[test]
fn test_sort_key() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
app.data.sonarr_data.blocklist.set_items(blocklist_vec());
BlocklistHandler::with(
DEFAULT_KEYBINDINGS.sort.key,
&mut app,
ActiveSonarrBlock::Blocklist,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::BlocklistSortPrompt.into()
);
assert_eq!(
app.data.sonarr_data.blocklist.sort.as_ref().unwrap().items,
blocklist_sorting_options()
);
assert!(!app.data.sonarr_data.blocklist.sort_asc);
}
#[test]
fn test_sort_key_no_op_when_not_ready() {
let mut app = App::default();
app.is_loading = true;
app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into());
app.data.sonarr_data.blocklist.set_items(blocklist_vec());
BlocklistHandler::with(
DEFAULT_KEYBINDINGS.sort.key,
&mut app,
ActiveSonarrBlock::Blocklist,
None,
)
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into());
assert!(app.data.sonarr_data.blocklist.sort.is_none());
assert!(!app.data.sonarr_data.blocklist.sort_asc);
}
#[rstest]
#[case(
ActiveSonarrBlock::Blocklist,
@@ -931,15 +608,4 @@ mod tests {
},
]
}
fn sort_options() -> Vec<SortOption<BlocklistItem>> {
vec![SortOption {
name: "Test 1",
cmp_fn: Some(|a, b| {
b.source_title
.to_lowercase()
.cmp(&a.source_title.to_lowercase())
}),
}]
}
}
src/handlers/sonarr_handlers/blocklist/mod.rs
+8 -88
View File
@@ -3,12 +3,11 @@ 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::table_handler::TableHandlingConfig;
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;
use crate::network::sonarr_network::SonarrEvent;
#[cfg(test)]
@@ -33,13 +32,13 @@ impl<'a, 'b> BlocklistHandler<'a, 'b> {
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())
let blocklist_table_handling_config =
TableHandlingConfig::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) {
if !self.handle_blocklist_table_events(blocklist_table_handling_config) {
self.handle_key_event();
}
}
@@ -70,69 +69,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
!self.app.is_loading && !self.app.data.sonarr_data.blocklist.is_empty()
}
fn handle_scroll_up(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::Blocklist => self.app.data.sonarr_data.blocklist.scroll_up(),
ActiveSonarrBlock::BlocklistSortPrompt => self
.app
.data
.sonarr_data
.blocklist
.sort
.as_mut()
.unwrap()
.scroll_up(),
_ => (),
}
}
fn handle_scroll_up(&mut self) {}
fn handle_scroll_down(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::Blocklist => self.app.data.sonarr_data.blocklist.scroll_down(),
ActiveSonarrBlock::BlocklistSortPrompt => self
.app
.data
.sonarr_data
.blocklist
.sort
.as_mut()
.unwrap()
.scroll_down(),
_ => (),
}
}
fn handle_scroll_down(&mut self) {}
fn handle_home(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::Blocklist => self.app.data.sonarr_data.blocklist.scroll_to_top(),
ActiveSonarrBlock::BlocklistSortPrompt => self
.app
.data
.sonarr_data
.blocklist
.sort
.as_mut()
.unwrap()
.scroll_to_top(),
_ => (),
}
}
fn handle_home(&mut self) {}
fn handle_end(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::Blocklist => self.app.data.sonarr_data.blocklist.scroll_to_bottom(),
ActiveSonarrBlock::BlocklistSortPrompt => self
.app
.data
.sonarr_data
.blocklist
.sort
.as_mut()
.unwrap()
.scroll_to_bottom(),
_ => (),
}
}
fn handle_end(&mut self) {}
fn handle_delete(&mut self) {
if self.active_sonarr_block == ActiveSonarrBlock::Blocklist {
@@ -168,18 +111,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
self.app.pop_navigation_stack();
}
ActiveSonarrBlock::BlocklistSortPrompt => {
self
.app
.data
.sonarr_data
.blocklist
.items
.sort_by(|a, b| a.id.cmp(&b.id));
self.app.data.sonarr_data.blocklist.apply_sorting();
self.app.pop_navigation_stack();
}
ActiveSonarrBlock::Blocklist => {
self
.app
@@ -215,17 +146,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
.app
.push_navigation_stack(ActiveSonarrBlock::BlocklistClearAllItemsPrompt.into());
}
_ if key == DEFAULT_KEYBINDINGS.sort.key => {
self
.app
.data
.sonarr_data
.blocklist
.sorting(blocklist_sorting_options());
self
.app
.push_navigation_stack(ActiveSonarrBlock::BlocklistSortPrompt.into());
}
_ => (),
},
ActiveSonarrBlock::DeleteBlocklistItemPrompt => {
src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs
-108
View File
@@ -1,6 +1,5 @@
#[cfg(test)]
mod tests {
use pretty_assertions::assert_str_eq;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -11,113 +10,6 @@ mod tests {
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DOWNLOADS_BLOCKS};
use crate::models::sonarr_models::DownloadRecord;
mod test_handle_scroll_up_and_down {
use rstest::rstest;
use crate::models::sonarr_models::DownloadRecord;
use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
use super::*;
test_iterable_scroll!(
test_downloads_scroll,
DownloadsHandler,
sonarr_data,
downloads,
DownloadRecord,
ActiveSonarrBlock::Downloads,
None,
title
);
#[rstest]
fn test_downloads_scroll_no_op_when_not_ready(
#[values(
DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key
)]
key: Key,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
app.is_loading = true;
app
.data
.sonarr_data
.downloads
.set_items(simple_stateful_iterable_vec!(DownloadRecord));
DownloadsHandler::with(key, &mut app, ActiveSonarrBlock::Downloads, None).handle();
assert_str_eq!(
app.data.sonarr_data.downloads.current_selection().title,
"Test 1"
);
DownloadsHandler::with(key, &mut app, ActiveSonarrBlock::Downloads, None).handle();
assert_str_eq!(
app.data.sonarr_data.downloads.current_selection().title,
"Test 1"
);
}
}
mod test_handle_home_end {
use crate::models::sonarr_models::DownloadRecord;
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use super::*;
test_iterable_home_and_end!(
test_downloads_home_end,
DownloadsHandler,
sonarr_data,
downloads,
DownloadRecord,
ActiveSonarrBlock::Downloads,
None,
title
);
#[test]
fn test_downloads_home_end_no_op_when_not_ready() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Downloads.into());
app.is_loading = true;
app
.data
.sonarr_data
.downloads
.set_items(extended_stateful_iterable_vec!(DownloadRecord));
DownloadsHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::Downloads,
None,
)
.handle();
assert_str_eq!(
app.data.sonarr_data.downloads.current_selection().title,
"Test 1"
);
DownloadsHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::Downloads,
None,
)
.handle();
assert_str_eq!(
app.data.sonarr_data.downloads.current_selection().title,
"Test 1"
);
}
}
mod test_handle_delete {
use pretty_assertions::assert_eq;
src/handlers/sonarr_handlers/downloads/mod.rs
+4 -5
View File
@@ -3,11 +3,10 @@ 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::table_handler::TableHandlingConfig;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DOWNLOADS_BLOCKS};
use crate::models::sonarr_models::DownloadRecord;
use crate::models::Scrollable;
use crate::network::sonarr_network::SonarrEvent;
#[cfg(test)]
@@ -32,10 +31,10 @@ impl<'a, 'b> DownloadsHandler<'a, 'b> {
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_config =
TableHandlingConfig::new(ActiveSonarrBlock::Downloads.into());
if !self.handle_downloads_table_events(download_table_handling_props) {
if !self.handle_downloads_table_events(download_table_handling_config) {
self.handle_key_event();
}
}
src/handlers/sonarr_handlers/history/history_handler_tests.rs
+17 -1022
View File
File diff suppressed because it is too large Load Diff
src/handlers/sonarr_handlers/history/mod.rs
+3 -4
View File
@@ -3,12 +3,11 @@ 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::table_handler::TableHandlingConfig;
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::Scrollable;
#[cfg(test)]
#[path = "history_handler_tests.rs"]
@@ -32,7 +31,7 @@ impl<'a, 'b> HistoryHandler<'a, 'b> {
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, 'b> {
fn handle(&mut self) {
let history_table_handling_props = TableHandlingProps::new(ActiveSonarrBlock::History.into())
let history_table_handling_config = TableHandlingConfig::new(ActiveSonarrBlock::History.into())
.sorting_block(ActiveSonarrBlock::HistorySortPrompt.into())
.sort_by_fn(|a: &SonarrHistoryItem, b: &SonarrHistoryItem| a.id.cmp(&b.id))
.sort_options(history_sorting_options())
@@ -43,7 +42,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, '
.filter_error_block(ActiveSonarrBlock::FilterHistoryError.into())
.filter_field_fn(|history| &history.source_title.text);
if !self.handle_history_table_events(history_table_handling_props) {
if !self.handle_history_table_events(history_table_handling_config) {
self.handle_key_event();
}
}
src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs
+5 -107
View File
@@ -1,6 +1,5 @@
#[cfg(test)]
mod tests {
use pretty_assertions::{assert_eq, assert_str_eq};
use rstest::rstest;
use strum::IntoEnumIterator;
@@ -15,111 +14,6 @@ mod tests {
use crate::models::servarr_models::Indexer;
use crate::test_handler_delegation;
mod test_handle_scroll_up_and_down {
use rstest::rstest;
use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
use super::*;
test_iterable_scroll!(
test_indexers_scroll,
IndexersHandler,
sonarr_data,
indexers,
simple_stateful_iterable_vec!(Indexer, String, protocol),
ActiveSonarrBlock::Indexers,
None,
protocol
);
#[rstest]
fn test_indexers_scroll_no_op_when_not_ready(
#[values(
DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key
)]
key: Key,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
app.is_loading = true;
app
.data
.sonarr_data
.indexers
.set_items(simple_stateful_iterable_vec!(Indexer, String, protocol));
IndexersHandler::with(key, &mut app, ActiveSonarrBlock::Indexers, None).handle();
assert_str_eq!(
app.data.sonarr_data.indexers.current_selection().protocol,
"Test 1"
);
IndexersHandler::with(key, &mut app, ActiveSonarrBlock::Indexers, None).handle();
assert_str_eq!(
app.data.sonarr_data.indexers.current_selection().protocol,
"Test 1"
);
}
}
mod test_handle_home_end {
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use super::*;
test_iterable_home_and_end!(
test_indexers_home_end,
IndexersHandler,
sonarr_data,
indexers,
extended_stateful_iterable_vec!(Indexer, String, protocol),
ActiveSonarrBlock::Indexers,
None,
protocol
);
#[test]
fn test_indexers_home_end_no_op_when_not_ready() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
app.is_loading = true;
app
.data
.sonarr_data
.indexers
.set_items(extended_stateful_iterable_vec!(Indexer, String, protocol));
IndexersHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::Indexers,
None,
)
.handle();
assert_str_eq!(
app.data.sonarr_data.indexers.current_selection().protocol,
"Test 1"
);
IndexersHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::Indexers,
None,
)
.handle();
assert_str_eq!(
app.data.sonarr_data.indexers.current_selection().protocol,
"Test 1"
);
}
}
mod test_handle_delete {
use pretty_assertions::assert_eq;
@@ -515,7 +409,11 @@ mod tests {
#[test]
fn test_indexer_settings_key() {
let mut app = App::default();
app.data.sonarr_data.indexers.set_items(vec![Indexer::default()]);
app
.data
.sonarr_data
.indexers
.set_items(vec![Indexer::default()]);
app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
app
.data
src/handlers/sonarr_handlers/indexers/mod.rs
+4 -4
View File
@@ -6,7 +6,7 @@ use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
use crate::handlers::sonarr_handlers::indexers::edit_indexer_handler::EditIndexerHandler;
use crate::handlers::sonarr_handlers::indexers::edit_indexer_settings_handler::IndexerSettingsHandler;
use crate::handlers::sonarr_handlers::indexers::test_all_indexers_handler::TestAllIndexersHandler;
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
@@ -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::Scrollable;
use crate::network::sonarr_network::SonarrEvent;
mod edit_indexer_handler;
@@ -38,9 +37,10 @@ impl<'a, 'b> IndexersHandler<'a, 'b> {
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexersHandler<'a, 'b> {
fn handle(&mut self) {
let indexers_table_handling_props = TableHandlingProps::new(ActiveSonarrBlock::Indexers.into());
let indexers_table_handling_config =
TableHandlingConfig::new(ActiveSonarrBlock::Indexers.into());
if !self.handle_indexers_table_events(indexers_table_handling_props) {
if !self.handle_indexers_table_events(indexers_table_handling_config) {
match self.active_sonarr_block {
_ if EditIndexerHandler::accepts(self.active_sonarr_block) => {
EditIndexerHandler::with(self.key, self.app, self.active_sonarr_block, self.context)
src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs
+33 -49
View File
@@ -1,8 +1,10 @@
use crate::app::App;
use crate::event::Key;
use crate::handle_table_events;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::modals::IndexerTestResultModalItem;
use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
use crate::models::Scrollable;
#[cfg(test)]
#[path = "test_all_indexers_handler_tests.rs"]
@@ -15,7 +17,33 @@ pub(super) struct TestAllIndexersHandler<'a, 'b> {
_context: Option<ActiveSonarrBlock>,
}
impl<'a, 'b> TestAllIndexersHandler<'a, 'b> {
handle_table_events!(
self,
indexer_test_all_results,
self
.app
.data
.sonarr_data
.indexer_test_all_results
.as_mut()
.unwrap(),
IndexerTestResultModalItem
);
}
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for TestAllIndexersHandler<'a, 'b> {
fn handle(&mut self) {
let indexer_test_all_results_table_handling_config =
TableHandlingConfig::new(ActiveSonarrBlock::TestAllIndexers.into());
if !self
.handle_indexer_test_all_results_table_events(indexer_test_all_results_table_handling_config)
{
self.handle_key_event();
}
}
fn accepts(active_block: ActiveSonarrBlock) -> bool {
active_block == ActiveSonarrBlock::TestAllIndexers
}
@@ -48,57 +76,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for TestAllIndexersHandl
!self.app.is_loading && table_is_ready
}
fn handle_scroll_up(&mut self) {
if self.active_sonarr_block == ActiveSonarrBlock::TestAllIndexers {
self
.app
.data
.sonarr_data
.indexer_test_all_results
.as_mut()
.unwrap()
.scroll_up()
}
}
fn handle_scroll_up(&mut self) {}
fn handle_scroll_down(&mut self) {
if self.active_sonarr_block == ActiveSonarrBlock::TestAllIndexers {
self
.app
.data
.sonarr_data
.indexer_test_all_results
.as_mut()
.unwrap()
.scroll_down()
}
}
fn handle_scroll_down(&mut self) {}
fn handle_home(&mut self) {
if self.active_sonarr_block == ActiveSonarrBlock::TestAllIndexers {
self
.app
.data
.sonarr_data
.indexer_test_all_results
.as_mut()
.unwrap()
.scroll_to_top()
}
}
fn handle_home(&mut self) {}
fn handle_end(&mut self) {
if self.active_sonarr_block == ActiveSonarrBlock::TestAllIndexers {
self
.app
.data
.sonarr_data
.indexer_test_all_results
.as_mut()
.unwrap()
.scroll_to_bottom()
}
}
fn handle_end(&mut self) {}
fn handle_delete(&mut self) {}
src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs
-219
View File
@@ -2,7 +2,6 @@
mod tests {
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handlers::sonarr_handlers::indexers::test_all_indexers_handler::TestAllIndexersHandler;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::modals::IndexerTestResultModalItem;
@@ -10,224 +9,6 @@ mod tests {
use crate::models::stateful_table::StatefulTable;
use strum::IntoEnumIterator;
mod test_handle_scroll_up_and_down {
use pretty_assertions::assert_str_eq;
use rstest::rstest;
use crate::models::servarr_data::modals::IndexerTestResultModalItem;
use crate::models::stateful_table::StatefulTable;
use crate::simple_stateful_iterable_vec;
use super::*;
#[rstest]
fn test_test_all_indexers_results_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
let mut indexer_test_results = StatefulTable::default();
indexer_test_results.set_items(simple_stateful_iterable_vec!(
IndexerTestResultModalItem,
String,
name
));
app.data.sonarr_data.indexer_test_all_results = Some(indexer_test_results);
TestAllIndexersHandler::with(key, &mut app, ActiveSonarrBlock::TestAllIndexers, None)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
.current_selection()
.name,
"Test 2"
);
TestAllIndexersHandler::with(key, &mut app, ActiveSonarrBlock::TestAllIndexers, None)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
.current_selection()
.name,
"Test 1"
);
}
#[rstest]
fn test_test_all_indexers_results_scroll_no_op_when_not_ready(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
app.is_loading = true;
let mut indexer_test_results = StatefulTable::default();
indexer_test_results.set_items(simple_stateful_iterable_vec!(
IndexerTestResultModalItem,
String,
name
));
app.data.sonarr_data.indexer_test_all_results = Some(indexer_test_results);
TestAllIndexersHandler::with(key, &mut app, ActiveSonarrBlock::TestAllIndexers, None)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
.current_selection()
.name,
"Test 1"
);
TestAllIndexersHandler::with(key, &mut app, ActiveSonarrBlock::TestAllIndexers, None)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
.current_selection()
.name,
"Test 1"
);
}
}
mod test_handle_home_end {
use crate::extended_stateful_iterable_vec;
use crate::models::servarr_data::modals::IndexerTestResultModalItem;
use crate::models::stateful_table::StatefulTable;
use pretty_assertions::assert_str_eq;
use super::*;
#[test]
fn test_test_all_indexers_results_home_end() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
let mut indexer_test_results = StatefulTable::default();
indexer_test_results.set_items(extended_stateful_iterable_vec!(
IndexerTestResultModalItem,
String,
name
));
app.data.sonarr_data.indexer_test_all_results = Some(indexer_test_results);
TestAllIndexersHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::TestAllIndexers,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
.current_selection()
.name,
"Test 3"
);
TestAllIndexersHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::TestAllIndexers,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
.current_selection()
.name,
"Test 1"
);
}
#[test]
fn test_test_all_indexers_results_home_end_no_op_when_not_ready() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Indexers.into());
app.is_loading = true;
let mut indexer_test_results = StatefulTable::default();
indexer_test_results.set_items(extended_stateful_iterable_vec!(
IndexerTestResultModalItem,
String,
name
));
app.data.sonarr_data.indexer_test_all_results = Some(indexer_test_results);
TestAllIndexersHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::TestAllIndexers,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
.current_selection()
.name,
"Test 1"
);
TestAllIndexersHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::TestAllIndexers,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
.current_selection()
.name,
"Test 1"
);
}
}
mod test_handle_esc {
use super::*;
use crate::models::stateful_table::StatefulTable;
src/handlers/sonarr_handlers/library/add_series_handler.rs
+27 -33
View File
@@ -1,11 +1,13 @@
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, ADD_SERIES_BLOCKS, ADD_SERIES_SELECTION_BLOCKS,
};
use crate::models::sonarr_models::AddSeriesSearchResult;
use crate::models::{BlockSelectionState, Scrollable};
use crate::network::sonarr_network::SonarrEvent;
use crate::{handle_text_box_keys, handle_text_box_left_right_keys, App, Key};
use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, App, Key};
#[cfg(test)]
#[path = "add_series_handler_tests.rs"]
@@ -18,7 +20,31 @@ pub(super) struct AddSeriesHandler<'a, 'b> {
_context: Option<ActiveSonarrBlock>,
}
impl<'a, 'b> AddSeriesHandler<'a, 'b> {
handle_table_events!(
self,
add_searched_series,
self
.app
.data
.sonarr_data
.add_searched_series
.as_mut()
.unwrap(),
AddSeriesSearchResult
);
}
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a, 'b> {
fn handle(&mut self) {
let add_series_table_handling_config =
TableHandlingConfig::new(ActiveSonarrBlock::AddSeriesSearchResults.into());
if !self.handle_add_searched_series_table_events(add_series_table_handling_config) {
self.handle_key_event();
}
}
fn accepts(active_block: ActiveSonarrBlock) -> bool {
ADD_SERIES_BLOCKS.contains(&active_block)
}
@@ -47,14 +73,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
fn handle_scroll_up(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::AddSeriesSearchResults => self
.app
.data
.sonarr_data
.add_searched_series
.as_mut()
.unwrap()
.scroll_up(),
ActiveSonarrBlock::AddSeriesSelectMonitor => self
.app
.data
@@ -107,14 +125,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
fn handle_scroll_down(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::AddSeriesSearchResults => self
.app
.data
.sonarr_data
.add_searched_series
.as_mut()
.unwrap()
.scroll_down(),
ActiveSonarrBlock::AddSeriesSelectMonitor => self
.app
.data
@@ -167,14 +177,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
fn handle_home(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::AddSeriesSearchResults => self
.app
.data
.sonarr_data
.add_searched_series
.as_mut()
.unwrap()
.scroll_to_top(),
ActiveSonarrBlock::AddSeriesSelectMonitor => self
.app
.data
@@ -243,14 +245,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
fn handle_end(&mut self) {
match self.active_sonarr_block {
ActiveSonarrBlock::AddSeriesSearchResults => self
.app
.data
.sonarr_data
.add_searched_series
.as_mut()
.unwrap()
.scroll_to_bottom(),
ActiveSonarrBlock::AddSeriesSelectMonitor => self
.app
.data
src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
-224
View File
@@ -20,125 +20,11 @@ mod tests {
use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::ADD_SERIES_SELECTION_BLOCKS;
use crate::models::stateful_table::StatefulTable;
use crate::models::BlockSelectionState;
use crate::simple_stateful_iterable_vec;
use super::*;
#[rstest]
fn test_add_series_search_results_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Series.into());
let mut add_searched_series = StatefulTable::default();
add_searched_series.set_items(simple_stateful_iterable_vec!(
AddSeriesSearchResult,
HorizontallyScrollableText
));
app.data.sonarr_data.add_searched_series = Some(add_searched_series);
AddSeriesHandler::with(
key,
&mut app,
ActiveSonarrBlock::AddSeriesSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.add_searched_series
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 2"
);
AddSeriesHandler::with(
key,
&mut app,
ActiveSonarrBlock::AddSeriesSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.add_searched_series
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[rstest]
fn test_add_series_search_results_scroll_no_op_when_not_ready(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Series.into());
app.is_loading = true;
let mut add_searched_series = StatefulTable::default();
add_searched_series.set_items(simple_stateful_iterable_vec!(
AddSeriesSearchResult,
HorizontallyScrollableText
));
app.data.sonarr_data.add_searched_series = Some(add_searched_series);
AddSeriesHandler::with(
key,
&mut app,
ActiveSonarrBlock::AddSeriesSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.add_searched_series
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
AddSeriesHandler::with(
key,
&mut app,
ActiveSonarrBlock::AddSeriesSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.add_searched_series
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[rstest]
fn test_add_series_select_monitor_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
@@ -486,119 +372,9 @@ mod tests {
use crate::extended_stateful_iterable_vec;
use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
use crate::models::stateful_table::StatefulTable;
use super::*;
#[test]
fn test_add_series_search_results_home_end() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Series.into());
let mut add_searched_series = StatefulTable::default();
add_searched_series.set_items(extended_stateful_iterable_vec!(
AddSeriesSearchResult,
HorizontallyScrollableText
));
app.data.sonarr_data.add_searched_series = Some(add_searched_series);
AddSeriesHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::AddSeriesSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.add_searched_series
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 3"
);
AddSeriesHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::AddSeriesSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.add_searched_series
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[test]
fn test_add_series_search_results_home_end_no_op_when_not_ready() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::Series.into());
app.is_loading = true;
let mut add_searched_series = StatefulTable::default();
add_searched_series.set_items(extended_stateful_iterable_vec!(
AddSeriesSearchResult,
HorizontallyScrollableText
));
app.data.sonarr_data.add_searched_series = Some(add_searched_series);
AddSeriesHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::AddSeriesSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.add_searched_series
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
AddSeriesHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::AddSeriesSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.sonarr_data
.add_searched_series
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[test]
fn test_add_series_select_monitor_home_end() {
let monitor_vec = Vec::from_iter(SeriesMonitor::iter());
src/handlers/sonarr_handlers/library/library_handler_tests.rs
+4 -991
View File
File diff suppressed because it is too large Load Diff
src/handlers/sonarr_handlers/library/mod.rs
+4 -4
View File
@@ -15,7 +15,7 @@ use crate::{
},
sonarr_models::Series,
stateful_table::SortOption,
BlockSelectionState, HorizontallyScrollableText, Scrollable,
BlockSelectionState, HorizontallyScrollableText,
},
network::sonarr_network::SonarrEvent,
};
@@ -23,7 +23,7 @@ use crate::{
use super::handle_change_tab_left_right_keys;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::handlers::sonarr_handlers::library::series_details_handler::SeriesDetailsHandler;
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::table_handler::TableHandlingConfig;
mod add_series_handler;
mod delete_series_handler;
@@ -46,7 +46,7 @@ impl<'a, 'b> LibraryHandler<'a, 'b> {
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, 'b> {
fn handle(&mut self) {
let series_table_handling_props = TableHandlingProps::new(ActiveSonarrBlock::Series.into())
let series_table_handling_config = TableHandlingConfig::new(ActiveSonarrBlock::Series.into())
.sorting_block(ActiveSonarrBlock::SeriesSortPrompt.into())
.sort_by_fn(|a: &Series, b: &Series| a.id.cmp(&b.id))
.sort_options(series_sorting_options())
@@ -57,7 +57,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, '
.filter_error_block(ActiveSonarrBlock::FilterSeriesError.into())
.filter_field_fn(|series| &series.title.text);
if !self.handle_series_table_events(series_table_handling_props) {
if !self.handle_series_table_events(series_table_handling_config) {
match self.active_sonarr_block {
_ if AddSeriesHandler::accepts(self.active_sonarr_block) => {
AddSeriesHandler::with(self.key, self.app, self.active_sonarr_block, self.context)
src/handlers/sonarr_handlers/library/series_details_handler.rs
+8 -8
View File
@@ -3,13 +3,13 @@ use crate::app::App;
use crate::event::Key;
use crate::handle_table_events;
use crate::handlers::sonarr_handlers::history::history_sorting_options;
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
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, Scrollable};
use crate::models::BlockSelectionState;
use crate::network::sonarr_network::SonarrEvent;
#[cfg(test)]
@@ -41,8 +41,8 @@ impl<'a, 'b> SeriesDetailsHandler<'a, 'b> {
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler<'a, 'b> {
fn handle(&mut self) {
let season_table_handling_props =
TableHandlingProps::new(ActiveSonarrBlock::SeriesDetails.into())
let season_table_handling_config =
TableHandlingConfig::new(ActiveSonarrBlock::SeriesDetails.into())
.searching_block(ActiveSonarrBlock::SearchSeason.into())
.search_error_block(ActiveSonarrBlock::SearchSeasonError.into())
.search_field_fn(|season: &Season| {
@@ -51,8 +51,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
.as_ref()
.expect("Season was not populated with title in handlers")
});
let series_history_table_handling_props =
TableHandlingProps::new(ActiveSonarrBlock::SeriesHistory.into())
let series_history_table_handling_config =
TableHandlingConfig::new(ActiveSonarrBlock::SeriesHistory.into())
.sorting_block(ActiveSonarrBlock::SeriesHistorySortPrompt.into())
.sort_options(history_sorting_options())
.sort_by_fn(|a: &SonarrHistoryItem, b: &SonarrHistoryItem| a.id.cmp(&b.id))
@@ -63,8 +63,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
.filter_error_block(ActiveSonarrBlock::FilterSeriesHistoryError.into())
.filter_field_fn(|history_item: &SonarrHistoryItem| &history_item.source_title.text);
if !self.handle_season_table_events(season_table_handling_props)
&& !self.handle_series_history_table_events(series_history_table_handling_props)
if !self.handle_season_table_events(season_table_handling_config)
&& !self.handle_series_history_table_events(series_history_table_handling_config)
{
self.handle_key_event();
}
src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
+21 -1382
View File
File diff suppressed because it is too large Load Diff
src/handlers/sonarr_handlers/root_folders/mod.rs
+5 -5
View File
@@ -2,11 +2,11 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, ROOT_FOLDERS_BLOCKS};
use crate::models::servarr_models::RootFolder;
use crate::models::{HorizontallyScrollableText, Scrollable};
use crate::models::HorizontallyScrollableText;
use crate::network::sonarr_network::SonarrEvent;
use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys};
@@ -32,10 +32,10 @@ impl<'a, 'b> RootFoldersHandler<'a, 'b> {
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<'a, 'b> {
fn handle(&mut self) {
let root_folders_table_handling_props =
TableHandlingProps::new(ActiveSonarrBlock::RootFolders.into());
let root_folders_table_handling_config =
TableHandlingConfig::new(ActiveSonarrBlock::RootFolders.into());
if !self.handle_root_folders_table_events(root_folders_table_handling_props) {
if !self.handle_root_folders_table_events(root_folders_table_handling_config) {
self.handle_key_event();
}
}
src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs
+2 -103
View File
@@ -1,6 +1,5 @@
#[cfg(test)]
mod tests {
use pretty_assertions::assert_str_eq;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -12,113 +11,13 @@ mod tests {
use crate::models::servarr_models::RootFolder;
use crate::models::HorizontallyScrollableText;
mod test_handle_scroll_up_and_down {
use rstest::rstest;
use crate::models::servarr_models::RootFolder;
use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
use super::*;
test_iterable_scroll!(
test_root_folders_scroll,
RootFoldersHandler,
sonarr_data,
root_folders,
simple_stateful_iterable_vec!(RootFolder, String, path),
ActiveSonarrBlock::RootFolders,
None,
path
);
#[rstest]
fn test_root_folders_scroll_no_op_when_not_ready(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
app.is_loading = true;
app
.data
.sonarr_data
.root_folders
.set_items(simple_stateful_iterable_vec!(RootFolder, String, path));
RootFoldersHandler::with(key, &mut app, ActiveSonarrBlock::RootFolders, None).handle();
assert_str_eq!(
app.data.sonarr_data.root_folders.current_selection().path,
"Test 1"
);
RootFoldersHandler::with(key, &mut app, ActiveSonarrBlock::RootFolders, None).handle();
assert_str_eq!(
app.data.sonarr_data.root_folders.current_selection().path,
"Test 1"
);
}
}
mod test_handle_home_end {
use crate::models::servarr_models::RootFolder;
use pretty_assertions::assert_eq;
use std::sync::atomic::Ordering;
use pretty_assertions::assert_eq;
use crate::models::servarr_models::RootFolder;
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use super::*;
test_iterable_home_and_end!(
test_root_folders_home_end,
RootFoldersHandler,
sonarr_data,
root_folders,
extended_stateful_iterable_vec!(RootFolder, String, path),
ActiveSonarrBlock::RootFolders,
None,
path
);
#[test]
fn test_root_folders_home_end_no_op_when_not_ready() {
let mut app = App::default();
app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into());
app.is_loading = true;
app
.data
.sonarr_data
.root_folders
.set_items(extended_stateful_iterable_vec!(RootFolder, String, path));
RootFoldersHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveSonarrBlock::RootFolders,
None,
)
.handle();
assert_str_eq!(
app.data.sonarr_data.root_folders.current_selection().path,
"Test 1"
);
RootFoldersHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveSonarrBlock::RootFolders,
None,
)
.handle();
assert_str_eq!(
app.data.sonarr_data.root_folders.current_selection().path,
"Test 1"
);
}
#[test]
fn test_add_root_folder_prompt_home_end_keys() {
let mut app = App::default();
src/handlers/sonarr_handlers/system/system_handler_tests.rs
-1
View File
@@ -1,6 +1,5 @@
#[cfg(test)]
mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use strum::IntoEnumIterator;