feat(app): Dispatch support for all relevant Sonarr blocks

src/handlers/radarr_handlers/library/add_movie_handler.rs

@@ -12,22 +12,22 @@ use crate::{handle_text_box_keys, handle_text_box_left_right_keys, App, Key};
 mod add_movie_handler_tests;
 
 pub(super) struct AddMovieHandler<'a, 'b> {
-  key: &'a Key,
+  key: Key,
   app: &'a mut App<'b>,
-  active_radarr_block: &'a ActiveRadarrBlock,
-  context: &'a Option<ActiveRadarrBlock>,
+  active_radarr_block: ActiveRadarrBlock,
+  context: Option<ActiveRadarrBlock>,
 }
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a, 'b> {
-  fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
-    ADD_MOVIE_BLOCKS.contains(active_block)
+  fn accepts(active_block: ActiveRadarrBlock) -> bool {
+    ADD_MOVIE_BLOCKS.contains(&active_block)
   }
 
   fn with(
-    key: &'a Key,
+    key: Key,
     app: &'a mut App<'b>,
-    active_block: &'a ActiveRadarrBlock,
-    context: &'a Option<ActiveRadarrBlock>,
+    active_block: ActiveRadarrBlock,
+    context: Option<ActiveRadarrBlock>,
   ) -> AddMovieHandler<'a, 'b> {
     AddMovieHandler {
       key,
@@ -37,7 +37,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
     }
   }
 
-  fn get_key(&self) -> &Key {
+  fn get_key(&self) -> Key {
     self.key
   }
 
@@ -313,7 +313,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
 
   fn handle_submit(&mut self) {
     match self.active_radarr_block {
-      _ if *self.active_radarr_block == ActiveRadarrBlock::AddMovieSearchInput
+      _ if self.active_radarr_block == ActiveRadarrBlock::AddMovieSearchInput
         && !self
           .app
           .data
@@ -329,7 +329,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
           .push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into());
         self.app.should_ignore_quit_key = false;
       }
-      _ if *self.active_radarr_block == ActiveRadarrBlock::AddMovieSearchResults
+      _ if self.active_radarr_block == ActiveRadarrBlock::AddMovieSearchResults
         && self.app.data.radarr_data.add_searched_movies.is_some() =>
       {
         let tmdb_id = self
@@ -377,16 +377,16 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
           | ActiveRadarrBlock::AddMovieSelectQualityProfile
           | ActiveRadarrBlock::AddMovieSelectRootFolder => self.app.push_navigation_stack(
             (
-              *self.app.data.radarr_data.selected_block.get_active_block(),
-              *self.context,
+              self.app.data.radarr_data.selected_block.get_active_block(),
+              self.context,
             )
               .into(),
           ),
           ActiveRadarrBlock::AddMovieTagsInput => {
             self.app.push_navigation_stack(
               (
-                *self.app.data.radarr_data.selected_block.get_active_block(),
-                *self.context,
+                self.app.data.radarr_data.selected_block.get_active_block(),
+                self.context,
               )
                 .into(),
             );
@@ -463,8 +463,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
       }
       ActiveRadarrBlock::AddMoviePrompt => {
         if self.app.data.radarr_data.selected_block.get_active_block()
-          == &ActiveRadarrBlock::AddMovieConfirmPrompt
-          && *key == DEFAULT_KEYBINDINGS.confirm.key
+          == ActiveRadarrBlock::AddMovieConfirmPrompt
+          && key == DEFAULT_KEYBINDINGS.confirm.key
         {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::AddMovie(None));

src/handlers/radarr_handlers/library/add_movie_handler_tests.rs

@@ -39,10 +39,10 @@ mod tests {
       app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
 
       AddMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
@@ -60,10 +60,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
@@ -95,10 +95,10 @@ mod tests {
       app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
 
       AddMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
@@ -116,10 +116,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
@@ -156,10 +156,10 @@ mod tests {
       if key == Key::Up {
         for i in (0..monitor_vec.len()).rev() {
           AddMovieHandler::with(
-            &key,
+            key,
             &mut app,
-            &ActiveRadarrBlock::AddMovieSelectMonitor,
-            &None,
+            ActiveRadarrBlock::AddMovieSelectMonitor,
+            None,
           )
           .handle();
 
@@ -178,10 +178,10 @@ mod tests {
       } else {
         for i in 0..monitor_vec.len() {
           AddMovieHandler::with(
-            &key,
+            key,
             &mut app,
-            &ActiveRadarrBlock::AddMovieSelectMonitor,
-            &None,
+            ActiveRadarrBlock::AddMovieSelectMonitor,
+            None,
           )
           .handle();
 
@@ -219,10 +219,10 @@ mod tests {
       if key == Key::Up {
         for i in (0..minimum_availability_vec.len()).rev() {
           AddMovieHandler::with(
-            &key,
+            key,
             &mut app,
-            &ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
-            &None,
+            ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
+            None,
           )
           .handle();
 
@@ -241,10 +241,10 @@ mod tests {
       } else {
         for i in 0..minimum_availability_vec.len() {
           AddMovieHandler::with(
-            &key,
+            key,
             &mut app,
-            &ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
-            &None,
+            ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
+            None,
           )
           .handle();
 
@@ -279,10 +279,10 @@ mod tests {
         .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]);
 
       AddMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectQualityProfile,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectQualityProfile,
+        None,
       )
       .handle();
 
@@ -299,10 +299,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectQualityProfile,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectQualityProfile,
+        None,
       )
       .handle();
 
@@ -335,10 +335,10 @@ mod tests {
         .set_items(simple_stateful_iterable_vec!(RootFolder, String, path));
 
       AddMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectRootFolder,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectRootFolder,
+        None,
       )
       .handle();
 
@@ -356,10 +356,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectRootFolder,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectRootFolder,
+        None,
       )
       .handle();
 
@@ -383,17 +383,17 @@ mod tests {
       app.data.radarr_data.selected_block = BlockSelectionState::new(&ADD_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.next();
 
-      AddMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::AddMoviePrompt, &None).handle();
+      AddMovieHandler::with(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle();
 
       if key == Key::Up {
         assert_eq!(
           app.data.radarr_data.selected_block.get_active_block(),
-          &ActiveRadarrBlock::AddMovieSelectRootFolder
+          ActiveRadarrBlock::AddMovieSelectRootFolder
         );
       } else {
         assert_eq!(
           app.data.radarr_data.selected_block.get_active_block(),
-          &ActiveRadarrBlock::AddMovieSelectMinimumAvailability
+          ActiveRadarrBlock::AddMovieSelectMinimumAvailability
         );
       }
     }
@@ -405,11 +405,11 @@ mod tests {
       app.data.radarr_data.selected_block = BlockSelectionState::new(&ADD_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.next();
 
-      AddMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::AddMoviePrompt, &None).handle();
+      AddMovieHandler::with(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle();
 
       assert_eq!(
         app.data.radarr_data.selected_block.get_active_block(),
-        &ActiveRadarrBlock::AddMovieSelectMonitor
+        ActiveRadarrBlock::AddMovieSelectMonitor
       );
     }
   }
@@ -436,10 +436,10 @@ mod tests {
       app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
@@ -457,10 +457,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
@@ -490,10 +490,10 @@ mod tests {
       app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
@@ -511,10 +511,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
@@ -547,10 +547,10 @@ mod tests {
         .set_items(monitor_vec.clone());
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectMonitor,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectMonitor,
+        None,
       )
       .handle();
 
@@ -567,10 +567,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectMonitor,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectMonitor,
+        None,
       )
       .handle();
 
@@ -602,10 +602,10 @@ mod tests {
         .set_items(minimum_availability_vec.clone());
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
+        None,
       )
       .handle();
 
@@ -622,10 +622,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
+        None,
       )
       .handle();
 
@@ -660,10 +660,10 @@ mod tests {
         ]);
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectQualityProfile,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectQualityProfile,
+        None,
       )
       .handle();
 
@@ -680,10 +680,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectQualityProfile,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectQualityProfile,
+        None,
       )
       .handle();
 
@@ -714,10 +714,10 @@ mod tests {
         .set_items(extended_stateful_iterable_vec!(RootFolder, String, path));
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectRootFolder,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectRootFolder,
+        None,
       )
       .handle();
 
@@ -735,10 +735,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSelectRootFolder,
-        &None,
+        ActiveRadarrBlock::AddMovieSelectRootFolder,
+        None,
       )
       .handle();
 
@@ -762,10 +762,10 @@ mod tests {
       app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
@@ -782,10 +782,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
@@ -811,10 +811,10 @@ mod tests {
       });
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::AddMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -832,10 +832,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::AddMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -866,11 +866,11 @@ mod tests {
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
       let mut app = App::default();
 
-      AddMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::AddMoviePrompt, &None).handle();
+      AddMovieHandler::with(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
 
-      AddMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::AddMoviePrompt, &None).handle();
+      AddMovieHandler::with(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
     }
@@ -881,10 +881,10 @@ mod tests {
       app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.left.key,
+        DEFAULT_KEYBINDINGS.left.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
@@ -901,10 +901,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.right.key,
+        DEFAULT_KEYBINDINGS.right.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
@@ -930,10 +930,10 @@ mod tests {
       });
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.left.key,
+        DEFAULT_KEYBINDINGS.left.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::AddMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -951,10 +951,10 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.right.key,
+        DEFAULT_KEYBINDINGS.right.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::AddMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -996,17 +996,17 @@ mod tests {
       app.data.radarr_data.add_movie_search = Some("test".into());
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
       assert!(!app.should_ignore_quit_key);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieSearchResults.into()
+        ActiveRadarrBlock::AddMovieSearchResults.into()
       );
     }
 
@@ -1018,17 +1018,17 @@ mod tests {
       app.should_ignore_quit_key = true;
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
       assert!(app.should_ignore_quit_key);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieSearchInput.into()
+        ActiveRadarrBlock::AddMovieSearchInput.into()
       );
     }
 
@@ -1042,20 +1042,20 @@ mod tests {
         BiMap::from_iter([(1, "B - Test 2".to_owned()), (0, "A - Test 1".to_owned())]);
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMoviePrompt.into()
+        ActiveRadarrBlock::AddMoviePrompt.into()
       );
       assert_eq!(
         app.data.radarr_data.selected_block.get_active_block(),
-        &ActiveRadarrBlock::AddMovieSelectRootFolder
+        ActiveRadarrBlock::AddMovieSelectRootFolder
       );
       assert!(app.data.radarr_data.add_movie_modal.is_some());
       assert!(!app
@@ -1107,16 +1107,16 @@ mod tests {
       add_searched_movies.set_items(vec![AddMovieSearchResult::default()]);
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieSearchResults.into()
+        ActiveRadarrBlock::AddMovieSearchResults.into()
       );
       assert!(app.data.radarr_data.add_movie_modal.is_none());
     }
@@ -1126,16 +1126,16 @@ mod tests {
       let mut app = App::default();
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into());
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieSearchResults.into()
+        ActiveRadarrBlock::AddMovieSearchResults.into()
       );
     }
 
@@ -1152,16 +1152,16 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchResults,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchResults,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieAlreadyInLibrary.into()
+        ActiveRadarrBlock::AddMovieAlreadyInLibrary.into()
       );
     }
 
@@ -1178,14 +1178,14 @@ mod tests {
         .set_index(ADD_MOVIE_SELECTION_BLOCKS.len() - 1);
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMoviePrompt,
-        &None,
+        ActiveRadarrBlock::AddMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
     }
 
@@ -1204,14 +1204,14 @@ mod tests {
         .set_index(ADD_MOVIE_SELECTION_BLOCKS.len() - 1);
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMoviePrompt,
-        &None,
+        ActiveRadarrBlock::AddMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::AddMovie(None))
@@ -1241,16 +1241,16 @@ mod tests {
       app.data.radarr_data.selected_block.set_index(index);
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMoviePrompt,
-        &Some(ActiveRadarrBlock::CollectionDetails),
+        ActiveRadarrBlock::AddMoviePrompt,
+        Some(ActiveRadarrBlock::CollectionDetails),
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &(selected_block, Some(ActiveRadarrBlock::CollectionDetails)).into()
+        (selected_block, Some(ActiveRadarrBlock::CollectionDetails)).into()
       );
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
 
@@ -1275,16 +1275,16 @@ mod tests {
       app.push_navigation_stack(active_radarr_block.into());
 
       AddMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &active_radarr_block,
-        &Some(ActiveRadarrBlock::CollectionDetails),
+        active_radarr_block,
+        Some(ActiveRadarrBlock::CollectionDetails),
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMoviePrompt.into()
+        ActiveRadarrBlock::AddMoviePrompt.into()
       );
 
       if active_radarr_block == ActiveRadarrBlock::AddMovieTagsInput {
@@ -1315,15 +1315,15 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
 
       AddMovieHandler::with(
-        &ESC_KEY,
+        ESC_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
       assert!(!app.should_ignore_quit_key);
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(app.data.radarr_data.add_movie_search, None);
     }
 
@@ -1336,17 +1336,17 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieTagsInput.into());
 
       AddMovieHandler::with(
-        &ESC_KEY,
+        ESC_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::AddMovieTagsInput,
+        None,
       )
       .handle();
 
       assert!(!app.should_ignore_quit_key);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMoviePrompt.into()
+        ActiveRadarrBlock::AddMoviePrompt.into()
       );
     }
 
