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

feat: CLI support for searching for discography releases in Lidarr

Browse Source
This commit is contained in:
Alex Clarke
2026-01-15 11:39:34 -07:00
parent d7f0dd5950
commit 8dfa664a06
13 changed files with 445 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/lidarr_network/library/artists/lidarr_artists_network_tests.rs
+83 -2
View File
@@ -2,14 +2,14 @@
mod tests {
use crate::models::lidarr_models::{
AddArtistBody, AddArtistOptions, AddArtistSearchResult, Artist, DeleteParams, EditArtistParams,
LidarrHistoryItem, LidarrSerdeable, MonitorType, NewItemMonitorType,
LidarrHistoryItem, LidarrRelease, LidarrSerdeable, MonitorType, NewItemMonitorType,
};
use crate::models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock;
use crate::models::stateful_table::{SortOption, StatefulTable};
use crate::network::NetworkResource;
use crate::network::lidarr_network::LidarrEvent;
use crate::network::lidarr_network::lidarr_network_test_utils::test_utils::{
ADD_ARTIST_SEARCH_RESULT_JSON, ARTIST_JSON, artist, lidarr_history_item,
ADD_ARTIST_SEARCH_RESULT_JSON, ARTIST_JSON, artist, lidarr_history_item, torrent_release,
};
use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
use bimap::BiMap;
@@ -393,6 +393,87 @@ mod tests {
assert_eq!(history_items, response);
}
#[tokio::test]
async fn test_handle_get_artist_discography_releases_event() {
let release_json = json!([
{
"guid": "1234",
"protocol": "torrent",
"age": 1,
"title": "Test Release",
"indexer": "kickass torrents",
"indexerId": 2,
"artistName": "Alex",
"albumTitle": "Something",
"size": 1234,
"rejected": true,
"rejections": [ "Unknown quality profile", "Release is already mapped" ],
"seeders": 2,
"leechers": 1,
"quality": { "quality": { "name": "Lossless" }},
"discography": true
},
{
"guid": "4567",
"protocol": "torrent",
"age": 1,
"title": "Test Release",
"indexer": "kickass torrents",
"indexerId": 2,
"artistName": "Alex",
"albumTitle": "Something",
"size": 1234,
"rejected": true,
"rejections": [ "Unknown quality profile", "Release is already mapped" ],
"seeders": 2,
"leechers": 1,
"quality": { "quality": { "name": "Lossless" }},
}
]);
let expected_filtered_lidarr_release = LidarrRelease {
discography: true,
..torrent_release()
};
let expected_raw_lidarr_releases = vec![
LidarrRelease {
discography: true,
..torrent_release()
},
LidarrRelease {
guid: "4567".to_owned(),
..torrent_release()
},
];
let (mock, app, _server) = MockServarrApi::get()
.returns(release_json)
.query("artistId=1")
.build_for(LidarrEvent::GetDiscographyReleases(1))
.await;
app
.lock()
.await
.data
.lidarr_data
.artists
.set_items(vec![artist()]);
app.lock().await.server_tabs.set_index(2);
let mut network = test_network(&app);
let LidarrSerdeable::Releases(releases_vec) = network
.handle_lidarr_event(LidarrEvent::GetDiscographyReleases(1))
.await
.unwrap()
else {
panic!("Expected Releases")
};
mock.assert_async().await;
assert_eq!(
app.lock().await.data.lidarr_data.discography_releases.items,
vec![expected_filtered_lidarr_release]
);
assert_eq!(releases_vec, expected_raw_lidarr_releases);
}
#[tokio::test]
async fn test_handle_toggle_artist_monitoring_event() {
let artist_json = json!({
src/network/lidarr_network/library/artists/mod.rs
+34 -1
View File
@@ -5,7 +5,7 @@ use serde_json::{Value, json};
use crate::models::Route;
use crate::models::lidarr_models::{
AddArtistBody, AddArtistSearchResult, Artist, DeleteParams, EditArtistParams, LidarrCommandBody,
LidarrHistoryItem,
LidarrHistoryItem, LidarrRelease,
};
use crate::models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock;
use crate::models::stateful_table::StatefulTable;
@@ -317,6 +317,39 @@ impl Network<'_, '_> {
.await
}
pub(in crate::network::lidarr_network) async fn get_artist_discography_releases(
&mut self,
artist_id: i64,
) -> Result<Vec<LidarrRelease>> {
let event = LidarrEvent::GetDiscographyReleases(artist_id);
info!("Fetching discography releases for artist with ID: {artist_id}");
let request_props = self
.request_props_from(
event,
RequestMethod::Get,
None::<()>,
None,
Some(format!("artistId={artist_id}")),
)
.await;
self
.handle_request::<(), Vec<LidarrRelease>>(request_props, |release_vec, mut app| {
let artist_releases_vec = release_vec
.into_iter()
.filter(|release| release.discography)
.collect();
app
.data
.lidarr_data
.discography_releases
.set_items(artist_releases_vec);
})
.await
}
pub(in crate::network::lidarr_network) async fn edit_artist(
&mut self,
mut edit_artist_params: EditArtistParams,
src/network/lidarr_network/lidarr_network_test_utils.rs
+49 -2
View File
@@ -4,8 +4,8 @@ pub mod test_utils {
use crate::models::lidarr_models::{
AddArtistSearchResult, Album, AlbumStatistics, Artist, ArtistStatistics, ArtistStatus,
DownloadRecord, DownloadStatus, DownloadsResponse, EditArtistParams, LidarrHistoryData,
LidarrHistoryEventType, LidarrHistoryItem, LidarrHistoryWrapper, LidarrTask, LidarrTaskName,
Member, MetadataProfile, NewItemMonitorType, Ratings, SystemStatus,
LidarrHistoryEventType, LidarrHistoryItem, LidarrHistoryWrapper, LidarrRelease, LidarrTask,
LidarrTaskName, Member, MetadataProfile, NewItemMonitorType, Ratings, SystemStatus,
};
use crate::models::servarr_models::IndexerSettings;
use crate::models::servarr_models::{
@@ -377,4 +377,51 @@ pub mod test_utils {
* Fixed bug 2"
))
}
pub fn rejections() -> Vec<String> {
vec![
"Unknown quality profile".to_owned(),
"Release is already mapped".to_owned(),
]
}
pub fn torrent_release() -> LidarrRelease {
LidarrRelease {
guid: "1234".to_owned(),
protocol: "torrent".to_owned(),
age: 1,
title: HorizontallyScrollableText::from("Test Release"),
discography: false,
artist_name: Some("Alex".to_owned()),
album_title: Some("Something".to_owned()),
indexer: "kickass torrents".to_owned(),
indexer_id: 2,
size: 1234,
rejected: true,
rejections: Some(rejections()),
seeders: Some(Number::from(2)),
leechers: Some(Number::from(1)),
quality: quality_wrapper(),
}
}
pub fn usenet_release() -> LidarrRelease {
LidarrRelease {
guid: "1234".to_owned(),
protocol: "usenet".to_owned(),
age: 1,
title: HorizontallyScrollableText::from("Test Release"),
discography: false,
artist_name: Some("Alex".to_owned()),
album_title: Some("Something".to_owned()),
indexer: "DrunkenSlug".to_owned(),
indexer_id: 1,
size: 1234,
rejected: true,
rejections: Some(rejections()),
seeders: None,
leechers: None,
quality: quality_wrapper(),
}
}
}
src/network/lidarr_network/lidarr_network_tests.rs
+5
View File
@@ -124,6 +124,11 @@ mod tests {
assert_str_eq!(event.resource(), "/rootfolder");
}
#[rstest]
fn test_resource_release(#[values(LidarrEvent::GetDiscographyReleases(0))] event: LidarrEvent) {
assert_str_eq!(event.resource(), "/release");
}
#[rstest]
#[case(LidarrEvent::GetDiskSpace, "/diskspace")]
#[case(LidarrEvent::GetMetadataProfiles, "/metadataprofile")]
src/network/lidarr_network/mod.rs
+6
View File
@@ -43,6 +43,7 @@ pub enum LidarrEvent {
GetArtistHistory(i64),
GetAllIndexerSettings,
GetArtistDetails(i64),
GetDiscographyReleases(i64),
GetDiskSpace,
GetDownloads(u64),
GetHistory(u64),
@@ -96,6 +97,7 @@ impl NetworkResource for LidarrEvent {
LidarrEvent::GetDownloads(_) | LidarrEvent::DeleteDownload(_) => "/queue",
LidarrEvent::GetHistory(_) => "/history",
LidarrEvent::MarkHistoryItemAsFailed(_) => "/history/failed",
LidarrEvent::GetDiscographyReleases(_) => "/release",
LidarrEvent::GetHostConfig | LidarrEvent::GetSecurityConfig => "/config/host",
LidarrEvent::GetIndexers | LidarrEvent::DeleteIndexer(_) | LidarrEvent::EditIndexer(_) => {
"/indexer"
@@ -184,6 +186,10 @@ impl Network<'_, '_> {
.get_album_details(album_id)
.await
.map(LidarrSerdeable::from),
LidarrEvent::GetDiscographyReleases(artist_id) => self
.get_artist_discography_releases(artist_id)
.await
.map(LidarrSerdeable::from),
LidarrEvent::GetDiskSpace => self.get_lidarr_diskspace().await.map(LidarrSerdeable::from),
LidarrEvent::GetDownloads(count) => self
.get_lidarr_downloads(count)