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

refactor: Addressed Cargo fmt complaints

Browse Source
This commit is contained in:
Alex Clarke
2025-02-27 20:42:32 -07:00
parent fd6fcfc98f
commit 104bcd7bb2
8 changed files with 100 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/models/mod.rs
+8 -8
View File
@@ -300,10 +300,10 @@ impl TabState {
if self.tabs.is_empty() {
return &None;
}
&self.tabs[self.index].config
}
pub fn select_tab_by_title(&mut self, name: &str) -> bool {
if !self.tabs.is_empty() {
let mut found = false;
@@ -313,13 +313,13 @@ impl TabState {
found = true;
}
});
return found;
}
false
}
pub fn select_tab_by_config(&mut self, config: &ServarrConfig) -> bool {
if !self.tabs.is_empty() {
let mut found = false;
@@ -329,13 +329,13 @@ impl TabState {
found = true;
}
});
return found;
}
false
}
pub fn get_active_tab_help(&self) -> &str {
&self.tabs[self.index].help
}
src/models/model_tests.rs
+29 -23
View File
@@ -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]];
@@ -512,7 +512,7 @@ mod tests {
assert_eq!(active_route, second_tab);
}
#[test]
fn test_tab_state_get_active_config() {
let mut tabs = create_test_tab_routes();
@@ -521,9 +521,9 @@ mod tests {
..ServarrConfig::default()
});
let tab_state = TabState { tabs, index: 1 };
let active_config = tab_state.get_active_config();
assert!(active_config.is_some());
assert_str_eq!(active_config.clone().unwrap().name.unwrap(), "Test");
}
@@ -537,7 +537,7 @@ mod tests {
assert!(active_config.is_none());
}
#[test]
fn test_select_tab_by_title() {
let tabs = create_test_tab_routes();
@@ -553,17 +553,20 @@ mod tests {
assert!(!result);
assert_eq!(tab_state.index, 1);
}
#[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");
assert!(!result);
assert_eq!(tab_state.index, 0);
}
#[test]
fn test_select_tab_by_config() {
let mut tabs = create_test_tab_routes();
@@ -577,35 +580,38 @@ mod tests {
..ServarrConfig::default()
});
let mut tab_state = TabState { tabs, index: 0 };
let result = tab_state.select_tab_by_config(&ServarrConfig {
host: Some("http://localhost".to_owned()),
port: Some(7878),
..ServarrConfig::default()
});
assert!(result);
assert_eq!(tab_state.index, 1);
let result = tab_state.select_tab_by_config(&ServarrConfig {
name: Some("Not real".to_owned()),
..ServarrConfig::default()
});
assert!(!result);
assert_eq!(tab_state.index, 1);
}
#[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()),
port: Some(7878),
..ServarrConfig::default()
});
assert!(!result);
assert_eq!(tab_state.index, 0);
}
src/models/servarr_data/sonarr/modals_tests.rs
+28 -7
View File
@@ -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
);
}
}