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

fix(sonarr): Construct and pass delete series params alongside all DeleteSeries events when publishing to the networking channel

Browse Source
This commit is contained in:
Alex Clarke
2024-12-17 22:56:14 -07:00
parent acf983c07c
commit 3e36bcf307
7 changed files with 97 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/sonarr_network.rs
+12 -34
View File
@@ -47,7 +47,7 @@ pub enum SonarrEvent {
DeleteEpisodeFile(i64),
DeleteIndexer(i64),
DeleteRootFolder(i64),
DeleteSeries(Option<DeleteSeriesParams>),
DeleteSeries(DeleteSeriesParams),
DeleteTag(i64),
DownloadRelease(SonarrReleaseDownloadBody),
EditAllIndexerSettings(Option<IndexerSettings>),
@@ -554,53 +554,31 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn delete_series(
&mut self,
delete_series_params: Option<DeleteSeriesParams>,
) -> Result<()> {
let event = SonarrEvent::DeleteSeries(None);
let (series_id, delete_files, add_import_exclusion) = if let Some(params) = delete_series_params
{
(
params.id,
params.delete_series_files,
params.add_list_exclusion,
)
} else {
let (series_id, _) = self.extract_series_id(None).await;
let delete_files = self.app.lock().await.data.sonarr_data.delete_series_files;
let add_import_exclusion = self.app.lock().await.data.sonarr_data.add_list_exclusion;
async fn delete_series(&mut self, delete_series_params: DeleteSeriesParams) -> Result<()> {
let event = SonarrEvent::DeleteSeries(delete_series_params.clone());
let DeleteSeriesParams {
id,
delete_series_files,
add_list_exclusion,
} = delete_series_params;
(series_id, delete_files, add_import_exclusion)
};
info!("Deleting Sonarr series with ID: {series_id} with deleteFiles={delete_files} and addImportExclusion={add_import_exclusion}");
info!("Deleting Sonarr series with ID: {id} with deleteFiles={delete_series_files} and addImportExclusion={add_list_exclusion}");
let request_props = self
.request_props_from(
event,
RequestMethod::Delete,
None::<()>,
Some(format!("/{series_id}")),
Some(format!("/{id}")),
Some(format!(
"deleteFiles={delete_files}&addImportExclusion={add_import_exclusion}"
"deleteFiles={delete_series_files}&addImportExclusion={add_list_exclusion}"
)),
)
.await;
let resp = self
.handle_request::<(), ()>(request_props, |_, _| ())
.await;
self
.app
.lock()
.handle_request::<(), ()>(request_props, |_, _| ())
.await
.data
.sonarr_data
.reset_delete_series_preferences();
resp
}
async fn delete_sonarr_tag(&mut self, id: i64) -> Result<()> {
src/network/sonarr_network_tests.rs
+13 -45
View File
@@ -162,7 +162,7 @@ mod test {
SonarrEvent::AddSeries(AddSeriesBody::default()),
SonarrEvent::ListSeries,
SonarrEvent::GetSeriesDetails(None),
SonarrEvent::DeleteSeries(None),
SonarrEvent::DeleteSeries(DeleteSeriesParams::default()),
SonarrEvent::EditSeries(None),
SonarrEvent::ToggleSeasonMonitoring(None)
)]
@@ -665,61 +665,29 @@ mod test {
#[tokio::test]
async fn test_handle_delete_series_event() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
None,
None,
SonarrEvent::DeleteSeries(None),
Some("/1"),
Some("deleteFiles=true&addImportExclusion=true"),
)
.await;
{
let mut app = app_arc.lock().await;
app.data.sonarr_data.series.set_items(vec![series()]);
app.data.sonarr_data.delete_series_files = true;
app.data.sonarr_data.add_list_exclusion = true;
}
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::DeleteSeries(None))
.await
.is_ok());
async_server.assert_async().await;
assert!(!app_arc.lock().await.data.sonarr_data.delete_series_files);
assert!(!app_arc.lock().await.data.sonarr_data.add_list_exclusion);
}
#[tokio::test]
async fn test_handle_delete_series_event_use_provided_params() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
None,
None,
SonarrEvent::DeleteSeries(None),
Some("/1"),
Some("deleteFiles=true&addImportExclusion=true"),
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
let delete_series_params = DeleteSeriesParams {
id: 1,
delete_series_files: true,
add_list_exclusion: true,
};
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
None,
None,
SonarrEvent::DeleteSeries(delete_series_params.clone()),
Some("/1"),
Some("deleteFiles=true&addImportExclusion=true"),
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::DeleteSeries(Some(delete_series_params)))
.handle_sonarr_event(SonarrEvent::DeleteSeries(delete_series_params))
.await
.is_ok());
async_server.assert_async().await;
assert!(!app_arc.lock().await.data.sonarr_data.delete_series_files);
assert!(!app_arc.lock().await.data.sonarr_data.add_list_exclusion);
}
#[tokio::test]