feat: Added support for a system-wide notification popup mechanism that works across Servarrs

src/network/lidarr_network/library/lidarr_library_network_tests.rs

@@ -1,8 +1,10 @@
 #[cfg(test)]
 mod tests {
   use crate::models::lidarr_models::LidarrReleaseDownloadBody;
+  use crate::models::servarr_data::Notification;
   use crate::network::lidarr_network::LidarrEvent;
-  use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
+  use crate::network::network_tests::test_utils::{test_network, MockServarrApi};
+  use pretty_assertions::assert_eq;
   use serde_json::json;
 
   #[tokio::test]
@@ -30,5 +32,51 @@ mod tests {
 
     mock.assert_async().await;
     assert_ok!(result);
+    assert_eq!(
+      app.lock().await.notification,
+      Some(Notification::new(
+        "Download Result".to_owned(),
+        "Download request sent successfully".to_owned(),
+        true,
+      ))
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_download_lidarr_release_event_sets_failure_notification_on_error() {
+    let params = LidarrReleaseDownloadBody {
+      guid: "1234".to_owned(),
+      indexer_id: 2,
+    };
+
+    let (mock, app, _server) = MockServarrApi::post()
+      .with_request_body(json!({
+        "guid": "1234",
+        "indexerId": 2,
+      }))
+      .returns(json!({}))
+      .status(500)
+      .build_for(LidarrEvent::DownloadRelease(params.clone()))
+      .await;
+
+    app.lock().await.server_tabs.set_index(2);
+    let mut network = test_network(&app);
+
+    let result = network
+      .handle_lidarr_event(LidarrEvent::DownloadRelease(params))
+      .await;
+
+    mock.assert_async().await;
+    assert_err!(result);
+    let app = app.lock().await;
+    assert_is_empty!(app.error.text);
+    assert_some_eq_x!(
+      &app.notification,
+      &Notification::new(
+        "Download Failed".to_owned(),
+        "Download request failed. Check the logs for more details.".to_owned(),
+        false,
+      )
+    );
   }
 }

src/network/lidarr_network/library/mod.rs

@@ -1,4 +1,5 @@
 use crate::models::lidarr_models::LidarrReleaseDownloadBody;
+use crate::models::servarr_data::Notification;
 use crate::network::lidarr_network::LidarrEvent;
 use crate::network::{Network, RequestMethod};
 use anyhow::Result;
@@ -31,8 +32,26 @@ impl Network<'_, '_> {
       )
       .await;
 
-    self
-      .handle_request::<LidarrReleaseDownloadBody, Value>(request_props, |_, _| ())
-      .await
+    let result = self
+      .handle_request::<LidarrReleaseDownloadBody, Value>(request_props, |_, mut app| {
+        app.notification = Some(Notification::new(
+          "Download Result".to_owned(),
+          "Download request sent successfully".to_owned(),
+          true,
+        ));
+      })
+      .await;
+
+    if result.is_err() {
+      let mut app = self.app.lock().await;
+      std::mem::take(&mut app.error.text);
+      app.notification = Some(Notification::new(
+        "Download Failed".to_owned(),
+        "Download request failed. Check the logs for more details.".to_owned(),
+        false,
+      ));
+    }
+
+    result
   }
 }

src/network/radarr_network/library/mod.rs

@@ -3,6 +3,7 @@ use crate::models::radarr_models::{
   EditMovieParams, Movie, MovieCommandBody, MovieHistoryItem, RadarrRelease,
   RadarrReleaseDownloadBody,
 };
+use crate::models::servarr_data::Notification;
 use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
 use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
 use crate::models::stateful_table::StatefulTable;