@@ -1368,11 +1368,11 @@ mod tests {
       ));
       app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
 
-      AddMovieHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
+      AddMovieHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieSearchInput.into()
+        ActiveRadarrBlock::AddMovieSearchInput.into()
       );
       assert!(app.data.radarr_data.add_searched_movies.is_none());
       assert!(app.should_ignore_quit_key);
@@ -1386,16 +1386,16 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieAlreadyInLibrary.into());
 
       AddMovieHandler::with(
-        &ESC_KEY,
+        ESC_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieAlreadyInLibrary,
-        &None,
+        ActiveRadarrBlock::AddMovieAlreadyInLibrary,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieSearchResults.into()
+        ActiveRadarrBlock::AddMovieSearchResults.into()
       );
     }
 
@@ -1407,18 +1407,12 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into());
       app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
 
-      AddMovieHandler::with(
-        &ESC_KEY,
-        &mut app,
-        &ActiveRadarrBlock::AddMoviePrompt,
-        &None,
-      )
-      .handle();
+      AddMovieHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieSearchResults.into()
+        ActiveRadarrBlock::AddMovieSearchResults.into()
       );
       assert!(app.data.radarr_data.add_movie_modal.is_none());
     }
@@ -1432,17 +1426,17 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::AddMovieTagsInput.into());
 
       AddMovieHandler::with(
-        &ESC_KEY,
+        ESC_KEY,
         &mut app,
-        &ActiveRadarrBlock::AddMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::AddMovieTagsInput,
+        None,
       )
       .handle();
 
       assert!(!app.should_ignore_quit_key);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMoviePrompt.into()
+        ActiveRadarrBlock::AddMoviePrompt.into()
       );
     }
 
