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

feat(sonarr): Added blocklist commands (List, Clear, Delete)

Browse Source
This commit is contained in:
Alex Clarke
2024-11-11 13:45:32 -07:00
parent 60d61b9e31
commit 1ca9265a2a
15 changed files with 725 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/radarr_network.rs
+10 -7
View File
@@ -145,9 +145,12 @@ impl<'a, 'b> Network<'a, 'b> {
self.add_root_folder(path).await.map(RadarrSerdeable::from)
}
RadarrEvent::AddTag(tag) => self.add_tag(tag).await.map(RadarrSerdeable::from),
RadarrEvent::ClearBlocklist => self.clear_blocklist().await.map(RadarrSerdeable::from),
RadarrEvent::ClearBlocklist => self
.clear_radarr_blocklist()
.await
.map(RadarrSerdeable::from),
RadarrEvent::DeleteBlocklistItem(blocklist_item_id) => self
.delete_blocklist_item(blocklist_item_id)
.delete_radarr_blocklist_item(blocklist_item_id)
.await
.map(RadarrSerdeable::from),
RadarrEvent::DeleteDownload(download_id) => self
@@ -186,7 +189,7 @@ impl<'a, 'b> Network<'a, 'b> {
.get_all_indexer_settings()
.await
.map(RadarrSerdeable::from),
RadarrEvent::GetBlocklist => self.get_blocklist().await.map(RadarrSerdeable::from),
RadarrEvent::GetBlocklist => self.get_radarr_blocklist().await.map(RadarrSerdeable::from),
RadarrEvent::GetCollections => self.get_collections().await.map(RadarrSerdeable::from),
RadarrEvent::GetDownloads => self.get_downloads().await.map(RadarrSerdeable::from),
RadarrEvent::GetHostConfig => self.get_host_config().await.map(RadarrSerdeable::from),
@@ -421,7 +424,7 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn clear_blocklist(&mut self) -> Result<()> {
async fn clear_radarr_blocklist(&mut self) -> Result<()> {
info!("Clearing Radarr blocklist");
let event = RadarrEvent::ClearBlocklist;
@@ -452,7 +455,7 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn delete_blocklist_item(&mut self, blocklist_item_id: Option<i64>) -> Result<()> {
async fn delete_radarr_blocklist_item(&mut self, blocklist_item_id: Option<i64>) -> Result<()> {
let event = RadarrEvent::DeleteBlocklistItem(None);
let id = if let Some(b_id) = blocklist_item_id {
b_id
@@ -1244,8 +1247,8 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn get_blocklist(&mut self) -> Result<BlocklistResponse> {
info!("Fetching blocklist");
async fn get_radarr_blocklist(&mut self) -> Result<BlocklistResponse> {
info!("Fetching Radarr blocklist");
let event = RadarrEvent::GetBlocklist;
let request_props = self
src/network/radarr_network_tests.rs
+3 -3
View File
@@ -1679,7 +1679,7 @@ mod test {
#[rstest]
#[tokio::test]
async fn test_handle_get_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
async fn test_handle_get_radarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
let blocklist_json = json!({"records": [{
"id": 123,
"movieId": 1007,
@@ -3134,7 +3134,7 @@ mod test {
}
#[tokio::test]
async fn test_handle_clear_blocklist_event() {
async fn test_handle_clear_radarr_blocklist_event() {
let blocklist_items = vec![
BlocklistItem {
id: 1,
@@ -3178,7 +3178,7 @@ mod test {
}
#[tokio::test]
async fn test_handle_delete_blocklist_item_event() {
async fn test_handle_delete_radarr_blocklist_item_event() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
src/network/sonarr_network.rs
+104
View File
@@ -1,9 +1,11 @@
use anyhow::Result;
use log::info;
use serde_json::{json, Value};
use crate::{
models::{
servarr_data::sonarr::sonarr_data::ActiveSonarrBlock,
sonarr_models::BlocklistResponse,
sonarr_models::{Series, SonarrSerdeable, SystemStatus},
Route,
},
@@ -17,6 +19,9 @@ mod sonarr_network_tests;
#[derive(Debug, Eq, PartialEq, Clone)]
pub enum SonarrEvent {
ClearBlocklist,
DeleteBlocklistItem(Option<i64>),
GetBlocklist,
GetStatus,
HealthCheck,
ListSeries,
@@ -25,6 +30,9 @@ pub enum SonarrEvent {
impl NetworkResource for SonarrEvent {
fn resource(&self) -> &'static str {
match &self {
SonarrEvent::ClearBlocklist => "/blocklist/bulk",
SonarrEvent::DeleteBlocklistItem(_) => "/blocklist",
SonarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
SonarrEvent::GetStatus => "/system/status",
SonarrEvent::HealthCheck => "/health",
SonarrEvent::ListSeries => "/series",
@@ -44,6 +52,15 @@ impl<'a, 'b> Network<'a, 'b> {
sonarr_event: SonarrEvent,
) -> Result<SonarrSerdeable> {
match sonarr_event {
SonarrEvent::ClearBlocklist => self
.clear_sonarr_blocklist()
.await
.map(SonarrSerdeable::from),
SonarrEvent::DeleteBlocklistItem(blocklist_item_id) => self
.delete_sonarr_blocklist_item(blocklist_item_id)
.await
.map(SonarrSerdeable::from),
SonarrEvent::GetBlocklist => self.get_sonarr_blocklist().await.map(SonarrSerdeable::from),
SonarrEvent::GetStatus => self.get_sonarr_status().await.map(SonarrSerdeable::from),
SonarrEvent::HealthCheck => self
.get_sonarr_healthcheck()
@@ -53,6 +70,70 @@ impl<'a, 'b> Network<'a, 'b> {
}
}
async fn clear_sonarr_blocklist(&mut self) -> Result<()> {
info!("Clearing Sonarr blocklist");
let event = SonarrEvent::ClearBlocklist;
let ids = self
.app
.lock()
.await
.data
.sonarr_data
.blocklist
.items
.iter()
.map(|item| item.id)
.collect::<Vec<i64>>();
let request_props = self
.request_props_from(
event,
RequestMethod::Delete,
Some(json!({"ids": ids})),
None,
None,
)
.await;
self
.handle_request::<Value, ()>(request_props, |_, _| ())
.await
}
async fn delete_sonarr_blocklist_item(&mut self, blocklist_item_id: Option<i64>) -> Result<()> {
let event = SonarrEvent::DeleteBlocklistItem(None);
let id = if let Some(b_id) = blocklist_item_id {
b_id
} else {
self
.app
.lock()
.await
.data
.sonarr_data
.blocklist
.current_selection()
.id
};
info!("Deleting Sonarr blocklist item for item with id: {id}");
let request_props = self
.request_props_from(
event,
RequestMethod::Delete,
None::<()>,
Some(format!("/{id}")),
None,
)
.await;
self
.handle_request::<(), ()>(request_props, |_, _| ())
.await
}
async fn get_sonarr_healthcheck(&mut self) -> Result<()> {
info!("Performing Sonarr health check");
let event = SonarrEvent::HealthCheck;
@@ -66,6 +147,29 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn get_sonarr_blocklist(&mut self) -> Result<BlocklistResponse> {
info!("Fetching Sonarr blocklist");
let event = SonarrEvent::GetBlocklist;
let request_props = self
.request_props_from(event, RequestMethod::Get, None::<()>, None, None)
.await;
self
.handle_request::<(), BlocklistResponse>(request_props, |blocklist_resp, mut app| {
if !matches!(
app.get_current_route(),
Route::Sonarr(ActiveSonarrBlock::BlocklistSortPrompt, _)
) {
let mut blocklist_vec = blocklist_resp.records;
blocklist_vec.sort_by(|a, b| a.id.cmp(&b.id));
app.data.sonarr_data.blocklist.set_items(blocklist_vec);
app.data.sonarr_data.blocklist.apply_sorting_toggle(false);
}
})
.await
}
async fn list_series(&mut self) -> Result<Vec<Series>> {
info!("Fetching Sonarr library");
let event = SonarrEvent::ListSeries;
src/network/sonarr_network_tests.rs
+202 -1
View File
@@ -9,7 +9,9 @@ mod test {
use tokio_util::sync::CancellationToken;
use crate::models::servarr_data::sonarr::sonarr_data::ActiveSonarrBlock;
use crate::models::sonarr_models::SystemStatus;
use crate::models::sonarr_models::{BlocklistItem, Language};
use crate::models::sonarr_models::{BlocklistResponse, Quality};
use crate::models::sonarr_models::{QualityWrapper, SystemStatus};
use crate::models::{sonarr_models::SonarrSerdeable, stateful_table::SortOption};
use crate::{
@@ -73,8 +75,11 @@ mod test {
}
#[rstest]
#[case(SonarrEvent::ClearBlocklist, "/blocklist/bulk")]
#[case(SonarrEvent::DeleteBlocklistItem(None), "/blocklist")]
#[case(SonarrEvent::HealthCheck, "/health")]
#[case(SonarrEvent::GetStatus, "/system/status")]
#[case(SonarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
fn test_resource(#[case] event: SonarrEvent, #[case] expected_uri: String) {
assert_str_eq!(event.resource(), expected_uri);
}
@@ -87,6 +92,171 @@ mod test {
);
}
#[tokio::test]
async fn test_handle_clear_radarr_blocklist_event() {
let blocklist_items = vec![
BlocklistItem {
id: 1,
..blocklist_item()
},
BlocklistItem {
id: 2,
..blocklist_item()
},
BlocklistItem {
id: 3,
..blocklist_item()
},
];
let expected_request_json = json!({ "ids": [1, 2, 3]});
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
Some(expected_request_json),
None,
None,
SonarrEvent::ClearBlocklist,
None,
None,
)
.await;
app_arc
.lock()
.await
.data
.sonarr_data
.blocklist
.set_items(blocklist_items);
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::ClearBlocklist)
.await
.is_ok());
async_server.assert_async().await;
}
#[tokio::test]
async fn test_handle_delete_sonarr_blocklist_item_event() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Delete,
None,
None,
None,
SonarrEvent::DeleteBlocklistItem(None),
Some("/1"),
None,
)
.await;
app_arc
.lock()
.await
.data
.sonarr_data
.blocklist
.set_items(vec![blocklist_item()]);
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::DeleteBlocklistItem(None))
.await
.is_ok());
async_server.assert_async().await;
}
#[rstest]
#[tokio::test]
async fn test_handle_get_sonarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
let blocklist_json = json!({"records": [{
"seriesId": 1007,
"episodeIds": [42020],
"sourceTitle": "z series",
"language": { "id": 1, "name": "English" },
"quality": { "quality": { "name": "Bluray-1080p" }},
"date": "2024-02-10T07:28:45Z",
"protocol": "usenet",
"indexer": "NZBgeek (Prowlarr)",
"message": "test message",
"id": 123
},
{
"seriesId": 2001,
"episodeIds": [42018],
"sourceTitle": "A Series",
"language": { "id": 1, "name": "English" },
"quality": { "quality": { "name": "Bluray-1080p" }},
"date": "2024-02-10T07:28:45Z",
"protocol": "usenet",
"indexer": "NZBgeek (Prowlarr)",
"message": "test message",
"id": 456
}]});
let response: BlocklistResponse = serde_json::from_value(blocklist_json.clone()).unwrap();
let mut expected_blocklist = vec![
BlocklistItem {
id: 123,
series_id: 1007,
source_title: "z series".into(),
episode_ids: vec![Number::from(42020)],
..blocklist_item()
},
BlocklistItem {
id: 456,
series_id: 2001,
source_title: "A Series".into(),
episode_ids: vec![Number::from(42018)],
..blocklist_item()
},
];
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Get,
None,
Some(blocklist_json),
None,
SonarrEvent::GetBlocklist,
None,
None,
)
.await;
app_arc.lock().await.data.sonarr_data.blocklist.sort_asc = true;
if use_custom_sorting {
let cmp_fn = |a: &BlocklistItem, b: &BlocklistItem| {
a.source_title
.to_lowercase()
.cmp(&b.source_title.to_lowercase())
};
expected_blocklist.sort_by(cmp_fn);
let blocklist_sort_option = SortOption {
name: "Source Title",
cmp_fn: Some(cmp_fn),
};
app_arc
.lock()
.await
.data
.sonarr_data
.blocklist
.sorting(vec![blocklist_sort_option]);
}
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::BlocklistResponse(blocklist) = network
.handle_sonarr_event(SonarrEvent::GetBlocklist)
.await
.unwrap()
{
async_server.assert_async().await;
assert_eq!(
app_arc.lock().await.data.sonarr_data.blocklist.items,
expected_blocklist
);
assert!(app_arc.lock().await.data.sonarr_data.blocklist.sort_asc);
assert_eq!(blocklist, response);
}
}
#[tokio::test]
async fn test_handle_get_sonarr_healthcheck_event() {
let (async_server, app_arc, _server) = mock_servarr_api(
@@ -283,6 +453,37 @@ mod test {
}
}
fn blocklist_item() -> BlocklistItem {
BlocklistItem {
id: 1,
series_id: 1,
episode_ids: vec![Number::from(1)],
source_title: "Test Source Title".to_owned(),
language: language(),
quality: quality_wrapper(),
date: DateTime::from(DateTime::parse_from_rfc3339("2024-02-10T07:28:45Z").unwrap()),
protocol: "usenet".to_owned(),
indexer: "NZBgeek (Prowlarr)".to_owned(),
message: "test message".to_owned(),
}
}
fn language() -> Language {
Language {
name: "English".to_owned(),
}
}
fn quality() -> Quality {
Quality {
name: "Bluray-1080p".to_owned(),
}
}
fn quality_wrapper() -> QualityWrapper {
QualityWrapper { quality: quality() }
}
fn rating() -> Rating {
Rating {
votes: 406744,