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

feat: Initial Lidarr support for searching for new artists

Browse Source
This commit is contained in:
Alex Clarke
2026-01-07 15:53:18 -07:00
parent d3947d9e15
commit 243de47cae
37 changed files with 1646 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/lidarr_network/library/lidarr_library_network_tests.rs
+85 -2
View File
@@ -1,11 +1,15 @@
#[cfg(test)]
mod tests {
use crate::models::lidarr_models::{
Artist, DeleteArtistParams, EditArtistParams, LidarrSerdeable, NewItemMonitorType,
AddArtistSearchResult, Artist, DeleteArtistParams, EditArtistParams, LidarrSerdeable,
NewItemMonitorType,
};
use crate::models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock;
use crate::network::NetworkResource;
use crate::network::lidarr_network::LidarrEvent;
use crate::network::lidarr_network::lidarr_network_test_utils::test_utils::ARTIST_JSON;
use crate::network::lidarr_network::lidarr_network_test_utils::test_utils::{
ADD_ARTIST_SEARCH_RESULT_JSON, ARTIST_JSON,
};
use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
use bimap::BiMap;
use mockito::Matcher;
@@ -356,4 +360,83 @@ mod tests {
async_details_server.assert_async().await;
async_edit_server.assert_async().await;
}
#[tokio::test]
async fn test_handle_search_new_artist_event() {
let search_results_json =
json!([serde_json::from_str::<Value>(ADD_ARTIST_SEARCH_RESULT_JSON).unwrap()]);
let expected_results: Vec<AddArtistSearchResult> =
serde_json::from_value(search_results_json.clone()).unwrap();
let (mock, app, _server) = MockServarrApi::get()
.returns(search_results_json)
.query("term=test%20artist")
.build_for(LidarrEvent::SearchNewArtist("test artist".to_owned()))
.await;
app.lock().await.server_tabs.set_index(2);
let mut network = test_network(&app);
let result = network
.handle_lidarr_event(LidarrEvent::SearchNewArtist("test artist".to_owned()))
.await;
mock.assert_async().await;
let LidarrSerdeable::AddArtistSearchResults(search_results) = result.unwrap() else {
panic!("Expected AddArtistSearchResults");
};
assert_eq!(search_results, expected_results);
assert_some!(&app.lock().await.data.lidarr_data.add_searched_artists);
}
#[tokio::test]
async fn test_handle_search_new_artist_event_navigates_to_empty_results_when_empty() {
let (mock, app, _server) = MockServarrApi::get()
.returns(json!([]))
.query("term=nonexistent")
.build_for(LidarrEvent::SearchNewArtist("nonexistent".to_owned()))
.await;
app.lock().await.server_tabs.set_index(2);
app
.lock()
.await
.push_navigation_stack(ActiveLidarrBlock::AddArtistSearchResults.into());
let mut network = test_network(&app);
let result = network
.handle_lidarr_event(LidarrEvent::SearchNewArtist("nonexistent".to_owned()))
.await;
mock.assert_async().await;
assert_ok!(result);
let app = app.lock().await;
assert_none!(&app.data.lidarr_data.add_searched_artists);
assert_eq!(
app.get_current_route(),
ActiveLidarrBlock::AddArtistEmptySearchResults.into()
);
}
#[tokio::test]
async fn test_handle_search_new_artist_event_sets_empty_table_on_api_error() {
let (mock, app, _server) = MockServarrApi::get()
.status(500)
.query("term=nonexistent")
.build_for(LidarrEvent::SearchNewArtist("nonexistent".to_owned()))
.await;
app.lock().await.server_tabs.set_index(2);
let mut network = test_network(&app);
let result = network
.handle_lidarr_event(LidarrEvent::SearchNewArtist("nonexistent".to_owned()))
.await;
mock.assert_async().await;
assert_err!(result);
let app = app.lock().await;
assert_some!(&app.data.lidarr_data.add_searched_artists);
assert_is_empty!(app.data.lidarr_data.add_searched_artists.as_ref().unwrap());
}
}
src/network/lidarr_network/library/mod.rs
+45 -1
View File
@@ -3,11 +3,15 @@ use log::{debug, info, warn};
use serde_json::{Value, json};
use crate::models::Route;
use crate::models::lidarr_models::{Artist, DeleteArtistParams, EditArtistParams};
use crate::models::lidarr_models::{
AddArtistSearchResult, Artist, DeleteArtistParams, EditArtistParams,
};
use crate::models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock;
use crate::models::servarr_models::CommandBody;
use crate::models::stateful_table::StatefulTable;
use crate::network::lidarr_network::LidarrEvent;
use crate::network::{Network, RequestMethod};
use urlencoding::encode;
#[cfg(test)]
#[path = "lidarr_library_network_tests.rs"]
@@ -169,6 +173,46 @@ impl Network<'_, '_> {
.await
}
pub(in crate::network::lidarr_network) async fn search_artist(
&mut self,
query: String,
) -> Result<Vec<AddArtistSearchResult>> {
info!("Searching for artist: {query}");
let event = LidarrEvent::SearchNewArtist(String::new());
let request_props = self
.request_props_from(
event,
RequestMethod::Get,
None::<()>,
None,
Some(format!("term={}", encode(&query))),
)
.await;
let result = self
.handle_request::<(), Vec<AddArtistSearchResult>>(request_props, |artist_vec, mut app| {
if artist_vec.is_empty() {
app.pop_and_push_navigation_stack(ActiveLidarrBlock::AddArtistEmptySearchResults.into());
} else if let Some(add_searched_artists) =
app.data.lidarr_data.add_searched_artists.as_mut()
{
add_searched_artists.set_items(artist_vec);
} else {
let mut add_searched_artists = StatefulTable::default();
add_searched_artists.set_items(artist_vec);
app.data.lidarr_data.add_searched_artists = Some(add_searched_artists);
}
})
.await;
if result.is_err() {
self.app.lock().await.data.lidarr_data.add_searched_artists = Some(StatefulTable::default());
}
result
}
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
+28 -3
View File
@@ -1,16 +1,28 @@
#[cfg(test)]
#[allow(dead_code)] // TODO: maybe remove?
#[allow(dead_code)]
pub mod test_utils {
use crate::models::HorizontallyScrollableText;
use crate::models::lidarr_models::{
Artist, ArtistStatistics, ArtistStatus, DownloadRecord, DownloadStatus, DownloadsResponse,
EditArtistParams, Member, MetadataProfile, NewItemMonitorType, Ratings, SystemStatus,
AddArtistSearchResult, Artist, ArtistStatistics, ArtistStatus, DownloadRecord, DownloadStatus,
DownloadsResponse, EditArtistParams, Member, MetadataProfile, NewItemMonitorType, Ratings,
SystemStatus,
};
use crate::models::servarr_models::{QualityProfile, RootFolder, Tag};
use bimap::BiMap;
use chrono::DateTime;
use serde_json::Number;
pub const ADD_ARTIST_SEARCH_RESULT_JSON: &str = r#"{
"foreignArtistId": "test-foreign-id",
"artistName": "Test Artist",
"status": "continuing",
"overview": "some interesting description of the artist",
"artistType": "Person",
"disambiguation": "American pianist",
"genres": ["soundtrack"],
"ratings": { "votes": 15, "value": 8.4 }
}"#;
pub const ARTIST_JSON: &str = r#"{
"id": 1,
"artistName": "Test Artist",
@@ -174,4 +186,17 @@ pub mod test_utils {
clear_tags: false,
}
}
pub fn add_artist_search_result() -> AddArtistSearchResult {
AddArtistSearchResult {
foreign_artist_id: "test-foreign-id".to_owned(),
artist_name: "Test Artist".into(),
status: ArtistStatus::Continuing,
overview: Some("some interesting description of the artist".to_owned()),
artist_type: Some("Person".to_owned()),
disambiguation: Some("American pianist".to_owned()),
genres: vec!["soundtrack".to_owned()],
ratings: Some(ratings()),
}
}
}
src/network/lidarr_network/mod.rs
+5
View File
@@ -39,6 +39,7 @@ pub enum LidarrEvent {
GetTags,
HealthCheck,
ListArtists,
SearchNewArtist(String),
ToggleArtistMonitoring(i64),
UpdateAllArtists,
}
@@ -61,6 +62,7 @@ impl NetworkResource for LidarrEvent {
LidarrEvent::GetRootFolders => "/rootfolder",
LidarrEvent::GetStatus => "/system/status",
LidarrEvent::HealthCheck => "/health",
LidarrEvent::SearchNewArtist(_) => "/artist/lookup",
}
}
}
@@ -121,6 +123,9 @@ impl Network<'_, '_> {
.await
.map(LidarrSerdeable::from),
LidarrEvent::ListArtists => self.list_artists().await.map(LidarrSerdeable::from),
LidarrEvent::SearchNewArtist(query) => {
self.search_artist(query).await.map(LidarrSerdeable::from)
}
LidarrEvent::ToggleArtistMonitoring(artist_id) => self
.toggle_artist_monitoring(artist_id)
.await
src/network/radarr_network/indexers/mod.rs
+8 -2
View File
@@ -406,9 +406,15 @@ impl Network<'_, '_> {
.await;
if result.is_err() {
self.app.lock().await.data.radarr_data.indexer_test_all_results = Some(StatefulTable::default());
self
.app
.lock()
.await
.data
.radarr_data
.indexer_test_all_results = Some(StatefulTable::default());
}
result
}
}
src/network/radarr_network/indexers/radarr_indexers_network_tests.rs
+5 -3
View File
@@ -940,14 +940,16 @@ mod tests {
async_server.assert_async().await;
assert_err!(result);
assert_some!(
&app
assert_some!(&app.lock().await.data.radarr_data.indexer_test_all_results);
assert_is_empty!(
app
.lock()
.await
.data
.radarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
);
assert_is_empty!(app.lock().await.data.radarr_data.indexer_test_all_results.as_ref().unwrap());
}
}
src/network/radarr_network/library/radarr_library_network_tests.rs
+9 -14
View File
@@ -981,14 +981,7 @@ mod tests {
);
async_server.assert_async().await;
assert_none!(
&app_arc
.lock()
.await
.data
.radarr_data
.add_searched_movies
);
assert_none!(&app_arc.lock().await.data.radarr_data.add_searched_movies);
assert_eq!(
app_arc.lock().await.get_current_route(),
ActiveRadarrBlock::AddMovieEmptySearchResults.into()
@@ -1005,21 +998,23 @@ mod tests {
.await;
let mut network = test_network(&app_arc);
let result = network
.handle_radarr_event(RadarrEvent::SearchNewMovie("test term".into()))
.await;
let result = network
.handle_radarr_event(RadarrEvent::SearchNewMovie("test term".into()))
.await;
async_server.assert_async().await;
assert_err!(result);
assert_some!(
&app_arc
assert_some!(&app_arc.lock().await.data.radarr_data.add_searched_movies);
assert_is_empty!(
app_arc
.lock()
.await
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
);
assert_is_empty!(app_arc.lock().await.data.radarr_data.add_searched_movies.as_ref().unwrap());
}
#[tokio::test]
src/network/sonarr_network/indexers/mod.rs
+7 -1
View File
@@ -404,7 +404,13 @@ impl Network<'_, '_> {
.await;
if result.is_err() {
self.app.lock().await.data.sonarr_data.indexer_test_all_results = Some(StatefulTable::default());
self
.app
.lock()
.await
.data
.sonarr_data
.indexer_test_all_results = Some(StatefulTable::default());
}
result
src/network/sonarr_network/indexers/sonarr_indexers_network_tests.rs
+5 -3
View File
@@ -901,12 +901,14 @@ mod tests {
async_server.assert_async().await;
assert_err!(result);
let app = app.lock().await;
assert_some!(
&app
assert_some!(&app.data.sonarr_data.indexer_test_all_results);
assert_is_empty!(
app
.data
.sonarr_data
.indexer_test_all_results
.as_ref()
.unwrap()
);
assert_is_empty!(app.data.sonarr_data.indexer_test_all_results.as_ref().unwrap());
}
}
src/network/sonarr_network/library/series/sonarr_series_network_tests.rs
+5 -14
View File
@@ -873,7 +873,6 @@ mod tests {
.query("term=test%20term")
.build_for(SonarrEvent::SearchNewSeries("test term".into()))
.await;
app.lock().await.data.sonarr_data.add_series_search = Some("test term".into());
app.lock().await.server_tabs.next();
let mut network = test_network(&app);
@@ -953,23 +952,15 @@ mod tests {
app.lock().await.server_tabs.next();
let mut network = test_network(&app);
let result =
network
.handle_sonarr_event(SonarrEvent::SearchNewSeries("test term".into()))
.await;
let result = network
.handle_sonarr_event(SonarrEvent::SearchNewSeries("test term".into()))
.await;
async_server.assert_async().await;
assert_err!(result);
let app = app.lock().await;
assert_some!(
&app
.data
.sonarr_data
.add_searched_series
);
assert_is_empty!(
app.data.sonarr_data.add_searched_series.as_ref().unwrap()
);
assert_some!(&app.data.sonarr_data.add_searched_series);
assert_is_empty!(app.data.sonarr_data.add_searched_series.as_ref().unwrap());
}
#[tokio::test]