@@ -1473,16 +1467,16 @@ mod tests {
       );
 
       AddMovieHandler::with(
-        &ESC_KEY,
+        ESC_KEY,
         &mut app,
-        &active_radarr_block,
-        &Some(ActiveRadarrBlock::CollectionDetails),
+        active_radarr_block,
+        Some(ActiveRadarrBlock::CollectionDetails),
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &(
+        (
           ActiveRadarrBlock::AddMoviePrompt,
           Some(ActiveRadarrBlock::CollectionDetails),
         )
@@ -1507,10 +1501,10 @@ mod tests {
       app.data.radarr_data.add_movie_search = Some("Test".into());
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.backspace.key,
+        DEFAULT_KEYBINDINGS.backspace.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
@@ -1529,10 +1523,10 @@ mod tests {
       });
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.backspace.key,
+        DEFAULT_KEYBINDINGS.backspace.key,
         &mut app,
-        &ActiveRadarrBlock::AddMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::AddMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -1555,10 +1549,10 @@ mod tests {
       app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
 
       AddMovieHandler::with(
-        &Key::Char('h'),
+        Key::Char('h'),
         &mut app,
-        &ActiveRadarrBlock::AddMovieSearchInput,
-        &None,
+        ActiveRadarrBlock::AddMovieSearchInput,
+        None,
       )
       .handle();
 
@@ -1574,10 +1568,10 @@ mod tests {
       app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default());
 
       AddMovieHandler::with(
-        &Key::Char('h'),
+        Key::Char('h'),
         &mut app,
-        &ActiveRadarrBlock::AddMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::AddMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -1608,14 +1602,14 @@ mod tests {
         .set_index(ADD_MOVIE_SELECTION_BLOCKS.len() - 1);
 
       AddMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.confirm.key,
+        DEFAULT_KEYBINDINGS.confirm.key,
         &mut app,
-        &ActiveRadarrBlock::AddMoviePrompt,
-        &None,
+        ActiveRadarrBlock::AddMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::AddMovie(None))
@@ -1628,9 +1622,9 @@ mod tests {
   fn test_add_movie_handler_accepts() {
     ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
       if ADD_MOVIE_BLOCKS.contains(&active_radarr_block) {
-        assert!(AddMovieHandler::accepts(&active_radarr_block));
+        assert!(AddMovieHandler::accepts(active_radarr_block));
       } else {
-        assert!(!AddMovieHandler::accepts(&active_radarr_block));
+        assert!(!AddMovieHandler::accepts(active_radarr_block));
       }
     });
   }
@@ -1641,10 +1635,10 @@ mod tests {
     app.is_loading = true;
 
     let handler = AddMovieHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::AddMoviePrompt,
-      &None,
+      ActiveRadarrBlock::AddMoviePrompt,
+      None,
     );
 
     assert!(!handler.is_ready());
@@ -1656,10 +1650,10 @@ mod tests {
     app.is_loading = false;
 
     let handler = AddMovieHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::AddMoviePrompt,
-      &None,
+      ActiveRadarrBlock::AddMoviePrompt,
+      None,
     );
 
     assert!(handler.is_ready());

src/handlers/radarr_handlers/library/delete_movie_handler.rs

@@ -10,22 +10,22 @@ use crate::network::radarr_network::RadarrEvent;
 mod delete_movie_handler_tests;
 
 pub(super) struct DeleteMovieHandler<'a, 'b> {
-  key: &'a Key,
+  key: Key,
   app: &'a mut App<'b>,
-  active_radarr_block: &'a ActiveRadarrBlock,
-  _context: &'a Option<ActiveRadarrBlock>,
+  active_radarr_block: ActiveRadarrBlock,
+  _context: Option<ActiveRadarrBlock>,
 }
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'a, 'b> {
-  fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
-    DELETE_MOVIE_BLOCKS.contains(active_block)
+  fn accepts(active_block: ActiveRadarrBlock) -> bool {
+    DELETE_MOVIE_BLOCKS.contains(&active_block)
   }
 
   fn with(
-    key: &'a Key,
+    key: Key,
     app: &'a mut App<'b>,
-    active_block: &'a ActiveRadarrBlock,
-    _context: &'a Option<ActiveRadarrBlock>,
+    active_block: ActiveRadarrBlock,
+    _context: Option<ActiveRadarrBlock>,
   ) -> Self {
     DeleteMovieHandler {
       key,
@@ -35,7 +35,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
     }
   }
 
-  fn get_key(&self) -> &Key {
+  fn get_key(&self) -> Key {
     self.key
   }
 
@@ -44,13 +44,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
   }
 
   fn handle_scroll_up(&mut self) {
-    if *self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
+    if self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
       self.app.data.radarr_data.selected_block.previous();
     }
   }
 
   fn handle_scroll_down(&mut self) {
-    if *self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
+    if self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
       self.app.data.radarr_data.selected_block.next();
     }
   }
@@ -62,13 +62,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
   fn handle_delete(&mut self) {}
 
   fn handle_left_right_action(&mut self) {
-    if *self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
+    if self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
       handle_prompt_toggle(self.app, self.key);
     }
   }
 
   fn handle_submit(&mut self) {
-    if self.active_radarr_block == &ActiveRadarrBlock::DeleteMoviePrompt {
+    if self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
       match self.app.data.radarr_data.selected_block.get_active_block() {
         ActiveRadarrBlock::DeleteMovieConfirmPrompt => {
           if self.app.data.radarr_data.prompt_confirm {
@@ -94,7 +94,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
   }
 
   fn handle_esc(&mut self) {
-    if *self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
+    if self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt {
       self.app.pop_navigation_stack();
       self.app.data.radarr_data.reset_delete_movie_preferences();
       self.app.data.radarr_data.prompt_confirm = false;
@@ -102,10 +102,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
   }
 
   fn handle_char_key_event(&mut self) {
-    if self.active_radarr_block == &ActiveRadarrBlock::DeleteMoviePrompt
+    if self.active_radarr_block == ActiveRadarrBlock::DeleteMoviePrompt
       && self.app.data.radarr_data.selected_block.get_active_block()
-        == &ActiveRadarrBlock::DeleteMovieConfirmPrompt
-      && *self.key == DEFAULT_KEYBINDINGS.confirm.key
+        == ActiveRadarrBlock::DeleteMovieConfirmPrompt
+      && self.key == DEFAULT_KEYBINDINGS.confirm.key
     {
       self.app.data.radarr_data.prompt_confirm = true;
       self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteMovie(None));

src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs

@@ -25,18 +25,17 @@ mod tests {
         BlockSelectionState::new(&DELETE_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.next();
 
-      DeleteMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::DeleteMoviePrompt, &None)
-        .handle();
+      DeleteMovieHandler::with(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle();
 
       if key == Key::Up {
         assert_eq!(
           app.data.radarr_data.selected_block.get_active_block(),
-          &ActiveRadarrBlock::DeleteMovieToggleDeleteFile
+          ActiveRadarrBlock::DeleteMovieToggleDeleteFile
         );
       } else {
         assert_eq!(
           app.data.radarr_data.selected_block.get_active_block(),
-          &ActiveRadarrBlock::DeleteMovieConfirmPrompt
+          ActiveRadarrBlock::DeleteMovieConfirmPrompt
         );
       }
     }
@@ -51,12 +50,11 @@ mod tests {
         BlockSelectionState::new(&DELETE_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.next();
 
-      DeleteMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::DeleteMoviePrompt, &None)
-        .handle();
+      DeleteMovieHandler::with(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle();
 
       assert_eq!(
         app.data.radarr_data.selected_block.get_active_block(),
-        &ActiveRadarrBlock::DeleteMovieToggleAddListExclusion
+        ActiveRadarrBlock::DeleteMovieToggleAddListExclusion
       );
     }
   }
@@ -70,13 +68,11 @@ mod tests {
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
       let mut app = App::default();
 
-      DeleteMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::DeleteMoviePrompt, &None)
-        .handle();
+      DeleteMovieHandler::with(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
 
-      DeleteMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::DeleteMoviePrompt, &None)
-        .handle();
+      DeleteMovieHandler::with(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
     }
@@ -109,14 +105,14 @@ mod tests {
       app.data.radarr_data.add_list_exclusion = true;
 
       DeleteMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::DeleteMoviePrompt,
-        &None,
+        ActiveRadarrBlock::DeleteMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
       assert!(!app.data.radarr_data.prompt_confirm);
       assert!(!app.data.radarr_data.delete_movie_files);
@@ -140,14 +136,14 @@ mod tests {
         .set_index(DELETE_MOVIE_SELECTION_BLOCKS.len() - 1);
 
       DeleteMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::DeleteMoviePrompt,
-        &None,
+        ActiveRadarrBlock::DeleteMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::DeleteMovie(None))
@@ -169,16 +165,16 @@ mod tests {
       app.data.radarr_data.add_list_exclusion = true;
 
       DeleteMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::DeleteMoviePrompt,
-        &None,
+        ActiveRadarrBlock::DeleteMoviePrompt,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::DeleteMoviePrompt.into()
+        ActiveRadarrBlock::DeleteMoviePrompt.into()
       );
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
       assert!(!app.should_refresh);
@@ -196,25 +192,25 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into());
 
       DeleteMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::DeleteMoviePrompt,
-        &None,
+        ActiveRadarrBlock::DeleteMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &current_route);
+      assert_eq!(app.get_current_route(), current_route);
       assert_eq!(app.data.radarr_data.delete_movie_files, true);
 
       DeleteMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::DeleteMoviePrompt,
-        &None,
+        ActiveRadarrBlock::DeleteMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &current_route);
+      assert_eq!(app.get_current_route(), current_route);
       assert_eq!(app.data.radarr_data.delete_movie_files, false);
     }
   }
@@ -236,14 +232,14 @@ mod tests {
       app.data.radarr_data.add_list_exclusion = true;
 
       DeleteMovieHandler::with(
-        &ESC_KEY,
+        ESC_KEY,
         &mut app,
-        &ActiveRadarrBlock::DeleteMoviePrompt,
-        &None,
+        ActiveRadarrBlock::DeleteMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(!app.data.radarr_data.prompt_confirm);
       assert!(!app.data.radarr_data.delete_movie_files);
       assert!(!app.data.radarr_data.add_list_exclusion);
@@ -276,14 +272,14 @@ mod tests {
         .set_index(DELETE_MOVIE_SELECTION_BLOCKS.len() - 1);
 
       DeleteMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.confirm.key,
+        DEFAULT_KEYBINDINGS.confirm.key,
         &mut app,
-        &ActiveRadarrBlock::DeleteMoviePrompt,
-        &None,
+        ActiveRadarrBlock::DeleteMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::DeleteMovie(None))
@@ -299,9 +295,9 @@ mod tests {
   fn test_delete_movie_handler_accepts() {
     ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
       if DELETE_MOVIE_BLOCKS.contains(&active_radarr_block) {
-        assert!(DeleteMovieHandler::accepts(&active_radarr_block));
+        assert!(DeleteMovieHandler::accepts(active_radarr_block));
       } else {
-        assert!(!DeleteMovieHandler::accepts(&active_radarr_block));
+        assert!(!DeleteMovieHandler::accepts(active_radarr_block));
       }
     });
   }
@@ -312,10 +308,10 @@ mod tests {
     app.is_loading = true;
 
     let handler = DeleteMovieHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::DeleteMoviePrompt,
-      &None,
+      ActiveRadarrBlock::DeleteMoviePrompt,
+      None,
     );
 
     assert!(!handler.is_ready());
@@ -327,10 +323,10 @@ mod tests {
     app.is_loading = false;
 
     let handler = DeleteMovieHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::DeleteMoviePrompt,
-      &None,
+      ActiveRadarrBlock::DeleteMoviePrompt,
+      None,
     );
 
     assert!(handler.is_ready());

src/handlers/radarr_handlers/library/edit_movie_handler.rs

@@ -12,22 +12,22 @@ use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
 mod edit_movie_handler_tests;
 
 pub(super) struct EditMovieHandler<'a, 'b> {
-  key: &'a Key,
+  key: Key,
   app: &'a mut App<'b>,
-  active_radarr_block: &'a ActiveRadarrBlock,
-  context: &'a Option<ActiveRadarrBlock>,
+  active_radarr_block: ActiveRadarrBlock,
+  context: Option<ActiveRadarrBlock>,
 }
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a, 'b> {
-  fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
-    EDIT_MOVIE_BLOCKS.contains(active_block)
+  fn accepts(active_block: ActiveRadarrBlock) -> bool {
+    EDIT_MOVIE_BLOCKS.contains(&active_block)
   }
 
   fn with(
-    key: &'a Key,
+    key: Key,
     app: &'a mut App<'b>,
-    active_block: &'a ActiveRadarrBlock,
-    context: &'a Option<ActiveRadarrBlock>,
+    active_block: ActiveRadarrBlock,
+    context: Option<ActiveRadarrBlock>,
   ) -> EditMovieHandler<'a, 'b> {
     EditMovieHandler {
       key,
@@ -37,7 +37,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a,
     }
   }
 
-  fn get_key(&self) -> &Key {
+  fn get_key(&self) -> Key {
     self.key
   }
 
@@ -231,16 +231,16 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a,
           ActiveRadarrBlock::EditMovieSelectMinimumAvailability
           | ActiveRadarrBlock::EditMovieSelectQualityProfile => self.app.push_navigation_stack(
             (
-              *self.app.data.radarr_data.selected_block.get_active_block(),
-              *self.context,
+              self.app.data.radarr_data.selected_block.get_active_block(),
+              self.context,
             )
               .into(),
           ),
           ActiveRadarrBlock::EditMoviePathInput | ActiveRadarrBlock::EditMovieTagsInput => {
             self.app.push_navigation_stack(
               (
-                *self.app.data.radarr_data.selected_block.get_active_block(),
-                *self.context,
+                self.app.data.radarr_data.selected_block.get_active_block(),
+                self.context,
               )
                 .into(),
             );
@@ -329,8 +329,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a,
       }
       ActiveRadarrBlock::EditMoviePrompt => {
         if self.app.data.radarr_data.selected_block.get_active_block()
-          == &ActiveRadarrBlock::EditMovieConfirmPrompt
-          && *key == DEFAULT_KEYBINDINGS.confirm.key
+          == ActiveRadarrBlock::EditMovieConfirmPrompt
+          && key == DEFAULT_KEYBINDINGS.confirm.key
         {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::EditMovie(None));

src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs

@@ -42,10 +42,10 @@ mod tests {
       if key == Key::Up {
         for i in (0..minimum_availability_vec.len()).rev() {
           EditMovieHandler::with(
-            &key,
+            key,
             &mut app,
-            &ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
-            &None,
+            ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
+            None,
           )
           .handle();
 
@@ -64,10 +64,10 @@ mod tests {
       } else {
         for i in 0..minimum_availability_vec.len() {
           EditMovieHandler::with(
-            &key,
+            key,
             &mut app,
-            &ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
-            &None,
+            ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
+            None,
           )
           .handle();
 
@@ -102,10 +102,10 @@ mod tests {
         .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]);
 
       EditMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieSelectQualityProfile,
-        &None,
+        ActiveRadarrBlock::EditMovieSelectQualityProfile,
+        None,
       )
       .handle();
 
@@ -122,10 +122,10 @@ mod tests {
       );
 
       EditMovieHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieSelectQualityProfile,
-        &None,
+        ActiveRadarrBlock::EditMovieSelectQualityProfile,
+        None,
       )
       .handle();
 
@@ -149,17 +149,17 @@ mod tests {
       app.data.radarr_data.selected_block = BlockSelectionState::new(&EDIT_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.next();
 
-      EditMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::EditMoviePrompt, &None).handle();
+      EditMovieHandler::with(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle();
 
       if key == Key::Up {
         assert_eq!(
           app.data.radarr_data.selected_block.get_active_block(),
-          &ActiveRadarrBlock::EditMovieToggleMonitored
+          ActiveRadarrBlock::EditMovieToggleMonitored
         );
       } else {
         assert_eq!(
           app.data.radarr_data.selected_block.get_active_block(),
-          &ActiveRadarrBlock::EditMovieSelectQualityProfile
+          ActiveRadarrBlock::EditMovieSelectQualityProfile
         );
       }
     }
@@ -172,11 +172,11 @@ mod tests {
       app.data.radarr_data.selected_block = BlockSelectionState::new(&EDIT_MOVIE_SELECTION_BLOCKS);
       app.data.radarr_data.selected_block.next();
 
-      EditMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::EditMoviePrompt, &None).handle();
+      EditMovieHandler::with(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle();
 
       assert_eq!(
         app.data.radarr_data.selected_block.get_active_block(),
-        &ActiveRadarrBlock::EditMovieSelectMinimumAvailability
+        ActiveRadarrBlock::EditMovieSelectMinimumAvailability
       );
     }
   }
@@ -205,10 +205,10 @@ mod tests {
         .set_items(minimum_availability_vec.clone());
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
-        &None,
+        ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
+        None,
       )
       .handle();
 
@@ -225,10 +225,10 @@ mod tests {
       );
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
-        &None,
+        ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
+        None,
       )
       .handle();
 
@@ -263,10 +263,10 @@ mod tests {
         ]);
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieSelectQualityProfile,
-        &None,
+        ActiveRadarrBlock::EditMovieSelectQualityProfile,
+        None,
       )
       .handle();
 
@@ -283,10 +283,10 @@ mod tests {
       );
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieSelectQualityProfile,
-        &None,
+        ActiveRadarrBlock::EditMovieSelectQualityProfile,
+        None,
       )
       .handle();
 
@@ -312,10 +312,10 @@ mod tests {
       });
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePathInput,
-        &None,
+        ActiveRadarrBlock::EditMoviePathInput,
+        None,
       )
       .handle();
 
@@ -333,10 +333,10 @@ mod tests {
       );
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePathInput,
-        &None,
+        ActiveRadarrBlock::EditMoviePathInput,
+        None,
       )
       .handle();
 
@@ -363,10 +363,10 @@ mod tests {
       });
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::EditMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -384,10 +384,10 @@ mod tests {
       );
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::EditMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -418,11 +418,11 @@ mod tests {
     fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
       let mut app = App::default();
 
-      EditMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::EditMoviePrompt, &None).handle();
+      EditMovieHandler::with(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
 
-      EditMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::EditMoviePrompt, &None).handle();
+      EditMovieHandler::with(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
     }
@@ -436,10 +436,10 @@ mod tests {
       });
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.left.key,
+        DEFAULT_KEYBINDINGS.left.key,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePathInput,
-        &None,
+        ActiveRadarrBlock::EditMoviePathInput,
+        None,
       )
       .handle();
 
