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

src/handlers/sonarr_handlers/blocklist/mod.rs

@@ -1,13 +1,13 @@
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
-use crate::handlers::table_handler::TableHandlingConfig;
+use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
 use crate::handlers::{KeyEventHandler, handle_clear_errors, handle_prompt_toggle};
+use crate::matches_key;
 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::network::sonarr_network::SonarrEvent;
-use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "blocklist_handler_tests.rs"]
@@ -21,13 +21,6 @@ pub(super) struct BlocklistHandler<'a, 'b> {
 }
 
 impl BlocklistHandler<'_, '_> {
-  handle_table_events!(
-    self,
-    blocklist,
-    self.app.data.sonarr_data.blocklist,
-    BlocklistItem
-  );
-
   fn extract_blocklist_item_id(&self) -> i64 {
     self.app.data.sonarr_data.blocklist.current_selection().id
   }
@@ -40,7 +33,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
         .sorting_block(ActiveSonarrBlock::BlocklistSortPrompt.into())
         .sort_options(blocklist_sorting_options());
 
-    if !self.handle_blocklist_table_events(blocklist_table_handling_config) {
+    if !handle_table(
+      self,
+      |app| &mut app.data.sonarr_data.blocklist,
+      blocklist_table_handling_config,
+    ) {
       self.handle_key_event();
     }
   }
@@ -176,6 +173,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a,
       _ => (),
     }
   }
+
+  fn app_mut(&mut self) -> &mut App<'b> {
+    self.app
+  }
+
+  fn current_route(&self) -> crate::models::Route {
+    self.app.get_current_route()
+  }
 }
 
 fn blocklist_sorting_options() -> Vec<SortOption<BlocklistItem>> {

src/handlers/sonarr_handlers/downloads/mod.rs

@@ -1,12 +1,11 @@
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
-use crate::handlers::table_handler::TableHandlingConfig;
+use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
 use crate::handlers::{KeyEventHandler, handle_clear_errors, handle_prompt_toggle};
+use crate::matches_key;
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DOWNLOADS_BLOCKS};
-use crate::models::sonarr_models::DownloadRecord;
 use crate::network::sonarr_network::SonarrEvent;
-use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "downloads_handler_tests.rs"]
@@ -20,13 +19,6 @@ pub(super) struct DownloadsHandler<'a, 'b> {
 }
 
 impl DownloadsHandler<'_, '_> {
-  handle_table_events!(
-    self,
-    downloads,
-    self.app.data.sonarr_data.downloads,
-    DownloadRecord
-  );
-
   fn extract_download_id(&self) -> i64 {
     self.app.data.sonarr_data.downloads.current_selection().id
   }
@@ -37,7 +29,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DownloadsHandler<'a,
     let download_table_handling_config =
       TableHandlingConfig::new(ActiveSonarrBlock::Downloads.into());
 
-    if !self.handle_downloads_table_events(download_table_handling_config) {
+    if !handle_table(
+      self,
+      |app| &mut app.data.sonarr_data.downloads,
+      download_table_handling_config,
+    ) {
       self.handle_key_event();
     }
   }
@@ -163,4 +159,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DownloadsHandler<'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/history/mod.rs

@@ -1,13 +1,13 @@
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
-use crate::handlers::table_handler::TableHandlingConfig;
+use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
 use crate::handlers::{KeyEventHandler, handle_clear_errors};
+use crate::matches_key;
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, HISTORY_BLOCKS};
 use crate::models::servarr_models::Language;
 use crate::models::sonarr_models::SonarrHistoryItem;
 use crate::models::stateful_table::SortOption;
-use crate::{handle_table_events, matches_key};
 
 #[cfg(test)]
 #[path = "history_handler_tests.rs"]
@@ -20,14 +20,7 @@ pub(super) struct HistoryHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl HistoryHandler<'_, '_> {
-  handle_table_events!(
-    self,
-    history,
-    self.app.data.sonarr_data.history,
-    SonarrHistoryItem
-  );
-}
+impl HistoryHandler<'_, '_> {}
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, 'b> {
   fn handle(&mut self) {
@@ -41,7 +34,11 @@ 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_config) {
+    if !handle_table(
+      self,
+      |app| &mut app.data.sonarr_data.history,
+      history_table_handling_config,
+    ) {
       self.handle_key_event();
     }
   }
@@ -119,6 +116,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, '
       }
     }
   }
+
+  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) fn history_sorting_options()

src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs

@@ -521,4 +521,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditIndexerHandler<'
       _ => (),
     }
   }
+
+  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/indexers/edit_indexer_settings_handler.rs

@@ -197,4 +197,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexerSettingsHandl
       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/indexers/mod.rs

@@ -4,16 +4,15 @@ 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::TableHandlingConfig;
+use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
 use crate::handlers::{KeyEventHandler, handle_clear_errors, handle_prompt_toggle};
+use crate::matches_key;
 use crate::models::BlockSelectionState;
 use crate::models::servarr_data::sonarr::sonarr_data::{
   ActiveSonarrBlock, EDIT_INDEXER_NZB_SELECTION_BLOCKS, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS,
   INDEXER_SETTINGS_SELECTION_BLOCKS, INDEXERS_BLOCKS,
 };
