From 652bbcd5d423c35470d1464f424b33908f1c7a7f Mon Sep 17 00:00:00 2001
From: Alex Clarke <alex.j.tusa@gmail.com>
Date: Sat, 18 Jan 2025 13:00:21 -0700
Subject: [PATCH] refactor: Refactored a handful of Option calls to use take
 instead

---
 src/app/radarr/mod.rs               |  5 ++---
 src/handlers/radarr_handlers/mod.rs | 12 ++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/app/radarr/mod.rs b/src/app/radarr/mod.rs
index 575a33b..02c59d3 100644
--- a/src/app/radarr/mod.rs
+++ b/src/app/radarr/mod.rs
@@ -157,12 +157,11 @@ impl<'a> App<'a> {
   async fn check_for_radarr_prompt_action(&mut self) {
     if self.data.radarr_data.prompt_confirm {
       self.data.radarr_data.prompt_confirm = false;
-      if let Some(radarr_event) = &self.data.radarr_data.prompt_confirm_action {
+      if let Some(radarr_event) = self.data.radarr_data.prompt_confirm_action.take() {
         self
-          .dispatch_network_event(radarr_event.clone().into())
+          .dispatch_network_event(radarr_event.into())
           .await;
         self.should_refresh = true;
-        self.data.radarr_data.prompt_confirm_action = None;
       }
     }
   }
diff --git a/src/handlers/radarr_handlers/mod.rs b/src/handlers/radarr_handlers/mod.rs
index bc4ed1d..baa8fdf 100644
--- a/src/handlers/radarr_handlers/mod.rs
+++ b/src/handlers/radarr_handlers/mod.rs
@@ -126,10 +126,8 @@ pub fn handle_change_tab_left_right_keys(app: &mut App<'_>, key: Key) {
 #[macro_export]
 macro_rules! search_table {
   ($app:expr, $data_ref:ident, $error_block:expr) => {
-    let search_index = if let Some(search_str) = $app.data.radarr_data.search.as_ref() {
-      let search_string = search_str.text.clone().to_lowercase();
-
-      $app.data.radarr_data.search = None;
+    let search_index = if let Some(search_str) = $app.data.radarr_data.search.take() {
+      let search_string = search_str.text.to_lowercase();
 
       $app
         .data
@@ -153,10 +151,8 @@ macro_rules! search_table {
     }
   };
   ($app:expr, $data_ref:ident, $error_block:expr, $option:ident) => {
-    let search_index = if let Some(search_str) = $app.data.radarr_data.search.as_ref() {
-      let search_string = search_str.text.clone().to_lowercase();
-
-      $app.data.radarr_data.search = None;
+    let search_index = if let Some(search_str) = $app.data.radarr_data.search.take() {
+      let search_string = search_str.text.to_lowercase();
 
       $app
         .data