@@ -457,10 +457,10 @@ mod tests {
       );
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.right.key,
+        DEFAULT_KEYBINDINGS.right.key,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePathInput,
-        &None,
+        ActiveRadarrBlock::EditMoviePathInput,
+        None,
       )
       .handle();
 
@@ -487,10 +487,10 @@ mod tests {
       });
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.left.key,
+        DEFAULT_KEYBINDINGS.left.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::EditMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -508,10 +508,10 @@ mod tests {
       );
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.right.key,
+        DEFAULT_KEYBINDINGS.right.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::EditMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -557,10 +557,10 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::EditMoviePathInput.into());
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePathInput,
-        &None,
+        ActiveRadarrBlock::EditMoviePathInput,
+        None,
       )
       .handle();
 
@@ -576,7 +576,7 @@ mod tests {
         .is_empty());
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::EditMoviePrompt.into()
+        ActiveRadarrBlock::EditMoviePrompt.into()
       );
     }
 
@@ -592,10 +592,10 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::EditMoviePathInput.into());
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::EditMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -611,7 +611,7 @@ mod tests {
         .is_empty());
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::EditMoviePrompt.into()
+        ActiveRadarrBlock::EditMoviePrompt.into()
       );
     }
 
@@ -629,14 +629,14 @@ mod tests {
         .set_index(EDIT_COLLECTION_SELECTION_BLOCKS.len() - 1);
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &None,
+        ActiveRadarrBlock::EditMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
     }
 
@@ -655,14 +655,14 @@ mod tests {
         .set_index(EDIT_COLLECTION_SELECTION_BLOCKS.len() - 1);
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &None,
+        ActiveRadarrBlock::EditMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::EditMovie(None))
@@ -681,16 +681,16 @@ mod tests {
       app.data.radarr_data.prompt_confirm = true;
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &None,
+        ActiveRadarrBlock::EditMoviePrompt,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::EditMoviePrompt.into()
+        ActiveRadarrBlock::EditMoviePrompt.into()
       );
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
       assert!(!app.should_refresh);
@@ -708,14 +708,14 @@ mod tests {
       app.push_navigation_stack(current_route);
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &Some(ActiveRadarrBlock::Movies),
+        ActiveRadarrBlock::EditMoviePrompt,
+        Some(ActiveRadarrBlock::Movies),
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &current_route);
+      assert_eq!(app.get_current_route(), current_route);
       assert_eq!(
         app
           .data
@@ -728,14 +728,14 @@ mod tests {
       );
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &Some(ActiveRadarrBlock::Movies),
+        ActiveRadarrBlock::EditMoviePrompt,
+        Some(ActiveRadarrBlock::Movies),
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &current_route);
+      assert_eq!(app.get_current_route(), current_route);
       assert_eq!(
         app
           .data
@@ -770,16 +770,16 @@ mod tests {
       app.data.radarr_data.selected_block.set_index(index);
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &Some(ActiveRadarrBlock::Movies),
+        ActiveRadarrBlock::EditMoviePrompt,
+        Some(ActiveRadarrBlock::Movies),
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &(selected_block, Some(ActiveRadarrBlock::Movies)).into()
+        (selected_block, Some(ActiveRadarrBlock::Movies)).into()
       );
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
 
@@ -808,16 +808,16 @@ mod tests {
       app.data.radarr_data.selected_block.set_index(index);
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &Some(ActiveRadarrBlock::Movies),
+        ActiveRadarrBlock::EditMoviePrompt,
+        Some(ActiveRadarrBlock::Movies),
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &(
+        (
           ActiveRadarrBlock::EditMoviePrompt,
           Some(ActiveRadarrBlock::Movies),
         )
@@ -843,16 +843,16 @@ mod tests {
       app.push_navigation_stack(active_radarr_block.into());
 
       EditMovieHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &active_radarr_block,
-        &Some(ActiveRadarrBlock::Movies),
+        active_radarr_block,
+        Some(ActiveRadarrBlock::Movies),
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::EditMoviePrompt.into()
+        ActiveRadarrBlock::EditMoviePrompt.into()
       );
 
       if active_radarr_block == ActiveRadarrBlock::EditMoviePathInput
@@ -888,12 +888,12 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
       app.push_navigation_stack(active_radarr_block.into());
 
-      EditMovieHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
+      EditMovieHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
       assert!(!app.should_ignore_quit_key);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::EditMoviePrompt.into()
+        ActiveRadarrBlock::EditMoviePrompt.into()
       );
     }
 
@@ -904,15 +904,9 @@ mod tests {
       app.data.radarr_data = create_test_radarr_data();
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
-      EditMovieHandler::with(
-        &ESC_KEY,
-        &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &None,
-      )
-      .handle();
+      EditMovieHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
 
       assert!(app.data.radarr_data.edit_movie_modal.is_none());
       assert!(!app.data.radarr_data.prompt_confirm);
@@ -932,9 +926,9 @@ mod tests {
       app.data.radarr_data = create_test_radarr_data();
       app.push_navigation_stack(active_radarr_block.into());
 
-      EditMovieHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
+      EditMovieHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
   }
 
@@ -960,10 +954,10 @@ mod tests {
       });
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.backspace.key,
+        DEFAULT_KEYBINDINGS.backspace.key,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePathInput,
-        &None,
+        ActiveRadarrBlock::EditMoviePathInput,
+        None,
       )
       .handle();
 
@@ -989,10 +983,10 @@ mod tests {
       });
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.backspace.key,
+        DEFAULT_KEYBINDINGS.backspace.key,
         &mut app,
-        &ActiveRadarrBlock::EditMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::EditMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -1015,10 +1009,10 @@ mod tests {
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
       EditMovieHandler::with(
-        &Key::Char('h'),
+        Key::Char('h'),
         &mut app,
-        &ActiveRadarrBlock::EditMoviePathInput,
-        &None,
+        ActiveRadarrBlock::EditMoviePathInput,
+        None,
       )
       .handle();
 
@@ -1041,10 +1035,10 @@ mod tests {
       app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
       EditMovieHandler::with(
-        &Key::Char('h'),
+        Key::Char('h'),
         &mut app,
-        &ActiveRadarrBlock::EditMovieTagsInput,
-        &None,
+        ActiveRadarrBlock::EditMovieTagsInput,
+        None,
       )
       .handle();
 
@@ -1075,14 +1069,14 @@ mod tests {
         .set_index(EDIT_COLLECTION_SELECTION_BLOCKS.len() - 1);
 
       EditMovieHandler::with(
-        &DEFAULT_KEYBINDINGS.confirm.key,
+        DEFAULT_KEYBINDINGS.confirm.key,
         &mut app,
-        &ActiveRadarrBlock::EditMoviePrompt,
-        &None,
+        ActiveRadarrBlock::EditMoviePrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::EditMovie(None))
@@ -1096,9 +1090,9 @@ mod tests {
   fn test_edit_movie_handler_accepts() {
     ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
       if EDIT_MOVIE_BLOCKS.contains(&active_radarr_block) {
-        assert!(EditMovieHandler::accepts(&active_radarr_block));
+        assert!(EditMovieHandler::accepts(active_radarr_block));
       } else {
-        assert!(!EditMovieHandler::accepts(&active_radarr_block));
+        assert!(!EditMovieHandler::accepts(active_radarr_block));
       }
     });
   }
@@ -1109,10 +1103,10 @@ mod tests {
     app.is_loading = true;
 
     let handler = EditMovieHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::EditMoviePrompt,
-      &None,
+      ActiveRadarrBlock::EditMoviePrompt,
+      None,
     );
 
     assert!(!handler.is_ready());
@@ -1124,10 +1118,10 @@ mod tests {
     app.is_loading = false;
 
     let handler = EditMovieHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::EditMoviePrompt,
-      &None,
+      ActiveRadarrBlock::EditMoviePrompt,
+      None,
     );
 
     assert!(!handler.is_ready());
@@ -1140,10 +1134,10 @@ mod tests {
     app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default());
 
     let handler = EditMovieHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::EditMoviePrompt,
-      &None,
+      ActiveRadarrBlock::EditMoviePrompt,
+      None,
     );
 
     assert!(handler.is_ready());

src/handlers/radarr_handlers/library/library_handler_tests.rs

@@ -53,7 +53,7 @@ mod tests {
           HorizontallyScrollableText
         ));
 
