fix: Pass the download ID directly in the DeleteDownload event when publishing into the networking channel

This commit is contained in:
2024-12-17 15:14:17 -07:00
parent a308b8fe95
commit a7da73300c
6 changed files with 43 additions and 59 deletions
+5 -19
View File
@@ -40,7 +40,7 @@ pub enum RadarrEvent {
AddTag(String),
ClearBlocklist,
DeleteBlocklistItem(i64),
DeleteDownload(Option<i64>),
DeleteDownload(i64),
DeleteIndexer(Option<i64>),
DeleteMovie(Option<DeleteMovieParams>),
DeleteRootFolder(Option<i64>),
@@ -407,30 +407,16 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn delete_radarr_download(&mut self, download_id: Option<i64>) -> Result<()> {
let event = RadarrEvent::DeleteDownload(None);
let id = if let Some(dl_id) = download_id {
dl_id
} else {
self
.app
.lock()
.await
.data
.radarr_data
.downloads
.current_selection()
.id
};
info!("Deleting Radarr download for download with id: {id}");
async fn delete_radarr_download(&mut self, download_id: i64) -> Result<()> {
let event = RadarrEvent::DeleteDownload(download_id);
info!("Deleting Radarr download for download with id: {download_id}");
let request_props = self
.request_props_from(
event,
RequestMethod::Delete,
None::<()>,
Some(format!("/{id}")),
Some(format!("/{download_id}")),
None,
)
.await;
+3 -32
View File
@@ -187,7 +187,7 @@ mod test {
#[rstest]
fn test_resource_queue(
#[values(RadarrEvent::GetDownloads, RadarrEvent::DeleteDownload(None))] event: RadarrEvent,
#[values(RadarrEvent::GetDownloads, RadarrEvent::DeleteDownload(0))] event: RadarrEvent,
) {
assert_str_eq!(event.resource(), "/queue");
}
@@ -3221,36 +3221,7 @@ mod test {
None,
None,
None,
RadarrEvent::DeleteDownload(None),
Some("/1"),
None,
)
.await;
app_arc
.lock()
.await
.data
.radarr_data
.downloads
.set_items(vec![download_record()]);
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_radarr_event(RadarrEvent::DeleteDownload(None))
.await
.is_ok());
async_server.assert_async().await;
}
#[tokio::test]
async fn test_handle_delete_radarr_download_event_uses_provided_id() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
None,
None,
RadarrEvent::DeleteDownload(None),
RadarrEvent::DeleteDownload(1),
Some("/1"),
None,
)
@@ -3258,7 +3229,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_radarr_event(RadarrEvent::DeleteDownload(Some(1)))
.handle_radarr_event(RadarrEvent::DeleteDownload(1))
.await
.is_ok());