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

refactor: Migrated the handle_table_events macro into a trait for better IDE support, created a TableEventAdapter wrapper for the KeyEventHandlers to make it so that the trait can be used properly and a simple function to replace the previous call to the handle_table_events macro

Browse Source
This commit is contained in:
Alex Clarke
2025-12-04 16:03:58 -07:00
parent 71240373c0
commit 35dce0bf01
42 changed files with 1425 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/sonarr_handlers/library/add_series_handler.rs
+22 -18
View File
@@ -1,4 +1,4 @@
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
use crate::handlers::{KeyEventHandler, handle_prompt_toggle};
use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::{
@@ -7,9 +7,7 @@ use crate::models::servarr_data::sonarr::sonarr_data::{
use crate::models::sonarr_models::{AddSeriesBody, AddSeriesOptions, AddSeriesSearchResult};
use crate::models::{BlockSelectionState, Scrollable};
use crate::network::sonarr_network::SonarrEvent;
use crate::{
App, Key, handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, matches_key,
};
use crate::{App, Key, handle_text_box_keys, handle_text_box_left_right_keys, matches_key};
#[cfg(test)]
#[path = "add_series_handler_tests.rs"]
@@ -23,19 +21,6 @@ pub(super) struct AddSeriesHandler<'a, 'b> {
}
impl AddSeriesHandler<'_, '_> {
handle_table_events!(
self,
add_searched_series,
self
.app
.data
.sonarr_data
.add_searched_series
.as_mut()
.expect("add_searched_series should be initialized"),
AddSeriesSearchResult
);
fn build_add_series_body(&mut self) -> AddSeriesBody {
let add_series_modal = self
.app
@@ -117,7 +102,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
let add_series_table_handling_config =
TableHandlingConfig::new(ActiveSonarrBlock::AddSeriesSearchResults.into());
if !self.handle_add_searched_series_table_events(add_series_table_handling_config) {
if !handle_table(
self,
|app| {
app
.data
.sonarr_data
.add_searched_series
.as_mut()
.expect("add_searched_series should be initialized")
},
add_series_table_handling_config,
) {
self.handle_key_event();
}
}
@@ -624,4 +620,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a,
_ => (),
}
}
fn app_mut(&mut self) -> &mut App<'b> {
self.app
}
fn current_route(&self) -> crate::models::Route {
self.app.get_current_route()
}
}
src/handlers/sonarr_handlers/library/delete_series_handler.rs
+8
View File
@@ -138,4 +138,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DeleteSeriesHandler<
self.app.pop_navigation_stack();
}
}
fn app_mut(&mut self) -> &mut App<'b> {
self.app
}
fn current_route(&self) -> crate::models::Route {
self.app.get_current_route()
}
}
src/handlers/sonarr_handlers/library/edit_series_handler.rs
+8
View File
@@ -466,4 +466,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditSeriesHandler<'a
_ => (),
}
}
fn app_mut(&mut self) -> &mut App<'b> {
self.app
}
fn current_route(&self) -> crate::models::Route {
self.app.get_current_route()
}
}
src/handlers/sonarr_handlers/library/episode_details_handler.rs
+42 -39
View File
@@ -1,12 +1,12 @@
use crate::app::App;
use crate::event::Key;
use crate::handlers::sonarr_handlers::library::season_details_handler::releases_sorting_options;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
use crate::handlers::{KeyEventHandler, handle_prompt_toggle};
use crate::matches_key;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, EPISODE_DETAILS_BLOCKS};
use crate::models::sonarr_models::{SonarrHistoryItem, SonarrRelease, SonarrReleaseDownloadBody};
use crate::models::sonarr_models::{SonarrRelease, SonarrReleaseDownloadBody};
use crate::network::sonarr_network::SonarrEvent;
use crate::{handle_table_events, matches_key};
#[cfg(test)]
#[path = "episode_details_handler_tests.rs"]
@@ -20,39 +20,6 @@ pub(super) struct EpisodeDetailsHandler<'a, 'b> {
}
impl EpisodeDetailsHandler<'_, '_> {
handle_table_events!(
self,
episode_history,
self
.app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.episode_details_modal
.as_mut()
.expect("Episode details modal is undefined")
.episode_history,
SonarrHistoryItem
);
handle_table_events!(
self,
episode_releases,
self
.app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.episode_details_modal
.as_mut()
.expect("Episode details modal is undefined")
.episode_releases,
SonarrRelease
);
fn extract_episode_id(&self) -> i64 {
self
.app
@@ -76,9 +43,37 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EpisodeDetailsHandle
.sorting_block(ActiveSonarrBlock::ManualEpisodeSearchSortPrompt.into())
.sort_options(releases_sorting_options());
if !self.handle_episode_history_table_events(episode_history_table_handling_config)
&& !self.handle_episode_releases_table_events(episode_releases_table_handling_config)
{
if !handle_table(
self,
|app| {
&mut app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.episode_details_modal
.as_mut()
.expect("Episode details modal is undefined")
.episode_history
},
episode_history_table_handling_config,
) && !handle_table(
self,
|app| {
&mut app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.episode_details_modal
.as_mut()
.expect("Episode details modal is undefined")
.episode_releases
},
episode_releases_table_handling_config,
) {
self.handle_key_event();
}
}
@@ -370,4 +365,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EpisodeDetailsHandle
_ => (),
}
}
fn app_mut(&mut self) -> &mut App<'b> {
self.app
}
fn current_route(&self) -> crate::models::Route {
self.app.get_current_route()
}
}
src/handlers/sonarr_handlers/library/mod.rs
+14 -4
View File
@@ -6,7 +6,6 @@ use edit_series_handler::EditSeriesHandler;
use crate::{
app::App,
event::Key,
handle_table_events,
handlers::{KeyEventHandler, handle_clear_errors, handle_prompt_toggle},
matches_key,
models::{
@@ -25,7 +24,7 @@ use super::handle_change_tab_left_right_keys;
use crate::handlers::sonarr_handlers::library::episode_details_handler::EpisodeDetailsHandler;
use crate::handlers::sonarr_handlers::library::season_details_handler::SeasonDetailsHandler;
use crate::handlers::sonarr_handlers::library::series_details_handler::SeriesDetailsHandler;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
mod add_series_handler;
mod delete_series_handler;
@@ -45,7 +44,6 @@ pub(super) struct LibraryHandler<'a, 'b> {
}
impl LibraryHandler<'_, '_> {
handle_table_events!(self, series, self.app.data.sonarr_data.series, Series);
fn extract_series_id(&self) -> i64 {
self.app.data.sonarr_data.series.current_selection().id
}
@@ -63,7 +61,11 @@ 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_config) {
if !handle_table(
self,
|app| &mut app.data.sonarr_data.series,
series_table_handling_config,
) {
match self.active_sonarr_block {
_ if AddSeriesHandler::accepts(self.active_sonarr_block) => {
AddSeriesHandler::new(self.key, self.app, self.active_sonarr_block, self.context)
@@ -238,6 +240,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, '
_ => (),
}
}
fn app_mut(&mut self) -> &mut App<'b> {
self.app
}
fn current_route(&self) -> crate::models::Route {
self.app.get_current_route()
}
}
fn series_sorting_options() -> Vec<SortOption<Series>> {
src/handlers/sonarr_handlers/library/season_details_handler.rs
+47 -46
View File
@@ -1,8 +1,9 @@
use crate::app::App;
use crate::event::Key;
use crate::handlers::sonarr_handlers::history::history_sorting_options;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
use crate::handlers::{KeyEventHandler, handle_prompt_toggle};
use crate::matches_key;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SEASON_DETAILS_BLOCKS};
use crate::models::servarr_models::Language;
use crate::models::sonarr_models::{
@@ -10,7 +11,6 @@ use crate::models::sonarr_models::{
};
use crate::models::stateful_table::SortOption;
use crate::network::sonarr_network::SonarrEvent;
use crate::{handle_table_events, matches_key};
use serde_json::Number;
#[cfg(test)]
@@ -25,46 +25,6 @@ pub(super) struct SeasonDetailsHandler<'a, 'b> {
}
impl SeasonDetailsHandler<'_, '_> {
handle_table_events!(
self,
episodes,
self
.app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.episodes,
Episode
);
handle_table_events!(
self,
season_history,
self
.app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.season_history,
SonarrHistoryItem
);
handle_table_events!(
self,
season_releases,
self
.app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.season_releases,
SonarrRelease
);
fn extract_episode_file_id(&self) -> i64 {
self
.app
@@ -126,10 +86,43 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
.sorting_block(ActiveSonarrBlock::ManualSeasonSearchSortPrompt.into())
.sort_options(releases_sorting_options());
if !self.handle_episodes_table_events(episodes_table_handling_config)
&& !self.handle_season_history_table_events(season_history_table_handling_config)
&& !self.handle_season_releases_table_events(season_releases_table_handling_config)
{
if !handle_table(
self,
|app| {
&mut app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.episodes
},
episodes_table_handling_config,
) && !handle_table(
self,
|app| {
&mut app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.season_history
},
season_history_table_handling_config,
) && !handle_table(
self,
|app| {
&mut app
.data
.sonarr_data
.season_details_modal
.as_mut()
.expect("Season details modal is undefined")
.season_releases
},
season_releases_table_handling_config,
) {
self.handle_key_event();
}
}
@@ -460,6 +453,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
_ => (),
}
}
fn app_mut(&mut self) -> &mut App<'b> {
self.app
}
fn current_route(&self) -> crate::models::Route {
self.app.get_current_route()
}
}
pub(in crate::handlers::sonarr_handlers::library) fn releases_sorting_options()
src/handlers/sonarr_handlers/library/series_details_handler.rs
+26 -19
View File
@@ -1,15 +1,15 @@
use crate::app::App;
use crate::event::Key;
use crate::handlers::sonarr_handlers::history::history_sorting_options;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
use crate::handlers::{KeyEventHandler, handle_prompt_toggle};
use crate::matches_key;
use crate::models::BlockSelectionState;
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::network::sonarr_network::SonarrEvent;
use crate::{handle_table_events, matches_key};
#[cfg(test)]
#[path = "series_details_handler_tests.rs"]
@@ -23,20 +23,6 @@ pub(super) struct SeriesDetailsHandler<'a, 'b> {
}
impl SeriesDetailsHandler<'_, '_> {
handle_table_events!(self, season, self.app.data.sonarr_data.seasons, Season);
handle_table_events!(
self,
series_history,
self
.app
.data
.sonarr_data
.series_history
.as_mut()
.expect("Series history is undefined"),
SonarrHistoryItem
);
fn extract_series_id_season_number_tuple(&self) -> (i64, i64) {
let series_id = self.app.data.sonarr_data.series.current_selection().id;
let season_number = self
@@ -78,9 +64,22 @@ 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_config)
&& !self.handle_series_history_table_events(series_history_table_handling_config)
{
if !handle_table(
self,
|app| &mut app.data.sonarr_data.seasons,
season_table_handling_config,
) && !handle_table(
self,
|app| {
app
.data
.sonarr_data
.series_history
.as_mut()
.expect("Series history is undefined")
},
series_history_table_handling_config,
) {
self.handle_key_event();
}
}
@@ -338,4 +337,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
_ => (),
}
}
fn app_mut(&mut self) -> &mut App<'b> {
self.app
}
fn current_route(&self) -> crate::models::Route {
self.app.get_current_route()
}
}