-      LibraryHandler::with(&key, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
+      LibraryHandler::with(key, &mut app, ActiveRadarrBlock::Movies, None).handle();
 
       assert_str_eq!(
         app
@@ -66,7 +66,7 @@ mod tests {
         "Test 1"
       );
 
-      LibraryHandler::with(&key, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
+      LibraryHandler::with(key, &mut app, ActiveRadarrBlock::Movies, None).handle();
 
       assert_str_eq!(
         app
@@ -90,8 +90,7 @@ mod tests {
 
       if key == Key::Up {
         for i in (0..movie_field_vec.len()).rev() {
-          LibraryHandler::with(&key, &mut app, &ActiveRadarrBlock::MoviesSortPrompt, &None)
-            .handle();
+          LibraryHandler::with(key, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle();
 
           assert_eq!(
             app
@@ -107,8 +106,7 @@ mod tests {
         }
       } else {
         for i in 0..movie_field_vec.len() {
-          LibraryHandler::with(&key, &mut app, &ActiveRadarrBlock::MoviesSortPrompt, &None)
-            .handle();
+          LibraryHandler::with(key, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle();
 
           assert_eq!(
             app
@@ -158,10 +156,10 @@ mod tests {
         ));
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
@@ -177,10 +175,10 @@ mod tests {
       );
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
@@ -207,10 +205,10 @@ mod tests {
       app.data.radarr_data.movies.search = Some("Test".into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
+        ActiveRadarrBlock::SearchMovie,
+        None,
       )
       .handle();
 
@@ -228,10 +226,10 @@ mod tests {
       );
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
+        ActiveRadarrBlock::SearchMovie,
+        None,
       )
       .handle();
 
@@ -260,10 +258,10 @@ mod tests {
       app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::FilterMovies,
-        &None,
+        ActiveRadarrBlock::FilterMovies,
+        None,
       )
       .handle();
 
@@ -281,10 +279,10 @@ mod tests {
       );
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::FilterMovies,
-        &None,
+        ActiveRadarrBlock::FilterMovies,
+        None,
       )
       .handle();
 
@@ -309,10 +307,10 @@ mod tests {
       app.data.radarr_data.movies.sorting(sort_options());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::MoviesSortPrompt,
-        &None,
+        ActiveRadarrBlock::MoviesSortPrompt,
+        None,
       )
       .handle();
 
@@ -329,10 +327,10 @@ mod tests {
       );
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::MoviesSortPrompt,
-        &None,
+        ActiveRadarrBlock::MoviesSortPrompt,
+        None,
       )
       .handle();
 
@@ -392,9 +390,9 @@ mod tests {
         .movies
         .set_items(vec![Movie::default()]);
 
-      LibraryHandler::with(&DELETE_KEY, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
+      LibraryHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
   }
 
@@ -411,18 +409,18 @@ mod tests {
       app.data.radarr_data.main_tabs.set_index(0);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.left.key,
+        DEFAULT_KEYBINDINGS.left.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.data.radarr_data.main_tabs.get_active_route(),
-        &ActiveRadarrBlock::System.into()
+        ActiveRadarrBlock::System.into()
       );
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::System.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into());
     }
 
     #[rstest]
@@ -432,20 +430,20 @@ mod tests {
       app.data.radarr_data.main_tabs.set_index(0);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.right.key,
+        DEFAULT_KEYBINDINGS.right.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.data.radarr_data.main_tabs.get_active_route(),
-        &ActiveRadarrBlock::Collections.into()
+        ActiveRadarrBlock::Collections.into()
       );
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::Collections.into()
+        ActiveRadarrBlock::Collections.into()
       );
     }
 
@@ -456,20 +454,20 @@ mod tests {
       let mut app = App::default();
 
       LibraryHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::UpdateAllMoviesPrompt,
-        &None,
+        ActiveRadarrBlock::UpdateAllMoviesPrompt,
+        None,
       )
       .handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
 
       LibraryHandler::with(
-        &key,
+        key,
         &mut app,
-        &ActiveRadarrBlock::UpdateAllMoviesPrompt,
-        &None,
+        ActiveRadarrBlock::UpdateAllMoviesPrompt,
+        None,
       )
       .handle();
 
@@ -482,10 +480,10 @@ mod tests {
       app.data.radarr_data.movies.search = Some("Test".into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.left.key,
+        DEFAULT_KEYBINDINGS.left.key,
         &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
+        ActiveRadarrBlock::SearchMovie,
+        None,
       )
       .handle();
 
@@ -503,10 +501,10 @@ mod tests {
       );
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.right.key,
+        DEFAULT_KEYBINDINGS.right.key,
         &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
+        ActiveRadarrBlock::SearchMovie,
+        None,
       )
       .handle();
 
@@ -530,10 +528,10 @@ mod tests {
       app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.left.key,
+        DEFAULT_KEYBINDINGS.left.key,
         &mut app,
-        &ActiveRadarrBlock::FilterMovies,
-        &None,
+        ActiveRadarrBlock::FilterMovies,
+        None,
       )
       .handle();
 
@@ -551,10 +549,10 @@ mod tests {
       );
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.right.key,
+        DEFAULT_KEYBINDINGS.right.key,
         &mut app,
-        &ActiveRadarrBlock::FilterMovies,
-        &None,
+        ActiveRadarrBlock::FilterMovies,
+        None,
       )
       .handle();
 
@@ -592,11 +590,11 @@ mod tests {
         .movies
         .set_items(vec![Movie::default()]);
 
-      LibraryHandler::with(&SUBMIT_KEY, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
+      LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::MovieDetails.into()
+        ActiveRadarrBlock::MovieDetails.into()
       );
     }
 
@@ -611,9 +609,9 @@ mod tests {
         .movies
         .set_items(vec![Movie::default()]);
 
-      LibraryHandler::with(&SUBMIT_KEY, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
+      LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
 
     #[test]
@@ -631,19 +629,13 @@ mod tests {
         ));
       app.data.radarr_data.movies.search = Some("Test 2".into());
 
-      LibraryHandler::with(
-        &SUBMIT_KEY,
-        &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
-      )
-      .handle();
+      LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle();
 
       assert_str_eq!(
         app.data.radarr_data.movies.current_selection().title.text,
         "Test 2"
       );
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
 
     #[test]
@@ -661,13 +653,7 @@ mod tests {
         ));
       app.data.radarr_data.movies.search = Some("Test 5".into());
 
-      LibraryHandler::with(
-        &SUBMIT_KEY,
-        &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
-      )
-      .handle();
+      LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle();
 
       assert_str_eq!(
         app.data.radarr_data.movies.current_selection().title.text,
@@ -675,7 +661,7 @@ mod tests {
       );
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::SearchMovieError.into()
+        ActiveRadarrBlock::SearchMovieError.into()
       );
     }
 
@@ -699,19 +685,13 @@ mod tests {
         ));
       app.data.radarr_data.movies.search = Some("Test 2".into());
 
-      LibraryHandler::with(
-        &SUBMIT_KEY,
-        &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
-      )
-      .handle();
+      LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle();
 
       assert_str_eq!(
         app.data.radarr_data.movies.current_selection().title.text,
         "Test 2"
       );
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
 
     #[test]
@@ -729,13 +709,7 @@ mod tests {
         ));
       app.data.radarr_data.movies.filter = Some("Test".into());
 
-      LibraryHandler::with(
-        &SUBMIT_KEY,
-        &mut app,
-        &ActiveRadarrBlock::FilterMovies,
-        &None,
-      )
-      .handle();
+      LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::FilterMovies, None).handle();
 
       assert!(app.data.radarr_data.movies.filtered_items.is_some());
       assert!(!app.should_ignore_quit_key);
@@ -754,7 +728,7 @@ mod tests {
         app.data.radarr_data.movies.current_selection().title.text,
         "Test 1"
       );
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
 
     #[test]
@@ -772,19 +746,13 @@ mod tests {
         ));
       app.data.radarr_data.movies.filter = Some("Test 5".into());
 
-      LibraryHandler::with(
-        &SUBMIT_KEY,
-        &mut app,
-        &ActiveRadarrBlock::FilterMovies,
-        &None,
-      )
-      .handle();
+      LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::FilterMovies, None).handle();
 
       assert!(!app.should_ignore_quit_key);
       assert!(app.data.radarr_data.movies.filtered_items.is_none());
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::FilterMoviesError.into()
+        ActiveRadarrBlock::FilterMoviesError.into()
       );
     }
 
@@ -801,10 +769,10 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into());
 
       LibraryHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::UpdateAllMoviesPrompt,
-        &None,
+        ActiveRadarrBlock::UpdateAllMoviesPrompt,
+        None,
       )
       .handle();
 
@@ -813,7 +781,7 @@ mod tests {
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::UpdateAllMovies)
       );
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
 
     #[test]
@@ -828,16 +796,16 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into());
 
       LibraryHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::UpdateAllMoviesPrompt,
-        &None,
+        ActiveRadarrBlock::UpdateAllMoviesPrompt,
+        None,
       )
       .handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
 
     #[test]
@@ -854,14 +822,14 @@ mod tests {
       expected_vec.reverse();
 
       LibraryHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::MoviesSortPrompt,
-        &None,
+        ActiveRadarrBlock::MoviesSortPrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(app.data.radarr_data.movies.items, expected_vec);
     }
   }
@@ -889,9 +857,9 @@ mod tests {
       app.data.radarr_data = create_test_radarr_data();
       app.data.radarr_data.movies.search = Some("Test".into());
 
-      LibraryHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
+      LibraryHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(!app.should_ignore_quit_key);
       assert_eq!(app.data.radarr_data.movies.search, None);
     }
@@ -913,9 +881,9 @@ mod tests {
         ..StatefulTable::default()
       };
 
-      LibraryHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
+      LibraryHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(!app.should_ignore_quit_key);
       assert_eq!(app.data.radarr_data.movies.filter, None);
       assert_eq!(app.data.radarr_data.movies.filtered_items, None);
@@ -930,14 +898,14 @@ mod tests {
       app.data.radarr_data.prompt_confirm = true;
 
       LibraryHandler::with(
-        &ESC_KEY,
+        ESC_KEY,
         &mut app,
-        &ActiveRadarrBlock::UpdateAllMoviesPrompt,
-        &None,
+        ActiveRadarrBlock::UpdateAllMoviesPrompt,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(!app.data.radarr_data.prompt_confirm);
     }
 
@@ -947,15 +915,9 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::MoviesSortPrompt.into());
 
-      LibraryHandler::with(
-        &ESC_KEY,
-        &mut app,
-        &ActiveRadarrBlock::MoviesSortPrompt,
-        &None,
-      )
-      .handle();
+      LibraryHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
 
     #[rstest]
@@ -974,9 +936,9 @@ mod tests {
         ..StatefulTable::default()
       };
 
-      LibraryHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
+      LibraryHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(app.error.text.is_empty());
       assert_eq!(app.data.radarr_data.movies.search, None);
       assert_eq!(app.data.radarr_data.movies.filter, None);
@@ -1012,16 +974,16 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.search.key,
+        DEFAULT_KEYBINDINGS.search.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::SearchMovie.into()
+        ActiveRadarrBlock::SearchMovie.into()
       );
       assert!(app.should_ignore_quit_key);
       assert_eq!(
@@ -1042,14 +1004,14 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.search.key,
+        DEFAULT_KEYBINDINGS.search.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(!app.should_ignore_quit_key);
       assert_eq!(app.data.radarr_data.movies.search, None);
     }
@@ -1064,16 +1026,16 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.filter.key,
+        DEFAULT_KEYBINDINGS.filter.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::FilterMovies.into()
+        ActiveRadarrBlock::FilterMovies.into()
       );
       assert!(app.should_ignore_quit_key);
       assert!(app.data.radarr_data.movies.filter.is_some());
@@ -1091,14 +1053,14 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.filter.key,
+        DEFAULT_KEYBINDINGS.filter.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(!app.should_ignore_quit_key);
       assert!(app.data.radarr_data.movies.filter.is_none());
     }
@@ -1117,16 +1079,16 @@ mod tests {
       app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.filter.key,
+        DEFAULT_KEYBINDINGS.filter.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::FilterMovies.into()
+        ActiveRadarrBlock::FilterMovies.into()
       );
       assert!(app.should_ignore_quit_key);
       assert_eq!(
@@ -1147,16 +1109,16 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.add.key,
+        DEFAULT_KEYBINDINGS.add.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AddMovieSearchInput.into()
+        ActiveRadarrBlock::AddMovieSearchInput.into()
       );
       assert!(app.should_ignore_quit_key);
       assert!(app.data.radarr_data.add_movie_search.is_some());
@@ -1174,14 +1136,14 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.add.key,
+        DEFAULT_KEYBINDINGS.add.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(!app.should_ignore_quit_key);
       assert!(app.data.radarr_data.add_movie_search.is_none());
     }
@@ -1207,14 +1169,14 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.edit.key,
+        DEFAULT_KEYBINDINGS.edit.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(app.data.radarr_data.edit_movie_modal.is_none());
     }
 
@@ -1228,16 +1190,16 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.update.key,
+        DEFAULT_KEYBINDINGS.update.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::UpdateAllMoviesPrompt.into()
+        ActiveRadarrBlock::UpdateAllMoviesPrompt.into()
       );
     }
 
@@ -1253,14 +1215,14 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.update.key,
+        DEFAULT_KEYBINDINGS.update.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
 
     #[test]
@@ -1274,14 +1236,14 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.refresh.key,
+        DEFAULT_KEYBINDINGS.refresh.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(app.should_refresh);
     }
 
@@ -1297,14 +1259,14 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.refresh.key,
+        DEFAULT_KEYBINDINGS.refresh.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(!app.should_refresh);
     }
 
@@ -1319,10 +1281,10 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.backspace.key,
+        DEFAULT_KEYBINDINGS.backspace.key,
         &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
