Fixed rustfmt issues

This commit is contained in:
2024-10-30 15:43:53 -06:00
parent ce45d9d803
commit e055efd596
4 changed files with 45 additions and 27 deletions
+15 -11
View File
@@ -20,7 +20,7 @@ mod add_command_handler_tests;
#[derive(Debug, Clone, PartialEq, Eq, Subcommand)]
pub enum RadarrAddCommand {
#[command(about = "Add a new movie to your Radarr library")]
#[command(about = "Add a new movie to your Radarr library")]
Movie {
#[arg(
long,
@@ -50,22 +50,22 @@ pub enum RadarrAddCommand {
#[arg(long, help = "Should Radarr monitor this film")]
disable_monitoring: bool,
#[arg(
long,
long,
help = "Tag IDs to tag the film with",
value_parser,
value_parser,
action = ArgAction::Append
)]
tag: Vec<i64>,
#[arg(
long,
long,
help = "What Radarr should monitor",
value_enum,
value_enum,
default_value_t = Monitor::default()
)]
monitor: Monitor,
#[arg(
long,
help = "Tell Radarr to not start a search for this film once it's added to your library",
help = "Tell Radarr to not start a search for this film once it's added to your library"
)]
no_search_for_movie: bool,
},
@@ -77,14 +77,14 @@ pub enum RadarrAddCommand {
#[command(about = "Add new tag")]
Tag {
#[arg(long, help = "The name of the tag to be added", required = true)]
name: String
name: String,
},
}
impl From<RadarrAddCommand> for Command {
fn from(value: RadarrAddCommand) -> Self {
Command::Radarr(RadarrCommand::Add(value))
}
fn from(value: RadarrAddCommand) -> Self {
Command::Radarr(RadarrCommand::Add(value))
}
}
pub(super) struct RadarrAddCommandHandler<'a, 'b> {
@@ -94,7 +94,11 @@ pub(super) struct RadarrAddCommandHandler<'a, 'b> {
}
impl<'a, 'b> CliCommandHandler<'a, 'b, RadarrAddCommand> for RadarrAddCommandHandler<'a, 'b> {
fn with(_app: &'a Arc<Mutex<App<'b>>>, command: RadarrAddCommand, network: &'a mut dyn NetworkTrait) -> Self {
fn with(
_app: &'a Arc<Mutex<App<'b>>>,
command: RadarrAddCommand,
network: &'a mut dyn NetworkTrait,
) -> Self {
RadarrAddCommandHandler {
_app,
command,
@@ -7,9 +7,11 @@ mod tests {
use strum::IntoEnumIterator;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
use crate::ui::radarr_ui::library::movie_details_ui::{decorate_peer_style, MovieDetailsUi, style_from_download_status};
use crate::ui::DrawUi;
use crate::ui::radarr_ui::library::movie_details_ui::{
decorate_peer_style, style_from_download_status, MovieDetailsUi,
};
use crate::ui::styles::ManagarrStyle;
use crate::ui::DrawUi;
#[test]
fn test_movie_details_ui_accepts() {
@@ -21,7 +23,7 @@ mod tests {
}
});
}
#[rstest]
#[case("Downloading", true, "", Style::new().downloading())]
#[case("Downloaded", true, "", Style::new().downloaded())]
@@ -36,9 +38,12 @@ mod tests {
#[case] movie_status: &str,
#[case] expected_style: Style,
) {
assert_eq!(style_from_download_status(download_status, is_monitored, movie_status.to_owned()), expected_style);
assert_eq!(
style_from_download_status(download_status, is_monitored, movie_status.to_owned()),
expected_style
);
}
#[rstest]
#[case(0, 0, PeerStyle::Failure)]
#[case(1, 2, PeerStyle::Warning)]
@@ -50,12 +55,21 @@ mod tests {
) {
let text = Text::from("test");
match expected_style {
PeerStyle::Failure => assert_eq!(decorate_peer_style(seeders, leechers, text.clone()), text.failure()),
PeerStyle::Warning => assert_eq!(decorate_peer_style(seeders, leechers, text.clone()), text.warning()),
PeerStyle::Success => assert_eq!(decorate_peer_style(seeders, leechers, text.clone()), text.success()),
PeerStyle::Failure => assert_eq!(
decorate_peer_style(seeders, leechers, text.clone()),
text.failure()
),
PeerStyle::Warning => assert_eq!(
decorate_peer_style(seeders, leechers, text.clone()),
text.warning()
),
PeerStyle::Success => assert_eq!(
decorate_peer_style(seeders, leechers, text.clone()),
text.success()
),
}
}
enum PeerStyle {
Failure,
Warning,
+1 -1
View File
@@ -224,7 +224,7 @@ fn decorate_with_row_style<'a>(
if !movie.monitored {
return row.unmonitored_missing();
}
if movie.status != "released" {
return row.unreleased();
}
+6 -6
View File
@@ -1,15 +1,15 @@
#[cfg(test)]
mod tests {
use crate::models::radarr_models::{DownloadRecord, Movie};
use pretty_assertions::assert_eq;
use ratatui::widgets::{Cell, Row};
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::models::radarr_models::{DownloadRecord, Movie};
use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
use crate::ui::radarr_ui::{decorate_with_row_style, RadarrUi};
use crate::ui::DrawUi;
use crate::ui::styles::ManagarrStyle;
use crate::ui::DrawUi;
#[test]
fn test_radarr_ui_accepts() {
@@ -17,7 +17,7 @@ mod tests {
assert!(RadarrUi::accepts(active_radarr_block.into()));
});
}
#[rstest]
#[case(false, Some("downloading"), false, "", RowStyle::Downloading)]
#[case(false, Some("completed"), false, "", RowStyle::AwaitingImport)]
@@ -50,9 +50,9 @@ mod tests {
..Movie::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_with_row_style(&downloads_vec, &movie, row.clone());
match expected_style {
RowStyle::AwaitingImport => assert_eq!(style, row.awaiting_import()),
RowStyle::Downloaded => assert_eq!(style, row.downloaded()),
@@ -63,7 +63,7 @@ mod tests {
RowStyle::Unreleased => assert_eq!(style, row.unreleased()),
}
}
enum RowStyle {
AwaitingImport,
Downloaded,