fix(radarr): Pass the movie ID alongside all UpdateAndScan events published to the networking channel

src/handlers/radarr_handlers/library/movie_details_handler.rs

@@ -278,7 +278,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
       }
       ActiveRadarrBlock::UpdateAndScanPrompt => {
         if self.app.data.radarr_data.prompt_confirm {
-          self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::UpdateAndScan(None));
+          self.app.data.radarr_data.prompt_confirm_action =
+            Some(RadarrEvent::UpdateAndScan(self.extract_movie_id()));
         }
 
         self.app.pop_navigation_stack();
@@ -371,7 +372,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<
       }
       ActiveRadarrBlock::UpdateAndScanPrompt 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));
+        self.app.data.radarr_data.prompt_confirm_action =
+          Some(RadarrEvent::UpdateAndScan(self.extract_movie_id()));
 
         self.app.pop_navigation_stack();
       }

src/handlers/radarr_handlers/library/movie_details_handler_tests.rs

@@ -363,10 +363,7 @@ mod tests {
       ActiveRadarrBlock::AutomaticallySearchMoviePrompt,
       RadarrEvent::TriggerAutomaticSearch(1)
     )]
-    #[case(
-      ActiveRadarrBlock::UpdateAndScanPrompt,
-      RadarrEvent::UpdateAndScan(None)
-    )]
+    #[case(ActiveRadarrBlock::UpdateAndScanPrompt, RadarrEvent::UpdateAndScan(1))]
     #[case(
       ActiveRadarrBlock::ManualSearchConfirmPrompt,
       RadarrEvent::DownloadRelease(RadarrReleaseDownloadBody {
@@ -784,10 +781,7 @@ mod tests {
       ActiveRadarrBlock::AutomaticallySearchMoviePrompt,
       RadarrEvent::TriggerAutomaticSearch(1)
     )]
-    #[case(
-      ActiveRadarrBlock::UpdateAndScanPrompt,
-      RadarrEvent::UpdateAndScan(None)
-    )]
+    #[case(ActiveRadarrBlock::UpdateAndScanPrompt, RadarrEvent::UpdateAndScan(1))]
     #[case(
       ActiveRadarrBlock::ManualSearchConfirmPrompt,
       RadarrEvent::DownloadRelease(RadarrReleaseDownloadBody {

src/handlers/radarr_handlers/radarr_handler_test_utils.rs

@@ -2,10 +2,9 @@
 #[macro_use]
 pub(in crate::handlers::radarr_handlers) mod utils {
   use crate::models::radarr_models::{
-    AddMovieBody, AddMovieOptions, AddMovieSearchResult, BlocklistItem, BlocklistItemMovie,
-    Collection, CollectionMovie, Credit, CreditType, DownloadRecord, DownloadsResponse,
-    IndexerSettings, MediaInfo, MinimumAvailability, Movie, MovieCollection, MovieFile,
-    MovieHistoryItem, RadarrRelease, Rating, RatingsList,
+    AddMovieBody, AddMovieOptions, AddMovieSearchResult, Collection, CollectionMovie,
+    DownloadRecord, IndexerSettings, MediaInfo, MinimumAvailability, Movie, MovieCollection,
+    MovieFile, RadarrRelease, Rating, RatingsList,
   };
   use crate::models::servarr_models::{
     Indexer, IndexerField, Language, Quality, QualityWrapper, RootFolder,
@@ -305,28 +304,6 @@ pub(in crate::handlers::radarr_handlers) mod utils {
     }
   }
 
-  pub fn blocklist_item() -> BlocklistItem {
-    BlocklistItem {
-      id: 1,
-      movie_id: 1,
-      source_title: "z movie".to_owned(),
-      languages: vec![language()],
-      quality: quality_wrapper(),
-      custom_formats: Some(vec![language()]),
-      date: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
-      protocol: "usenet".to_owned(),
-      indexer: "DrunkenSlug (Prowlarr)".to_owned(),
-      message: "test message".to_owned(),
-      movie: blocklist_item_movie(),
-    }
-  }
-
-  pub fn blocklist_item_movie() -> BlocklistItemMovie {
-    BlocklistItemMovie {
-      title: "Test".into(),
-    }
-  }
-
   pub fn collection() -> Collection {
     Collection {
       id: 123,
@@ -422,16 +399,6 @@ pub(in crate::handlers::radarr_handlers) mod utils {
     }
   }
 
-  pub fn movie_history_item() -> MovieHistoryItem {
-    MovieHistoryItem {
-      source_title: HorizontallyScrollableText::from("Test"),
-      quality: quality_wrapper(),
-      languages: vec![language()],
-      date: DateTime::from(DateTime::parse_from_rfc3339("2022-12-30T07:37:56Z").unwrap()),
-      event_type: "grabbed".to_owned(),
-    }
-  }
-
   pub fn download_record() -> DownloadRecord {
     DownloadRecord {
       title: "Test Download Title".to_owned(),
@@ -446,12 +413,6 @@ pub(in crate::handlers::radarr_handlers) mod utils {
     }
   }
 
-  pub fn downloads_response() -> DownloadsResponse {
-    DownloadsResponse {
-      records: vec![download_record()],
-    }
-  }
-
   pub fn root_folder() -> RootFolder {
     RootFolder {
       id: 1,
@@ -462,26 +423,6 @@ pub(in crate::handlers::radarr_handlers) mod utils {
     }
   }
 
-  pub fn cast_credit() -> Credit {
-    Credit {
-      person_name: "Madison Clarke".to_owned(),
-      character: Some("Johnny Blaze".to_owned()),
-      department: None,
-      job: None,
-      credit_type: CreditType::Cast,
-    }
-  }
-
-  pub fn crew_credit() -> Credit {
-    Credit {
-      person_name: "Alex Clarke".to_owned(),
-      character: None,
-      department: Some("Music".to_owned()),
-      job: Some("Composition".to_owned()),
-      credit_type: CreditType::Crew,
-    }
-  }
-
   pub fn indexer() -> Indexer {
     Indexer {
       enable_rss: true,