+        ActiveRadarrBlock::SearchMovie,
+        None,
       )
       .handle();
 
@@ -1343,10 +1305,10 @@ mod tests {
       app.data.radarr_data.movies.filter = Some("Test".into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.backspace.key,
+        DEFAULT_KEYBINDINGS.backspace.key,
         &mut app,
-        &ActiveRadarrBlock::FilterMovies,
-        &None,
+        ActiveRadarrBlock::FilterMovies,
+        None,
       )
       .handle();
 
@@ -1367,10 +1329,10 @@ mod tests {
       app.data.radarr_data.movies.search = Some(HorizontallyScrollableText::default());
 
       LibraryHandler::with(
-        &Key::Char('h'),
+        Key::Char('h'),
         &mut app,
-        &ActiveRadarrBlock::SearchMovie,
-        &None,
+        ActiveRadarrBlock::SearchMovie,
+        None,
       )
       .handle();
 
@@ -1391,10 +1353,10 @@ mod tests {
       app.data.radarr_data.movies.filter = Some(HorizontallyScrollableText::default());
 
       LibraryHandler::with(
-        &Key::Char('h'),
+        Key::Char('h'),
         &mut app,
-        &ActiveRadarrBlock::FilterMovies,
-        &None,
+        ActiveRadarrBlock::FilterMovies,
+        None,
       )
       .handle();
 
@@ -1414,16 +1376,16 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.sort.key,
+        DEFAULT_KEYBINDINGS.sort.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::MoviesSortPrompt.into()
+        ActiveRadarrBlock::MoviesSortPrompt.into()
       );
       assert_eq!(
         app.data.radarr_data.movies.sort.as_ref().unwrap().items,
@@ -1444,14 +1406,14 @@ mod tests {
         .set_items(vec![Movie::default()]);
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.sort.key,
+        DEFAULT_KEYBINDINGS.sort.key,
         &mut app,
-        &ActiveRadarrBlock::Movies,
-        &None,
+        ActiveRadarrBlock::Movies,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert!(app.data.radarr_data.movies.sort.is_none());
     }
 
@@ -1467,10 +1429,10 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into());
 
       LibraryHandler::with(
-        &DEFAULT_KEYBINDINGS.confirm.key,
+        DEFAULT_KEYBINDINGS.confirm.key,
         &mut app,
-        &ActiveRadarrBlock::UpdateAllMoviesPrompt,
-        &None,
+        ActiveRadarrBlock::UpdateAllMoviesPrompt,
+        None,
       )
       .handle();
 
@@ -1479,7 +1441,7 @@ mod tests {
         app.data.radarr_data.prompt_confirm_action,
         Some(RadarrEvent::UpdateAllMovies)
       );
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
   }
 
@@ -1744,9 +1706,9 @@ mod tests {
 
     ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
       if library_handler_blocks.contains(&active_radarr_block) {
-        assert!(LibraryHandler::accepts(&active_radarr_block));
+        assert!(LibraryHandler::accepts(active_radarr_block));
       } else {
-        assert!(!LibraryHandler::accepts(&active_radarr_block));
+        assert!(!LibraryHandler::accepts(active_radarr_block));
       }
     });
   }
@@ -1757,10 +1719,10 @@ mod tests {
     app.is_loading = true;
 
     let handler = LibraryHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::Movies,
-      &None,
+      ActiveRadarrBlock::Movies,
+      None,
     );
 
     assert!(!handler.is_ready());
@@ -1772,10 +1734,10 @@ mod tests {
     app.is_loading = false;
 
     let handler = LibraryHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::Movies,
-      &None,
+      ActiveRadarrBlock::Movies,
+      None,
     );
 
     assert!(!handler.is_ready());
@@ -1792,10 +1754,10 @@ mod tests {
       .set_items(vec![Movie::default()]);
 
     let handler = LibraryHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::Movies,
-      &None,
+      ActiveRadarrBlock::Movies,
+      None,
     );
 
     assert!(handler.is_ready());

src/handlers/radarr_handlers/library/mod.rs

@@ -27,10 +27,10 @@ mod movie_details_handler;
 mod library_handler_tests;
 
 pub(super) struct LibraryHandler<'a, 'b> {
-  key: &'a Key,
+  key: Key,
   app: &'a mut App<'b>,
-  active_radarr_block: &'a ActiveRadarrBlock,
-  context: &'a Option<ActiveRadarrBlock>,
+  active_radarr_block: ActiveRadarrBlock,
+  context: Option<ActiveRadarrBlock>,
 }
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, 'b> {
@@ -54,19 +54,19 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
     }
   }
 
-  fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
+  fn accepts(active_block: ActiveRadarrBlock) -> bool {
     AddMovieHandler::accepts(active_block)
       || DeleteMovieHandler::accepts(active_block)
       || EditMovieHandler::accepts(active_block)
       || MovieDetailsHandler::accepts(active_block)
-      || LIBRARY_BLOCKS.contains(active_block)
+      || LIBRARY_BLOCKS.contains(&active_block)
   }
 
   fn with(
-    key: &'a Key,
+    key: Key,
     app: &'a mut App<'b>,
-    active_block: &'a ActiveRadarrBlock,
-    context: &'a Option<ActiveRadarrBlock>,
+    active_block: ActiveRadarrBlock,
+    context: Option<ActiveRadarrBlock>,
   ) -> LibraryHandler<'a, 'b> {
     LibraryHandler {
       key,
@@ -76,7 +76,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
     }
   }
 
