refactor: Addressed Cargo fmt complaints
This commit is contained in:
@@ -6,9 +6,7 @@ mod tests {
|
||||
use tokio::sync::mpsc;
|
||||
|
||||
use crate::app::context_clues::{build_context_clue_string, SERVARR_CONTEXT_CLUES};
|
||||
use crate::app::{
|
||||
interpolate_env_vars, App, AppConfig, Data, ServarrConfig,
|
||||
};
|
||||
use crate::app::{interpolate_env_vars, App, AppConfig, Data, ServarrConfig};
|
||||
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, RadarrData};
|
||||
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, SonarrData};
|
||||
use crate::models::{HorizontallyScrollableText, TabRoute};
|
||||
|
||||
+16
-4
@@ -62,7 +62,7 @@ impl App<'_> {
|
||||
let name = if let Some(name) = radarr_config.name.clone() {
|
||||
name
|
||||
} else {
|
||||
idx+=1;
|
||||
idx += 1;
|
||||
format!("Radarr {}", idx)
|
||||
};
|
||||
|
||||
@@ -83,7 +83,7 @@ impl App<'_> {
|
||||
let name = if let Some(name) = sonarr_config.name.clone() {
|
||||
name
|
||||
} else {
|
||||
idx+=1;
|
||||
idx += 1;
|
||||
format!("Sonarr {}", idx)
|
||||
};
|
||||
|
||||
@@ -101,8 +101,20 @@ impl App<'_> {
|
||||
.into_iter()
|
||||
.sorted_by(|tab1, tab2| {
|
||||
Ord::cmp(
|
||||
tab1.config.as_ref().unwrap().weight.as_ref().unwrap_or(&1000),
|
||||
tab2.config.as_ref().unwrap().weight.as_ref().unwrap_or(&1000),
|
||||
tab1
|
||||
.config
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.weight
|
||||
.as_ref()
|
||||
.unwrap_or(&1000),
|
||||
tab2
|
||||
.config
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.weight
|
||||
.as_ref()
|
||||
.unwrap_or(&1000),
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
|
||||
@@ -3,12 +3,6 @@ mod tests {
|
||||
use std::sync::atomic::AtomicUsize;
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
use pretty_assertions::{assert_eq, assert_str_eq};
|
||||
use serde::de::value::Error as ValueError;
|
||||
use serde::de::value::F64Deserializer;
|
||||
use serde::de::value::I64Deserializer;
|
||||
use serde::de::IntoDeserializer;
|
||||
use serde_json::to_string;
|
||||
use crate::app::ServarrConfig;
|
||||
use crate::models::from_f64;
|
||||
use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
|
||||
@@ -16,6 +10,12 @@ mod tests {
|
||||
use crate::models::{
|
||||
BlockSelectionState, HorizontallyScrollableText, Scrollable, ScrollableText, TabRoute, TabState,
|
||||
};
|
||||
use pretty_assertions::{assert_eq, assert_str_eq};
|
||||
use serde::de::value::Error as ValueError;
|
||||
use serde::de::value::F64Deserializer;
|
||||
use serde::de::value::I64Deserializer;
|
||||
use serde::de::IntoDeserializer;
|
||||
use serde_json::to_string;
|
||||
|
||||
const BLOCKS: &[&[i32]] = &[&[11, 12], &[21, 22], &[31, 32]];
|
||||
|
||||
@@ -556,7 +556,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_select_tab_by_title_empty_tabs_returns_false() {
|
||||
let mut tab_state = TabState { tabs: vec![], index: 0 };
|
||||
let mut tab_state = TabState {
|
||||
tabs: vec![],
|
||||
index: 0,
|
||||
};
|
||||
|
||||
let result = tab_state.select_tab_by_title("Test 2");
|
||||
|
||||
@@ -598,7 +601,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_select_tab_by_config_empty_tabs_returns_false() {
|
||||
let mut tab_state = TabState { tabs: vec![], index: 0 };
|
||||
let mut tab_state = TabState {
|
||||
tabs: vec![],
|
||||
index: 0,
|
||||
};
|
||||
|
||||
let result = tab_state.select_tab_by_config(&ServarrConfig {
|
||||
host: Some("http://localhost".to_owned()),
|
||||
|
||||
@@ -264,7 +264,10 @@ mod tests {
|
||||
assert!(episode_details_modal.episode_details_tabs.tabs[0]
|
||||
.contextual_help
|
||||
.is_none());
|
||||
assert_eq!(episode_details_modal.episode_details_tabs.tabs[0].config, None);
|
||||
assert_eq!(
|
||||
episode_details_modal.episode_details_tabs.tabs[0].config,
|
||||
None
|
||||
);
|
||||
|
||||
assert_str_eq!(
|
||||
episode_details_modal.episode_details_tabs.tabs[1].title,
|
||||
@@ -282,7 +285,10 @@ mod tests {
|
||||
episode_details_modal.episode_details_tabs.tabs[1].contextual_help,
|
||||
Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
|
||||
);
|
||||
assert_eq!(episode_details_modal.episode_details_tabs.tabs[1].config, None);
|
||||
assert_eq!(
|
||||
episode_details_modal.episode_details_tabs.tabs[1].config,
|
||||
None
|
||||
);
|
||||
|
||||
assert_str_eq!(
|
||||
episode_details_modal.episode_details_tabs.tabs[2].title,
|
||||
@@ -299,7 +305,10 @@ mod tests {
|
||||
assert!(episode_details_modal.episode_details_tabs.tabs[2]
|
||||
.contextual_help
|
||||
.is_none());
|
||||
assert_eq!(episode_details_modal.episode_details_tabs.tabs[2].config, None);
|
||||
assert_eq!(
|
||||
episode_details_modal.episode_details_tabs.tabs[2].config,
|
||||
None
|
||||
);
|
||||
|
||||
assert_str_eq!(
|
||||
episode_details_modal.episode_details_tabs.tabs[3].title,
|
||||
@@ -317,7 +326,10 @@ mod tests {
|
||||
episode_details_modal.episode_details_tabs.tabs[3].contextual_help,
|
||||
Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
|
||||
);
|
||||
assert_eq!(episode_details_modal.episode_details_tabs.tabs[3].config, None);
|
||||
assert_eq!(
|
||||
episode_details_modal.episode_details_tabs.tabs[3].config,
|
||||
None
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -350,7 +362,10 @@ mod tests {
|
||||
&SEASON_DETAILS_CONTEXTUAL_CONTEXT_CLUES
|
||||
))
|
||||
);
|
||||
assert_eq!(season_details_modal.season_details_tabs.tabs[0].config, None);
|
||||
assert_eq!(
|
||||
season_details_modal.season_details_tabs.tabs[0].config,
|
||||
None
|
||||
);
|
||||
|
||||
assert_str_eq!(
|
||||
season_details_modal.season_details_tabs.tabs[1].title,
|
||||
@@ -368,7 +383,10 @@ mod tests {
|
||||
season_details_modal.season_details_tabs.tabs[1].contextual_help,
|
||||
Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
|
||||
);
|
||||
assert_eq!(season_details_modal.season_details_tabs.tabs[1].config, None);
|
||||
assert_eq!(
|
||||
season_details_modal.season_details_tabs.tabs[1].config,
|
||||
None
|
||||
);
|
||||
|
||||
assert_str_eq!(
|
||||
season_details_modal.season_details_tabs.tabs[2].title,
|
||||
@@ -386,6 +404,9 @@ mod tests {
|
||||
season_details_modal.season_details_tabs.tabs[2].contextual_help,
|
||||
Some(build_context_clue_string(&DETAILS_CONTEXTUAL_CONTEXT_CLUES))
|
||||
);
|
||||
assert_eq!(season_details_modal.season_details_tabs.tabs[2].config, None);
|
||||
assert_eq!(
|
||||
season_details_modal.season_details_tabs.tabs[2].config,
|
||||
None
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -401,18 +401,14 @@ mod tests {
|
||||
#[should_panic(expected = "Servarr config is undefined")]
|
||||
#[rstest]
|
||||
async fn test_request_props_from_requires_radarr_config_to_be_present_for_all_network_events(
|
||||
#[values(RadarrEvent::HealthCheck, SonarrEvent::HealthCheck)] network_event: impl Into<NetworkEvent> + NetworkResource) {
|
||||
#[values(RadarrEvent::HealthCheck, SonarrEvent::HealthCheck)] network_event: impl Into<NetworkEvent>
|
||||
+ NetworkResource,
|
||||
) {
|
||||
let app_arc = Arc::new(Mutex::new(App::default()));
|
||||
let network = Network::new(&app_arc, CancellationToken::new(), Client::new());
|
||||
|
||||
network
|
||||
.request_props_from(
|
||||
network_event,
|
||||
RequestMethod::Get,
|
||||
None::<()>,
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.request_props_from(network_event, RequestMethod::Get, None::<()>, None, None)
|
||||
.await;
|
||||
}
|
||||
|
||||
|
||||
+13
-5
@@ -274,11 +274,19 @@ pub(super) async fn start_cli_no_spinner(
|
||||
}
|
||||
}
|
||||
|
||||
pub fn select_cli_configuration(app: &mut App<'_>, config: &AppConfig, command: &Command, servarr_name_arg: Option<String>) {
|
||||
pub fn select_cli_configuration(
|
||||
app: &mut App<'_>,
|
||||
config: &AppConfig,
|
||||
command: &Command,
|
||||
servarr_name_arg: Option<String>,
|
||||
) {
|
||||
if let Some(servarr_name) = servarr_name_arg {
|
||||
let trimmed_name = servarr_name.trim();
|
||||
if !app.server_tabs.select_tab_by_title(trimmed_name) {
|
||||
log_and_print_error(format!("A Servarr titled '{}' was not found in your configuration file", trimmed_name));
|
||||
log_and_print_error(format!(
|
||||
"A Servarr titled '{}' was not found in your configuration file",
|
||||
trimmed_name
|
||||
));
|
||||
process::exit(1);
|
||||
}
|
||||
} else {
|
||||
@@ -286,12 +294,12 @@ pub fn select_cli_configuration(app: &mut App<'_>, config: &AppConfig, command:
|
||||
Command::Radarr(_) => {
|
||||
let default_radarr_config = config.radarr.as_ref().unwrap()[0].clone();
|
||||
app.server_tabs.select_tab_by_config(&default_radarr_config);
|
||||
},
|
||||
}
|
||||
Command::Sonarr(_) => {
|
||||
let default_sonarr_config = config.sonarr.as_ref().unwrap()[0].clone();
|
||||
app.server_tabs.select_tab_by_config(&default_sonarr_config);
|
||||
},
|
||||
_ => ()
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user