feat: CLI support for listing artists

This commit is contained in:
2026-01-05 10:58:48 -07:00
parent 368f7505ff
commit 5d09b2402c
14 changed files with 405 additions and 15 deletions
+70
View File
@@ -0,0 +1,70 @@
use anyhow::Result;
use log::info;
use super::{Network, NetworkEvent, NetworkResource};
use crate::{
models::lidarr_models::{Artist, LidarrSerdeable},
network::RequestMethod,
};
#[derive(Debug, Eq, PartialEq, Clone)]
pub enum LidarrEvent {
HealthCheck,
ListArtists,
}
impl NetworkResource for LidarrEvent {
fn resource(&self) -> &'static str {
match &self {
LidarrEvent::HealthCheck => "/health",
LidarrEvent::ListArtists => "/artist",
}
}
}
impl From<LidarrEvent> for NetworkEvent {
fn from(lidarr_event: LidarrEvent) -> Self {
NetworkEvent::Lidarr(lidarr_event)
}
}
impl Network<'_, '_> {
pub async fn handle_lidarr_event(
&mut self,
lidarr_event: LidarrEvent,
) -> Result<LidarrSerdeable> {
match lidarr_event {
LidarrEvent::HealthCheck => self
.get_lidarr_healthcheck()
.await
.map(LidarrSerdeable::from),
LidarrEvent::ListArtists => self.list_artists().await.map(LidarrSerdeable::from),
}
}
async fn get_lidarr_healthcheck(&mut self) -> Result<()> {
info!("Performing Lidarr health check");
let event = LidarrEvent::HealthCheck;
let request_props = self
.request_props_from(event, RequestMethod::Get, None::<()>, None, None)
.await;
self
.handle_request::<(), ()>(request_props, |_, _| ())
.await
}
async fn list_artists(&mut self) -> Result<Vec<Artist>> {
info!("Fetching Lidarr artists");
let event = LidarrEvent::ListArtists;
let request_props = self
.request_props_from(event, RequestMethod::Get, None::<()>, None, None)
.await;
self
.handle_request::<(), Vec<Artist>>(request_props, |_, _| ())
.await
}
}
+14 -5
View File
@@ -8,6 +8,7 @@ use regex::Regex;
use reqwest::{Client, RequestBuilder};
use serde::Serialize;
use serde::de::DeserializeOwned;
use lidarr_network::LidarrEvent;
use sonarr_network::SonarrEvent;
use strum_macros::Display;
use tokio::select;
@@ -21,6 +22,7 @@ use crate::network::radarr_network::RadarrEvent;
use mockall::automock;
use reqwest::header::HeaderMap;
pub mod lidarr_network;
pub mod radarr_network;
pub mod sonarr_network;
mod utils;
@@ -44,6 +46,7 @@ pub trait NetworkResource {
pub enum NetworkEvent {
Radarr(RadarrEvent),
Sonarr(SonarrEvent),
Lidarr(LidarrEvent),
}
#[derive(Clone)]
@@ -65,6 +68,10 @@ impl NetworkTrait for Network<'_, '_> {
.handle_sonarr_event(sonarr_event)
.await
.map(Serdeable::from),
NetworkEvent::Lidarr(lidarr_event) => self
.handle_lidarr_event(lidarr_event)
.await
.map(Serdeable::from),
};
let mut app = self.app.lock().await;
@@ -229,12 +236,14 @@ impl<'a, 'b> Network<'a, 'b> {
.get_active_config()
.as_ref()
.expect("Servarr config is undefined");
let default_port = match network_event.into() {
NetworkEvent::Radarr(_) => 7878,
NetworkEvent::Sonarr(_) => 8989,
let network_event_type = network_event.into();
let (default_port, api_version) = match &network_event_type {
NetworkEvent::Radarr(_) => (7878, "v3"),
NetworkEvent::Sonarr(_) => (8989, "v3"),
NetworkEvent::Lidarr(_) => (8686, "v1"),
};
let mut uri = if let Some(servarr_uri) = uri {
format!("{servarr_uri}/api/v3{resource}")
format!("{servarr_uri}/api/{api_version}{resource}")
} else {
let protocol = if ssl_cert_path.is_some() {
"https"
@@ -243,7 +252,7 @@ impl<'a, 'b> Network<'a, 'b> {
};
let host = host.as_ref().unwrap();
format!(
"{protocol}://{host}:{}/api/v3{resource}",
"{protocol}://{host}:{}/api/{api_version}{resource}",
port.unwrap_or(default_port)
)
};