-  fn get_key(&self) -> &Key {
+  fn get_key(&self) -> Key {
     self.key
   }
 
@@ -189,7 +189,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
   }
 
   fn handle_delete(&mut self) {
-    if self.active_radarr_block == &ActiveRadarrBlock::Movies {
+    if self.active_radarr_block == ActiveRadarrBlock::Movies {
       self
         .app
         .push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into());
@@ -317,14 +317,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
     let key = self.key;
     match self.active_radarr_block {
       ActiveRadarrBlock::Movies => match self.key {
-        _ if *key == DEFAULT_KEYBINDINGS.search.key => {
+        _ if key == DEFAULT_KEYBINDINGS.search.key => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
           self.app.data.radarr_data.movies.search = Some(HorizontallyScrollableText::default());
           self.app.should_ignore_quit_key = true;
         }
-        _ if *key == DEFAULT_KEYBINDINGS.filter.key => {
+        _ if key == DEFAULT_KEYBINDINGS.filter.key => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
@@ -332,7 +332,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
           self.app.data.radarr_data.movies.filter = Some(HorizontallyScrollableText::default());
           self.app.should_ignore_quit_key = true;
         }
-        _ if *key == DEFAULT_KEYBINDINGS.edit.key => {
+        _ if key == DEFAULT_KEYBINDINGS.edit.key => {
           self.app.push_navigation_stack(
             (
               ActiveRadarrBlock::EditMoviePrompt,
@@ -344,22 +344,22 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
           self.app.data.radarr_data.selected_block =
             BlockSelectionState::new(&EDIT_MOVIE_SELECTION_BLOCKS);
         }
-        _ if *key == DEFAULT_KEYBINDINGS.add.key => {
+        _ if key == DEFAULT_KEYBINDINGS.add.key => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
           self.app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
           self.app.should_ignore_quit_key = true;
         }
-        _ if *key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if key == DEFAULT_KEYBINDINGS.update.key => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into());
         }
-        _ if *key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
           self.app.should_refresh = true;
         }
-        _ if *key == DEFAULT_KEYBINDINGS.sort.key => {
+        _ if key == DEFAULT_KEYBINDINGS.sort.key => {
           self
             .app
             .data
@@ -387,7 +387,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
         )
       }
       ActiveRadarrBlock::UpdateAllMoviesPrompt => {
-        if *key == DEFAULT_KEYBINDINGS.confirm.key {
+        if key == DEFAULT_KEYBINDINGS.confirm.key {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::UpdateAllMovies);
 

src/handlers/radarr_handlers/library/movie_details_handler.rs

@@ -18,22 +18,22 @@ use crate::network::radarr_network::RadarrEvent;
 mod movie_details_handler_tests;
 
 pub(super) struct MovieDetailsHandler<'a, 'b> {
-  key: &'a Key,
+  key: Key,
   app: &'a mut App<'b>,
-  active_radarr_block: &'a ActiveRadarrBlock,
-  _context: &'a Option<ActiveRadarrBlock>,
+  active_radarr_block: ActiveRadarrBlock,
+  _context: Option<ActiveRadarrBlock>,
 }
 
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<'a, 'b> {
-  fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
-    MOVIE_DETAILS_BLOCKS.contains(active_block)
+  fn accepts(active_block: ActiveRadarrBlock) -> bool {
+    MOVIE_DETAILS_BLOCKS.contains(&active_block)
   }
 
   fn with(
-    key: &'a Key,
+    key: Key,
     app: &'a mut App<'b>,
-    active_block: &'a ActiveRadarrBlock,
-    _context: &'a Option<ActiveRadarrBlock>,
+    active_block: ActiveRadarrBlock,
+    _context: Option<ActiveRadarrBlock>,
   ) -> MovieDetailsHandler<'a, 'b> {
     MovieDetailsHandler {
       key,
@@ -43,7 +43,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
     }
   }
 
-  fn get_key(&self) -> &Key {
+  fn get_key(&self) -> Key {
     self.key
   }
 
@@ -334,16 +334,16 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
       | ActiveRadarrBlock::Cast
       | ActiveRadarrBlock::Crew
       | ActiveRadarrBlock::ManualSearch => match self.key {
-        _ if *self.key == DEFAULT_KEYBINDINGS.left.key => {
+        _ if self.key == DEFAULT_KEYBINDINGS.left.key => {
           self.app.data.radarr_data.movie_info_tabs.previous();
           self.app.pop_and_push_navigation_stack(
-            *self.app.data.radarr_data.movie_info_tabs.get_active_route(),
+            self.app.data.radarr_data.movie_info_tabs.get_active_route(),
           );
         }
-        _ if *self.key == DEFAULT_KEYBINDINGS.right.key => {
+        _ if self.key == DEFAULT_KEYBINDINGS.right.key => {
           self.app.data.radarr_data.movie_info_tabs.next();
           self.app.pop_and_push_navigation_stack(
-            *self.app.data.radarr_data.movie_info_tabs.get_active_route(),
+            self.app.data.radarr_data.movie_info_tabs.get_active_route(),
           );
         }
         _ => (),
@@ -425,23 +425,23 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
 
   fn handle_char_key_event(&mut self) {
     let key = self.key;
-    match *self.active_radarr_block {
+    match self.active_radarr_block {
       ActiveRadarrBlock::MovieDetails
       | ActiveRadarrBlock::MovieHistory
       | ActiveRadarrBlock::FileInfo
       | ActiveRadarrBlock::Cast
       | ActiveRadarrBlock::Crew
       | ActiveRadarrBlock::ManualSearch => match self.key {
-        _ if *key == DEFAULT_KEYBINDINGS.search.key => {
+        _ if key == DEFAULT_KEYBINDINGS.search.key => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::AutomaticallySearchMoviePrompt.into());
         }
-        _ if *key == DEFAULT_KEYBINDINGS.edit.key => {
+        _ if key == DEFAULT_KEYBINDINGS.edit.key => {
           self.app.push_navigation_stack(
             (
               ActiveRadarrBlock::EditMoviePrompt,
-              Some(*self.active_radarr_block),
+              Some(self.active_radarr_block),
             )
               .into(),
           );
@@ -449,17 +449,17 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
           self.app.data.radarr_data.selected_block =
             BlockSelectionState::new(&EDIT_MOVIE_SELECTION_BLOCKS);
         }
-        _ if *key == DEFAULT_KEYBINDINGS.update.key => {
+        _ if key == DEFAULT_KEYBINDINGS.update.key => {
           self
             .app
             .push_navigation_stack(ActiveRadarrBlock::UpdateAndScanPrompt.into());
         }
-        _ if *key == DEFAULT_KEYBINDINGS.refresh.key => {
+        _ if key == DEFAULT_KEYBINDINGS.refresh.key => {
           self
             .app
-            .pop_and_push_navigation_stack((*self.active_radarr_block).into());
+            .pop_and_push_navigation_stack((self.active_radarr_block).into());
         }
-        _ if *key == DEFAULT_KEYBINDINGS.sort.key => {
+        _ if key == DEFAULT_KEYBINDINGS.sort.key => {
           self
             .app
             .data
@@ -476,7 +476,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
         _ => (),
       },
       ActiveRadarrBlock::AutomaticallySearchMoviePrompt => {
-        if *key == DEFAULT_KEYBINDINGS.confirm.key {
+        if key == DEFAULT_KEYBINDINGS.confirm.key {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
             Some(RadarrEvent::TriggerAutomaticSearch(None));
@@ -485,7 +485,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
         }
       }
       ActiveRadarrBlock::UpdateAndScanPrompt => {
-        if *key == DEFAULT_KEYBINDINGS.confirm.key {
+        if key == DEFAULT_KEYBINDINGS.confirm.key {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::UpdateAndScan(None));
 
@@ -493,7 +493,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
         }
       }
       ActiveRadarrBlock::ManualSearchConfirmPrompt => {
-        if *key == DEFAULT_KEYBINDINGS.confirm.key {
+        if key == DEFAULT_KEYBINDINGS.confirm.key {
           self.app.data.radarr_data.prompt_confirm = true;
           self.app.data.radarr_data.prompt_confirm_action =
             Some(RadarrEvent::DownloadRelease(None));

src/handlers/radarr_handlers/library/movie_details_handler_tests.rs

@@ -40,10 +40,10 @@ mod tests {
       });
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.up.key,
+        DEFAULT_KEYBINDINGS.up.key,
         &mut app,
-        &ActiveRadarrBlock::MovieDetails,
-        &None,
+        ActiveRadarrBlock::MovieDetails,
+        None,
       )
       .handle();
 
@@ -60,10 +60,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.down.key,
+        DEFAULT_KEYBINDINGS.down.key,
         &mut app,
-        &ActiveRadarrBlock::MovieDetails,
-        &None,
+        ActiveRadarrBlock::MovieDetails,
+        None,
       )
       .handle();
 
@@ -90,10 +90,10 @@ mod tests {
       });
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.up.key,
+        DEFAULT_KEYBINDINGS.up.key,
         &mut app,
-        &ActiveRadarrBlock::MovieDetails,
-        &None,
+        ActiveRadarrBlock::MovieDetails,
+        None,
       )
       .handle();
 
@@ -110,10 +110,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.down.key,
+        DEFAULT_KEYBINDINGS.down.key,
         &mut app,
-        &ActiveRadarrBlock::MovieDetails,
-        &None,
+        ActiveRadarrBlock::MovieDetails,
+        None,
       )
       .handle();
 
@@ -145,7 +145,7 @@ mod tests {
         ));
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::MovieHistory, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::MovieHistory, None).handle();
 
       assert_str_eq!(
         app
@@ -161,7 +161,7 @@ mod tests {
         "Test 2"
       );
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::MovieHistory, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::MovieHistory, None).handle();
 
       assert_str_eq!(
         app
@@ -194,7 +194,7 @@ mod tests {
         ));
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::MovieHistory, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::MovieHistory, None).handle();
 
       assert_str_eq!(
         app
@@ -210,7 +210,7 @@ mod tests {
         "Test 1"
       );
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::MovieHistory, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::MovieHistory, None).handle();
 
       assert_str_eq!(
         app
@@ -238,7 +238,7 @@ mod tests {
         .set_items(simple_stateful_iterable_vec!(Credit, String, person_name));
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Cast, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::Cast, None).handle();
 
       assert_str_eq!(
         app
@@ -253,7 +253,7 @@ mod tests {
         "Test 2"
       );
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Cast, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::Cast, None).handle();
 
       assert_str_eq!(
         app
@@ -281,7 +281,7 @@ mod tests {
         .set_items(simple_stateful_iterable_vec!(Credit, String, person_name));
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Cast, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::Cast, None).handle();
 
       assert_str_eq!(
         app
@@ -296,7 +296,7 @@ mod tests {
         "Test 1"
       );
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Cast, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::Cast, None).handle();
 
       assert_str_eq!(
         app
@@ -323,7 +323,7 @@ mod tests {
         .set_items(simple_stateful_iterable_vec!(Credit, String, person_name));
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Crew, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::Crew, None).handle();
 
       assert_str_eq!(
         app
@@ -338,7 +338,7 @@ mod tests {
         "Test 2"
       );
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Crew, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::Crew, None).handle();
 
       assert_str_eq!(
         app
@@ -366,7 +366,7 @@ mod tests {
         .set_items(simple_stateful_iterable_vec!(Credit, String, person_name));
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Crew, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::Crew, None).handle();
 
       assert_str_eq!(
         app
@@ -381,7 +381,7 @@ mod tests {
         "Test 1"
       );
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::Crew, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::Crew, None).handle();
 
       assert_str_eq!(
         app
@@ -411,7 +411,7 @@ mod tests {
         ));
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::ManualSearch, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::ManualSearch, None).handle();
 
       assert_str_eq!(
         app
@@ -427,7 +427,7 @@ mod tests {
         "Test 2"
       );
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::ManualSearch, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::ManualSearch, None).handle();
 
       assert_str_eq!(
         app
@@ -459,7 +459,7 @@ mod tests {
         ));
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::ManualSearch, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::ManualSearch, None).handle();
 
       assert_str_eq!(
         app
@@ -475,7 +475,7 @@ mod tests {
         "Test 1"
       );
 
-      MovieDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::ManualSearch, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, ActiveRadarrBlock::ManualSearch, None).handle();
 
       assert_str_eq!(
         app
@@ -505,10 +505,10 @@ mod tests {
       if key == Key::Up {
         for i in (0..release_field_vec.len()).rev() {
           MovieDetailsHandler::with(
-            &key,
+            key,
             &mut app,
-            &ActiveRadarrBlock::ManualSearchSortPrompt,
-            &None,
+            ActiveRadarrBlock::ManualSearchSortPrompt,
+            None,
           )
           .handle();
 
@@ -530,10 +530,10 @@ mod tests {
       } else {
         for i in 0..release_field_vec.len() {
           MovieDetailsHandler::with(
-            &key,
+            key,
             &mut app,
-            &ActiveRadarrBlock::ManualSearchSortPrompt,
-            &None,
+            ActiveRadarrBlock::ManualSearchSortPrompt,
+            None,
           )
           .handle();
 
@@ -572,10 +572,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::MovieDetails,
-        &None,
+        ActiveRadarrBlock::MovieDetails,
+        None,
       )
       .handle();
 
@@ -592,10 +592,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::MovieDetails,
-        &None,
+        ActiveRadarrBlock::MovieDetails,
+        None,
       )
       .handle();
 
@@ -623,10 +623,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::MovieDetails,
-        &None,
+        ActiveRadarrBlock::MovieDetails,
+        None,
       )
       .handle();
 
@@ -643,10 +643,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::MovieDetails,
-        &None,
+        ActiveRadarrBlock::MovieDetails,
+        None,
       )
       .handle();
 
@@ -677,10 +677,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::MovieHistory,
-        &None,
+        ActiveRadarrBlock::MovieHistory,
+        None,
       )
       .handle();
 
@@ -699,10 +699,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::MovieHistory,
-        &None,
+        ActiveRadarrBlock::MovieHistory,
+        None,
       )
       .handle();
 
@@ -736,10 +736,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::MovieHistory,
-        &None,
+        ActiveRadarrBlock::MovieHistory,
+        None,
       )
       .handle();
 
@@ -758,10 +758,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::MovieHistory,
-        &None,
+        ActiveRadarrBlock::MovieHistory,
+        None,
       )
       .handle();
 
@@ -790,10 +790,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::Cast,
-        &None,
+        ActiveRadarrBlock::Cast,
+        None,
       )
       .handle();
 
@@ -811,10 +811,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::Cast,
-        &None,
+        ActiveRadarrBlock::Cast,
+        None,
       )
       .handle();
 
@@ -843,10 +843,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::Cast,
-        &None,
+        ActiveRadarrBlock::Cast,
+        None,
       )
       .handle();
 
@@ -864,10 +864,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::Cast,
-        &None,
+        ActiveRadarrBlock::Cast,
+        None,
       )
       .handle();
 
@@ -895,10 +895,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::Crew,
-        &None,
+        ActiveRadarrBlock::Crew,
+        None,
       )
       .handle();
 
@@ -916,10 +916,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::Crew,
-        &None,
+        ActiveRadarrBlock::Crew,
+        None,
       )
       .handle();
 
@@ -948,10 +948,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::Crew,
-        &None,
+        ActiveRadarrBlock::Crew,
+        None,
       )
       .handle();
 
@@ -969,10 +969,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::Crew,
-        &None,
+        ActiveRadarrBlock::Crew,
+        None,
       )
       .handle();
 
@@ -1003,10 +1003,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::ManualSearch,
-        &None,
+        ActiveRadarrBlock::ManualSearch,
+        None,
       )
       .handle();
 
@@ -1025,10 +1025,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::ManualSearch,
-        &None,
+        ActiveRadarrBlock::ManualSearch,
+        None,
       )
       .handle();
 
@@ -1061,10 +1061,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::ManualSearch,
-        &None,
+        ActiveRadarrBlock::ManualSearch,
+        None,
       )
       .handle();
 
@@ -1083,10 +1083,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::ManualSearch,
-        &None,
+        ActiveRadarrBlock::ManualSearch,
+        None,
       )
       .handle();
 
@@ -1114,10 +1114,10 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.end.key,
+        DEFAULT_KEYBINDINGS.end.key,
         &mut app,
-        &ActiveRadarrBlock::ManualSearchSortPrompt,
-        &None,
+        ActiveRadarrBlock::ManualSearchSortPrompt,
+        None,
       )
       .handle();
 
@@ -1137,10 +1137,10 @@ mod tests {
       );
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.home.key,
+        DEFAULT_KEYBINDINGS.home.key,
         &mut app,
-        &ActiveRadarrBlock::ManualSearchSortPrompt,
-        &None,
+        ActiveRadarrBlock::ManualSearchSortPrompt,
+        None,
       )
       .handle();
 
