Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Pass the delete movie params in with the DeleteMovie event when publishing to the networking channel

Browse Source
This commit is contained in:
Alex Clarke
2024-12-17 15:35:29 -07:00
parent d73dfb9fc7
commit 9ea6dbec20
7 changed files with 92 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/radarr_network.rs
+7 -28
View File
@@ -42,7 +42,7 @@ pub enum RadarrEvent {
DeleteBlocklistItem(i64),
DeleteDownload(i64),
DeleteIndexer(i64),
DeleteMovie(Option<DeleteMovieParams>),
DeleteMovie(DeleteMovieParams),
DeleteRootFolder(Option<i64>),
DeleteTag(i64),
DownloadRelease(Option<RadarrReleaseDownloadBody>),
@@ -445,32 +445,19 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn delete_movie(&mut self, delete_movie_params: Option<DeleteMovieParams>) -> Result<()> {
let event = RadarrEvent::DeleteMovie(None);
let (movie_id, delete_files, add_import_exclusion) = if let Some(params) = delete_movie_params {
(
params.id,
params.delete_movie_files,
params.add_list_exclusion,
)
} else {
let (movie_id, _) = self.extract_movie_id(None).await;
let delete_files = self.app.lock().await.data.radarr_data.delete_movie_files;
let add_import_exclusion = self.app.lock().await.data.radarr_data.add_list_exclusion;
(movie_id, delete_files, add_import_exclusion)
};
info!("Deleting Radarr movie with ID: {movie_id} with deleteFiles={delete_files} and addImportExclusion={add_import_exclusion}");
async fn delete_movie(&mut self, delete_movie_params: DeleteMovieParams) -> Result<()> {
let event = RadarrEvent::DeleteMovie(delete_movie_params.clone());
let DeleteMovieParams { id, delete_movie_files, add_list_exclusion } = delete_movie_params;
info!("Deleting Radarr movie with ID: {id} with deleteFiles={delete_movie_files} and addImportExclusion={add_list_exclusion}");
let request_props = self
.request_props_from(
event,
RequestMethod::Delete,
None::<()>,
Some(format!("/{movie_id}")),
Some(format!("/{id}")),
Some(format!(
"deleteFiles={delete_files}&addImportExclusion={add_import_exclusion}"
"deleteFiles={delete_movie_files}&addImportExclusion={add_list_exclusion}"
)),
)
.await;
@@ -479,14 +466,6 @@ impl<'a, 'b> Network<'a, 'b> {
.handle_request::<(), ()>(request_props, |_, _| ())
.await;
self
.app
.lock()
.await
.data
.radarr_data
.reset_delete_movie_preferences();
resp
}
src/network/radarr_network_tests.rs
+13 -45
View File
@@ -121,7 +121,7 @@ mod test {
RadarrEvent::EditMovie(None),
RadarrEvent::GetMovies,
RadarrEvent::GetMovieDetails(None),
RadarrEvent::DeleteMovie(None)
RadarrEvent::DeleteMovie(DeleteMovieParams::default())
)]
event: RadarrEvent,
) {
@@ -3090,61 +3090,29 @@ mod test {
#[tokio::test]
async fn test_handle_delete_movie_event() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
None,
None,
RadarrEvent::DeleteMovie(None),
Some("/1"),
Some("deleteFiles=true&addImportExclusion=true"),
)
.await;
{
let mut app = app_arc.lock().await;
app.data.radarr_data.movies.set_items(vec![movie()]);
app.data.radarr_data.delete_movie_files = true;
app.data.radarr_data.add_list_exclusion = true;
}
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_radarr_event(RadarrEvent::DeleteMovie(None))
.await
.is_ok());
async_server.assert_async().await;
assert!(!app_arc.lock().await.data.radarr_data.delete_movie_files);
assert!(!app_arc.lock().await.data.radarr_data.add_list_exclusion);
}
#[tokio::test]
async fn test_handle_delete_movie_event_use_provided_params() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
None,
None,
RadarrEvent::DeleteMovie(None),
Some("/1"),
Some("deleteFiles=true&addImportExclusion=true"),
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
let delete_movie_params = DeleteMovieParams {
id: 1,
delete_movie_files: true,
add_list_exclusion: true,
};
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
None,
None,
RadarrEvent::DeleteMovie(delete_movie_params.clone()),
Some("/1"),
Some("deleteFiles=true&addImportExclusion=true"),
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_radarr_event(RadarrEvent::DeleteMovie(Some(delete_movie_params)))
.handle_radarr_event(RadarrEvent::DeleteMovie(delete_movie_params))
.await
.is_ok());
async_server.assert_async().await;
assert!(!app_arc.lock().await.data.radarr_data.delete_movie_files);
assert!(!app_arc.lock().await.data.radarr_data.add_list_exclusion);
}
#[tokio::test]