@@ -85,9 +86,27 @@ impl Network<'_, '_> {
       .request_props_from(event, RequestMethod::Post, Some(params), None, None)
       .await;
 
-    self
-      .handle_request::<RadarrReleaseDownloadBody, Value>(request_props, |_, _| ())
-      .await
+    let result = self
+      .handle_request::<RadarrReleaseDownloadBody, Value>(request_props, |_, mut app| {
+        app.notification = Some(Notification::new(
+          "Download Result".to_owned(),
+          "Download request sent successfully".to_owned(),
+          true,
+        ));
+      })
+      .await;
+
+    if result.is_err() {
+      let mut app = self.app.lock().await;
+      std::mem::take(&mut app.error.text);
+      app.notification = Some(Notification::new(
+        "Download Failed".to_owned(),
+        "Download request failed. Check the logs for more details.".to_owned(),
+        false,
+      ));
+    }
+
+    result
   }
 
   pub(in crate::network::radarr_network) async fn edit_movie(

src/network/radarr_network/library/radarr_library_network_tests.rs

@@ -4,6 +4,7 @@ mod tests {
     AddMovieBody, AddMovieOptions, Credit, DeleteMovieParams, DownloadRecord, EditMovieParams,
     MinimumAvailability, Movie, MovieHistoryItem, MovieMonitor, RadarrReleaseDownloadBody,
   };
+  use crate::models::servarr_data::Notification;
   use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
   use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
   use crate::models::stateful_table::SortOption;
@@ -164,14 +165,58 @@ mod tests {
       .await;
     let mut network = test_network(&app);
 
-    assert!(
-      network
-        .handle_radarr_event(RadarrEvent::DownloadRelease(expected_body))
-        .await
-        .is_ok()
-    );
+    let result = network
+      .handle_radarr_event(RadarrEvent::DownloadRelease(expected_body))
+      .await;
 
     mock.assert_async().await;
+    assert_ok!(result);
+    assert_some_eq_x!(
+      &app.lock().await.notification,
+      &Notification::new(
+        "Download Result".to_owned(),
+        "Download request sent successfully".to_owned(),
+        true,
+      )
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_download_radarr_release_event_sets_failure_notification_on_error() {
+    let expected_body = RadarrReleaseDownloadBody {
+      guid: "1234".to_owned(),
+      indexer_id: 2,
+      movie_id: 1,
+    };
+    let body = json!({
+      "guid": "1234",
+      "indexerId": 2,
+      "movieId": 1
+    });
+    let (mock, app, _server) = MockServarrApi::post()
+      .with_request_body(body)
+      .returns(json!({}))
+      .status(500)
+      .build_for(RadarrEvent::DownloadRelease(expected_body.clone()))
+      .await;
+    let mut network = test_network(&app);
+
+    let result = network
+      .handle_radarr_event(RadarrEvent::DownloadRelease(expected_body))
+      .await;
+
+    mock.assert_async().await;
+    assert_err!(result);
+    let app = app.lock().await;
+    assert_is_empty!(app.error.text);
+    assert_some_eq_x!(
+      &app.notification,
+      &Notification::new(
+        "Download Failed".to_owned(),
+        "Download request failed. Check the logs for more details.".to_owned(),
+        false,
+      )
+    );
   }
 
   #[tokio::test]

src/network/sonarr_network/library/mod.rs

@@ -1,3 +1,4 @@
+use crate::models::servarr_data::Notification;
 use crate::models::sonarr_models::SonarrReleaseDownloadBody;
 use crate::network::sonarr_network::SonarrEvent;
 use crate::network::{Network, RequestMethod};
@@ -31,8 +32,26 @@ impl Network<'_, '_> {
       )
       .await;
 
-    self
-      .handle_request::<SonarrReleaseDownloadBody, Value>(request_props, |_, _| ())
-      .await
+    let result = self
+      .handle_request::<SonarrReleaseDownloadBody, Value>(request_props, |_, mut app| {
+        app.notification = Some(Notification::new(
+          "Download Result".to_owned(),
+          "Download request sent successfully".to_owned(),
+          true,
+        ));
+      })
+      .await;
+
+    if result.is_err() {
+      let mut app = self.app.lock().await;
+      std::mem::take(&mut app.error.text);
+      app.notification = Some(Notification::new(
+        "Download Failed".to_owned(),
+        "Download request failed. Check the logs for more details.".to_owned(),
+        false,
+      ));
+    }
+
+    result
   }
 }

src/network/sonarr_network/library/sonarr_library_network_tests.rs

@@ -1,8 +1,10 @@
 #[cfg(test)]
 mod tests {
+  use crate::models::servarr_data::Notification;
   use crate::models::sonarr_models::SonarrReleaseDownloadBody;
-  use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
+  use crate::network::network_tests::test_utils::{test_network, MockServarrApi};
   use crate::network::sonarr_network::SonarrEvent;
+  use pretty_assertions::assert_eq;
   use serde_json::json;
 
   #[tokio::test]
@@ -33,5 +35,54 @@ mod tests {
 
     mock.assert_async().await;
     assert_ok!(result);
+    assert_eq!(
+      app.lock().await.notification,
+      Some(Notification::new(
+        "Download Result".to_owned(),
+        "Download request sent successfully".to_owned(),
+        true,
+      ))
+    );
+  }
+
+  #[tokio::test]
+  async fn test_handle_download_sonarr_release_event_sets_failure_notification_on_error() {
+    let params = SonarrReleaseDownloadBody {
+      guid: "1234".to_owned(),
+      indexer_id: 2,
+      series_id: Some(1),
+      ..SonarrReleaseDownloadBody::default()
+    };
+
+    let (mock, app, _server) = MockServarrApi::post()
+      .with_request_body(json!({
+        "guid": "1234",
+        "indexerId": 2,
+        "seriesId": 1,
+      }))
+      .returns(json!({}))
+      .status(500)
+      .build_for(SonarrEvent::DownloadRelease(params.clone()))
+      .await;
+
+    app.lock().await.server_tabs.next();
+    let mut network = test_network(&app);
+
+    let result = network
+      .handle_sonarr_event(SonarrEvent::DownloadRelease(params))
+      .await;
+
+    mock.assert_async().await;
+    assert_err!(result);
+    let app = app.lock().await;
+    assert_is_empty!(app.error.text);
+    assert_some_eq_x!(
+      &app.notification,
+      &Notification::new(
+        "Download Failed".to_owned(),
+        "Download request failed. Check the logs for more details.".to_owned(),
+        false,
+      )
+    );
   }
 }