@@ -1179,11 +1179,11 @@ mod tests {
     ) {
       let mut app = App::default();
 
-      MovieDetailsHandler::with(&key, &mut app, &active_radarr_block, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, active_radarr_block, None).handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
 
-      MovieDetailsHandler::with(&key, &mut app, &active_radarr_block, &None).handle();
+      MovieDetailsHandler::with(key, &mut app, active_radarr_block, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
     }
@@ -1212,23 +1212,21 @@ mod tests {
         .position(|tab_route| tab_route.route == right_block.into())
         .unwrap_or_default();
 
-      MovieDetailsHandler::with(&DEFAULT_KEYBINDINGS.left.key, &mut app, &right_block, &None)
-        .handle();
+      MovieDetailsHandler::with(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None).handle();
 
       assert_eq!(
         app.get_current_route(),
         app.data.radarr_data.movie_info_tabs.get_active_route()
       );
-      assert_eq!(app.get_current_route(), &left_block.into());
+      assert_eq!(app.get_current_route(), left_block.into());
 
-      MovieDetailsHandler::with(&DEFAULT_KEYBINDINGS.right.key, &mut app, &left_block, &None)
-        .handle();
+      MovieDetailsHandler::with(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None).handle();
 
       assert_eq!(
         app.get_current_route(),
         app.data.radarr_data.movie_info_tabs.get_active_route()
       );
-      assert_eq!(app.get_current_route(), &right_block.into());
+      assert_eq!(app.get_current_route(), right_block.into());
     }
   }
 
@@ -1256,17 +1254,12 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(modal);
       app.push_navigation_stack(ActiveRadarrBlock::ManualSearch.into());
 
-      MovieDetailsHandler::with(
-        &SUBMIT_KEY,
-        &mut app,
-        &ActiveRadarrBlock::ManualSearch,
-        &None,
-      )
-      .handle();
+      MovieDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::ManualSearch, None)
+        .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::ManualSearchConfirmPrompt.into()
+        ActiveRadarrBlock::ManualSearchConfirmPrompt.into()
       );
     }
 
@@ -1280,17 +1273,12 @@ mod tests {
       });
       app.push_navigation_stack(ActiveRadarrBlock::ManualSearch.into());
 
-      MovieDetailsHandler::with(
-        &SUBMIT_KEY,
-        &mut app,
-        &ActiveRadarrBlock::ManualSearch,
-        &None,
-      )
-      .handle();
+      MovieDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::ManualSearch, None)
+        .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::ManualSearch.into()
+        ActiveRadarrBlock::ManualSearch.into()
       );
     }
 
@@ -1320,12 +1308,12 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into());
       app.push_navigation_stack(prompt_block.into());
 
-      MovieDetailsHandler::with(&SUBMIT_KEY, &mut app, &prompt_block, &None).handle();
+      MovieDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::MovieDetails.into()
+        ActiveRadarrBlock::MovieDetails.into()
       );
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
@@ -1350,12 +1338,12 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into());
       app.push_navigation_stack(prompt_block.into());
 
-      MovieDetailsHandler::with(&SUBMIT_KEY, &mut app, &prompt_block, &None).handle();
+      MovieDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::MovieDetails.into()
+        ActiveRadarrBlock::MovieDetails.into()
       );
       assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
     }
@@ -1375,16 +1363,16 @@ mod tests {
       expected_vec.reverse();
 
       MovieDetailsHandler::with(
-        &SUBMIT_KEY,
+        SUBMIT_KEY,
         &mut app,
-        &ActiveRadarrBlock::ManualSearchSortPrompt,
-        &None,
+        ActiveRadarrBlock::ManualSearchSortPrompt,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::ManualSearch.into()
+        ActiveRadarrBlock::ManualSearch.into()
       );
       assert_eq!(
         app
@@ -1430,9 +1418,9 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(active_radarr_block.into());
 
-      MovieDetailsHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
+      MovieDetailsHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
 
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_movie_info_tabs_reset!(app.data.radarr_data);
     }
 
@@ -1453,10 +1441,10 @@ mod tests {
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(prompt_block.into());
 
-      MovieDetailsHandler::with(&ESC_KEY, &mut app, &prompt_block, &None).handle();
+      MovieDetailsHandler::with(ESC_KEY, &mut app, prompt_block, None).handle();
 
       assert!(!app.data.radarr_data.prompt_confirm);
-      assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
+      assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
     }
   }
 
@@ -1508,16 +1496,16 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.search.key,
+        DEFAULT_KEYBINDINGS.search.key,
         &mut app,
-        &active_radarr_block,
-        &None,
+        active_radarr_block,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::AutomaticallySearchMoviePrompt.into()
+        ActiveRadarrBlock::AutomaticallySearchMoviePrompt.into()
       );
     }
 
@@ -1542,14 +1530,14 @@ mod tests {
       });
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.search.key,
+        DEFAULT_KEYBINDINGS.search.key,
         &mut app,
-        &active_radarr_block,
-        &None,
+        active_radarr_block,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &active_radarr_block.into());
+      assert_eq!(app.get_current_route(), active_radarr_block.into());
     }
 
     #[test]
@@ -1560,16 +1548,16 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.sort.key,
+        DEFAULT_KEYBINDINGS.sort.key,
         &mut app,
-        &ActiveRadarrBlock::ManualSearch,
-        &None,
+        ActiveRadarrBlock::ManualSearch,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::ManualSearchSortPrompt.into()
+        ActiveRadarrBlock::ManualSearchSortPrompt.into()
       );
       assert_eq!(
         app
@@ -1608,16 +1596,16 @@ mod tests {
       });
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.sort.key,
+        DEFAULT_KEYBINDINGS.sort.key,
         &mut app,
-        &ActiveRadarrBlock::ManualSearch,
-        &None,
+        ActiveRadarrBlock::ManualSearch,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::ManualSearch.into()
+        ActiveRadarrBlock::ManualSearch.into()
       );
     }
 
@@ -1661,14 +1649,14 @@ mod tests {
       });
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.edit.key,
+        DEFAULT_KEYBINDINGS.edit.key,
         &mut app,
-        &active_radarr_block,
-        &None,
+        active_radarr_block,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &active_radarr_block.into());
+      assert_eq!(app.get_current_route(), active_radarr_block.into());
       assert!(app.data.radarr_data.edit_movie_modal.is_none());
     }
 
@@ -1700,16 +1688,16 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.update.key,
+        DEFAULT_KEYBINDINGS.update.key,
         &mut app,
-        &active_radarr_block,
-        &None,
+        active_radarr_block,
+        None,
       )
       .handle();
 
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::UpdateAndScanPrompt.into()
+        ActiveRadarrBlock::UpdateAndScanPrompt.into()
       );
     }
 
@@ -1734,14 +1722,14 @@ mod tests {
       });
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.update.key,
+        DEFAULT_KEYBINDINGS.update.key,
         &mut app,
-        &active_radarr_block,
-        &None,
+        active_radarr_block,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &active_radarr_block.into());
+      assert_eq!(app.get_current_route(), active_radarr_block.into());
     }
 
     #[rstest]
@@ -1772,14 +1760,14 @@ mod tests {
       app.data.radarr_data.movie_details_modal = Some(modal);
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.refresh.key,
+        DEFAULT_KEYBINDINGS.refresh.key,
         &mut app,
-        &active_radarr_block,
-        &None,
+        active_radarr_block,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &active_radarr_block.into());
+      assert_eq!(app.get_current_route(), active_radarr_block.into());
       assert!(app.is_routing);
     }
 
@@ -1804,14 +1792,14 @@ mod tests {
       });
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.refresh.key,
+        DEFAULT_KEYBINDINGS.refresh.key,
         &mut app,
-        &active_radarr_block,
-        &None,
+        active_radarr_block,
+        None,
       )
       .handle();
 
-      assert_eq!(app.get_current_route(), &active_radarr_block.into());
+      assert_eq!(app.get_current_route(), active_radarr_block.into());
       assert!(app.is_routing);
     }
 
@@ -1841,17 +1829,17 @@ mod tests {
       app.push_navigation_stack(prompt_block.into());
 
       MovieDetailsHandler::with(
-        &DEFAULT_KEYBINDINGS.confirm.key,
+        DEFAULT_KEYBINDINGS.confirm.key,
         &mut app,
-        &prompt_block,
-        &None,
+        prompt_block,
+        None,
       )
       .handle();
 
       assert!(app.data.radarr_data.prompt_confirm);
       assert_eq!(
         app.get_current_route(),
-        &ActiveRadarrBlock::MovieDetails.into()
+        ActiveRadarrBlock::MovieDetails.into()
       );
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
@@ -2025,9 +2013,9 @@ mod tests {
   fn test_movie_details_handler_accepts() {
     ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
       if MOVIE_DETAILS_BLOCKS.contains(&active_radarr_block) {
-        assert!(MovieDetailsHandler::accepts(&active_radarr_block));
+        assert!(MovieDetailsHandler::accepts(active_radarr_block));
       } else {
-        assert!(!MovieDetailsHandler::accepts(&active_radarr_block));
+        assert!(!MovieDetailsHandler::accepts(active_radarr_block));
       }
     });
   }
@@ -2062,10 +2050,10 @@ mod tests {
     app.data.radarr_data.movie_details_modal = Some(modal);
 
     let handler = MovieDetailsHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &movie_details_block,
-      &None,
+      movie_details_block,
+      None,
     );
 
     assert!(!handler.is_ready());
@@ -2078,10 +2066,10 @@ mod tests {
     app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
 
     let handler = MovieDetailsHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::MovieDetails,
-      &None,
+      ActiveRadarrBlock::MovieDetails,
+      None,
     );
 
     assert!(!handler.is_ready());
@@ -2097,10 +2085,10 @@ mod tests {
     });
 
     let handler = MovieDetailsHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::MovieDetails,
-      &None,
+      ActiveRadarrBlock::MovieDetails,
+      None,
     );
 
     assert!(handler.is_ready());
@@ -2117,10 +2105,10 @@ mod tests {
     app.data.radarr_data.movie_details_modal = Some(modal);
 
     let handler = MovieDetailsHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::MovieHistory,
-      &None,
+      ActiveRadarrBlock::MovieHistory,
+      None,
     );
 
     assert!(handler.is_ready());
@@ -2135,10 +2123,10 @@ mod tests {
     app.data.radarr_data.movie_details_modal = Some(modal);
 
     let handler = MovieDetailsHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::Cast,
-      &None,
+      ActiveRadarrBlock::Cast,
+      None,
     );
 
     assert!(handler.is_ready());
@@ -2153,10 +2141,10 @@ mod tests {
     app.data.radarr_data.movie_details_modal = Some(modal);
 
     let handler = MovieDetailsHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::Crew,
-      &None,
+      ActiveRadarrBlock::Crew,
+      None,
     );
 
     assert!(handler.is_ready());
@@ -2173,10 +2161,10 @@ mod tests {
     app.data.radarr_data.movie_details_modal = Some(modal);
 
     let handler = MovieDetailsHandler::with(
-      &DEFAULT_KEYBINDINGS.esc.key,
+      DEFAULT_KEYBINDINGS.esc.key,
       &mut app,
-      &ActiveRadarrBlock::ManualSearch,
-      &None,
+      ActiveRadarrBlock::ManualSearch,
+      None,
     );
 
     assert!(handler.is_ready());