feat(cli): CLI support for adding a tag to Sonarr

This commit is contained in:
2024-11-22 15:22:45 -07:00
parent c5328917de
commit 1cc95e2cd1
5 changed files with 208 additions and 5 deletions
+3 -3
View File
@@ -132,21 +132,21 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, RadarrAddCommand> for RadarrAddCommandHan
};
let resp = self
.network
.handle_network_event((RadarrEvent::AddMovie(Some(body))).into())
.handle_network_event(RadarrEvent::AddMovie(Some(body)).into())
.await?;
serde_json::to_string_pretty(&resp)?
}
RadarrAddCommand::RootFolder { root_folder_path } => {
let resp = self
.network
.handle_network_event((RadarrEvent::AddRootFolder(Some(root_folder_path.clone()))).into())
.handle_network_event(RadarrEvent::AddRootFolder(Some(root_folder_path)).into())
.await?;
serde_json::to_string_pretty(&resp)?
}
RadarrAddCommand::Tag { name } => {
let resp = self
.network
.handle_network_event((RadarrEvent::AddTag(name.clone())).into())
.handle_network_event(RadarrEvent::AddTag(name).into())
.await?;
serde_json::to_string_pretty(&resp)?
}
+65
View File
@@ -0,0 +1,65 @@
use std::sync::Arc;
use anyhow::Result;
use clap::Subcommand;
use tokio::sync::Mutex;
use crate::{
app::App,
cli::{CliCommandHandler, Command},
network::{sonarr_network::SonarrEvent, NetworkTrait},
};
use super::SonarrCommand;
#[cfg(test)]
#[path = "add_command_handler_tests.rs"]
mod add_command_handler_tests;
#[derive(Debug, Clone, PartialEq, Eq, Subcommand)]
pub enum SonarrAddCommand {
#[command(about = "Add new tag")]
Tag {
#[arg(long, help = "The name of the tag to be added", required = true)]
name: String,
},
}
impl From<SonarrAddCommand> for Command {
fn from(value: SonarrAddCommand) -> Self {
Command::Sonarr(SonarrCommand::Add(value))
}
}
pub(super) struct SonarrAddCommandHandler<'a, 'b> {
_app: &'a Arc<Mutex<App<'b>>>,
command: SonarrAddCommand,
network: &'a mut dyn NetworkTrait,
}
impl<'a, 'b> CliCommandHandler<'a, 'b, SonarrAddCommand> for SonarrAddCommandHandler<'a, 'b> {
fn with(
_app: &'a Arc<Mutex<App<'b>>>,
command: SonarrAddCommand,
network: &'a mut dyn NetworkTrait,
) -> Self {
SonarrAddCommandHandler {
_app,
command,
network,
}
}
async fn handle(self) -> Result<String> {
let result = match self.command {
SonarrAddCommand::Tag { name } => {
let resp = self
.network
.handle_network_event(SonarrEvent::AddTag(name).into())
.await?;
serde_json::to_string_pretty(&resp)?
}
};
Ok(result)
}
}
@@ -0,0 +1,98 @@
#[cfg(test)]
mod tests {
use clap::{error::ErrorKind, CommandFactory, Parser};
use crate::{
cli::{
sonarr::{add_command_handler::SonarrAddCommand, SonarrCommand},
Command,
},
Cli,
};
#[test]
fn test_sonarr_add_command_from() {
let command = SonarrAddCommand::Tag {
name: String::new(),
};
let result = Command::from(command.clone());
assert_eq!(result, Command::Sonarr(SonarrCommand::Add(command)));
}
mod cli {
use super::*;
use pretty_assertions::assert_eq;
#[test]
fn test_add_tag_requires_arguments() {
let result = Cli::command().try_get_matches_from(["managarr", "sonarr", "add", "tag"]);
assert!(result.is_err());
assert_eq!(
result.unwrap_err().kind(),
ErrorKind::MissingRequiredArgument
);
}
#[test]
fn test_add_tag_success() {
let expected_args = SonarrAddCommand::Tag {
name: "test".to_owned(),
};
let result = Cli::try_parse_from(["managarr", "sonarr", "add", "tag", "--name", "test"]);
assert!(result.is_ok());
if let Some(Command::Sonarr(SonarrCommand::Add(add_command))) = result.unwrap().command {
assert_eq!(add_command, expected_args);
}
}
}
mod handler {
use std::sync::Arc;
use crate::{
app::App,
cli::{sonarr::add_command_handler::SonarrAddCommandHandler, CliCommandHandler},
models::{sonarr_models::SonarrSerdeable, Serdeable},
network::{sonarr_network::SonarrEvent, MockNetworkTrait, NetworkEvent},
};
use super::*;
use mockall::predicate::eq;
use serde_json::json;
use tokio::sync::Mutex;
#[tokio::test]
async fn test_handle_add_tag_command() {
let expected_tag_name = "test".to_owned();
let mut mock_network = MockNetworkTrait::new();
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
SonarrEvent::AddTag(expected_tag_name.clone()).into(),
))
.times(1)
.returning(|_| {
Ok(Serdeable::Sonarr(SonarrSerdeable::Value(
json!({"testResponse": "response"}),
)))
});
let app_arc = Arc::new(Mutex::new(App::default()));
let add_tag_command = SonarrAddCommand::Tag {
name: expected_tag_name,
};
let result = SonarrAddCommandHandler::with(&app_arc, add_tag_command, &mut mock_network)
.handle()
.await;
assert!(result.is_ok());
}
}
}
+12
View File
@@ -1,5 +1,6 @@
use std::sync::Arc;
use add_command_handler::{SonarrAddCommand, SonarrAddCommandHandler};
use anyhow::Result;
use clap::Subcommand;
use delete_command_handler::{SonarrDeleteCommand, SonarrDeleteCommandHandler};
@@ -14,6 +15,7 @@ use crate::{
use super::{CliCommandHandler, Command};
mod add_command_handler;
mod delete_command_handler;
mod get_command_handler;
mod list_command_handler;
@@ -24,6 +26,11 @@ mod sonarr_command_tests;
#[derive(Debug, Clone, PartialEq, Eq, Subcommand)]
pub enum SonarrCommand {
#[command(
subcommand,
about = "Commands to add or create new resources within your Sonarr instance"
)]
Add(SonarrAddCommand),
#[command(
subcommand,
about = "Commands to delete resources from your Sonarr instance"
@@ -92,6 +99,11 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, SonarrCommand> for SonarrCliHandler<'a, '
async fn handle(self) -> Result<String> {
let result = match self.command {
SonarrCommand::Add(add_command) => {
SonarrAddCommandHandler::with(self.app, add_command, self.network)
.handle()
.await?
}
SonarrCommand::Delete(delete_command) => {
SonarrDeleteCommandHandler::with(self.app, delete_command, self.network)
.handle()
+30 -2
View File
@@ -114,8 +114,9 @@ mod tests {
app::App,
cli::{
sonarr::{
delete_command_handler::SonarrDeleteCommand, get_command_handler::SonarrGetCommand,
list_command_handler::SonarrListCommand, SonarrCliHandler, SonarrCommand,
add_command_handler::SonarrAddCommand, delete_command_handler::SonarrDeleteCommand,
get_command_handler::SonarrGetCommand, list_command_handler::SonarrListCommand,
SonarrCliHandler, SonarrCommand,
},
CliCommandHandler,
},
@@ -215,6 +216,33 @@ mod tests {
assert!(result.is_ok());
}
#[tokio::test]
async fn test_sonarr_cli_handler_delegates_add_commands_to_the_add_command_handler() {
let expected_tag_name = "test".to_owned();
let mut mock_network = MockNetworkTrait::new();
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
SonarrEvent::AddTag(expected_tag_name.clone()).into(),
))
.times(1)
.returning(|_| {
Ok(Serdeable::Sonarr(SonarrSerdeable::Value(
json!({"testResponse": "response"}),
)))
});
let app_arc = Arc::new(Mutex::new(App::default()));
let add_tag_command = SonarrCommand::Add(SonarrAddCommand::Tag {
name: expected_tag_name,
});
let result = SonarrCliHandler::with(&app_arc, add_tag_command, &mut mock_network)
.handle()
.await;
assert!(result.is_ok());
}
#[tokio::test]
async fn test_sonarr_cli_handler_delegates_delete_commands_to_the_delete_command_handler() {
let expected_blocklist_item_id = 1;