-use crate::models::servarr_models::Indexer;
 use crate::network::sonarr_network::SonarrEvent;
-use crate::{handle_table_events, matches_key};
 
 mod edit_indexer_handler;
 mod edit_indexer_settings_handler;
@@ -31,8 +30,6 @@ pub(super) struct IndexersHandler<'a, 'b> {
 }
 
 impl IndexersHandler<'_, '_> {
-  handle_table_events!(self, indexers, self.app.data.sonarr_data.indexers, Indexer);
-
   fn extract_indexer_id(&self) -> i64 {
     self.app.data.sonarr_data.indexers.current_selection().id
   }
@@ -43,7 +40,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexersHandler<'a,
     let indexers_table_handling_config =
       TableHandlingConfig::new(ActiveSonarrBlock::Indexers.into());
 
-    if !self.handle_indexers_table_events(indexers_table_handling_config) {
+    if !handle_table(
+      self,
+      |app| &mut app.data.sonarr_data.indexers,
+      indexers_table_handling_config,
+    ) {
       match self.active_sonarr_block {
         _ if EditIndexerHandler::accepts(self.active_sonarr_block) => {
           EditIndexerHandler::new(self.key, self.app, self.active_sonarr_block, self.context)
@@ -205,4 +206,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexersHandler<'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/indexers/test_all_indexers_handler.rs

@@ -1,9 +1,7 @@
 use crate::app::App;
 use crate::event::Key;
-use crate::handle_table_events;
 use crate::handlers::KeyEventHandler;
-use crate::handlers::table_handler::TableHandlingConfig;
-use crate::models::servarr_data::modals::IndexerTestResultModalItem;
+use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
 use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
 
 #[cfg(test)]
@@ -17,29 +15,25 @@ pub(super) struct TestAllIndexersHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
-impl TestAllIndexersHandler<'_, '_> {
-  handle_table_events!(
-    self,
-    indexer_test_all_results,
-    self
-      .app
-      .data
-      .sonarr_data
-      .indexer_test_all_results
-      .as_mut()
-      .unwrap(),
-    IndexerTestResultModalItem
-  );
-}
+impl TestAllIndexersHandler<'_, '_> {}
 
 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)
-    {
+    if !handle_table(
+      self,
+      |app| {
+        app
+          .data
+          .sonarr_data
+          .indexer_test_all_results
+          .as_mut()
+          .unwrap()
+      },
+      indexer_test_all_results_table_handling_config,
+    ) {
       self.handle_key_event();
     }
   }
@@ -102,4 +96,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for TestAllIndexersHandl
   }
 
   fn handle_char_key_event(&mut self) {}
+
+  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/add_series_handler.rs

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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()
+  }
 }

src/handlers/sonarr_handlers/mod.rs

@@ -110,6 +110,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SonarrHandler<'a, 'b
   fn handle_esc(&mut self) {}
 
   fn handle_char_key_event(&mut self) {}
+
+  fn app_mut(&mut self) -> &mut App<'b> {
+    self.app
+  }
+
+  fn current_route(&self) -> crate::models::Route {
+    self.app.get_current_route()
+  }
 }
 
 pub fn handle_change_tab_left_right_keys(app: &mut App<'_>, key: Key) {

src/handlers/sonarr_handlers/root_folders/mod.rs

@@ -1,15 +1,13 @@
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys;
-use crate::handlers::table_handler::TableHandlingConfig;
+use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
 use crate::handlers::{KeyEventHandler, handle_clear_errors, handle_prompt_toggle};
 use crate::models::HorizontallyScrollableText;
 use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, ROOT_FOLDERS_BLOCKS};
-use crate::models::servarr_models::{AddRootFolderBody, RootFolder};
+use crate::models::servarr_models::AddRootFolderBody;
 use crate::network::sonarr_network::SonarrEvent;
-use crate::{
-  handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, matches_key,
-};
+use crate::{handle_text_box_keys, handle_text_box_left_right_keys, matches_key};
 
 #[cfg(test)]
 #[path = "root_folders_handler_tests.rs"]
@@ -23,13 +21,6 @@ pub(super) struct RootFoldersHandler<'a, 'b> {
 }
 
 impl RootFoldersHandler<'_, '_> {
-  handle_table_events!(
-    self,
-    root_folders,
-    self.app.data.sonarr_data.root_folders,
-    RootFolder
-  );
-
   fn build_add_root_folder_body(&mut self) -> AddRootFolderBody {
     let root_folder = self
       .app
@@ -58,7 +49,11 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<'
     let root_folders_table_handling_config =
       TableHandlingConfig::new(ActiveSonarrBlock::RootFolders.into());
 
-    if !self.handle_root_folders_table_events(root_folders_table_handling_config) {
+    if !handle_table(
+      self,
+      |app| &mut app.data.sonarr_data.root_folders,
+      root_folders_table_handling_config,
+    ) {
       self.handle_key_event();
     }
   }
@@ -229,4 +224,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<'
       _ => (),
     }
   }
+
+  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/system/mod.rs

@@ -124,4 +124,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemHandler<'a, 'b
       }
     }
   }
+
+  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/system/system_details_handler.rs

@@ -196,4 +196,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemDetailsHandler
       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()
+  }
 }