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

fix(style): Addressed linter complaints on formatting

Browse Source
This commit is contained in:
Alex Clarke
2024-12-13 19:48:22 -07:00
parent 682bc91855
commit 412cb2408e
51 changed files with 343 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/handler_test_utils.rs
+75 -24
View File
@@ -331,38 +331,89 @@ mod test_utils {
macro_rules! test_handler_delegation {
($handler:ident, $base:expr, $active_block:expr) => {
let mut app = App::default();
app.data.sonarr_data.history.set_items(vec![$crate::models::sonarr_models::SonarrHistoryItem::default()]);
app.data.sonarr_data.root_folders.set_items(vec![$crate::models::servarr_models::RootFolder::default()]);
app.data.sonarr_data.indexers.set_items(vec![$crate::models::servarr_models::Indexer::default()]);
app.data.sonarr_data.blocklist.set_items(vec![$crate::models::sonarr_models::BlocklistItem::default()]);
app.data.sonarr_data.add_searched_series = Some($crate::models::stateful_table::StatefulTable::default());
app.data.radarr_data.movies.set_items(vec![$crate::models::radarr_models::Movie::default()]);
app.data.radarr_data.collections.set_items(vec![$crate::models::radarr_models::Collection::default()]);
app.data.radarr_data.collection_movies.set_items(vec![$crate::models::radarr_models::CollectionMovie::default()]);
app.data.radarr_data.indexers.set_items(vec![$crate::models::servarr_models::Indexer::default()]);
app.data.radarr_data.root_folders.set_items(vec![$crate::models::servarr_models::RootFolder::default()]);
app.data.radarr_data.blocklist.set_items(vec![$crate::models::radarr_models::BlocklistItem::default()]);
app.data.radarr_data.add_searched_movies = Some($crate::models::stateful_table::StatefulTable::default());
let mut movie_details_modal = $crate::models::servarr_data::radarr::modals::MovieDetailsModal::default();
app.data.sonarr_data.history.set_items(vec![
$crate::models::sonarr_models::SonarrHistoryItem::default(),
]);
app
.data
.sonarr_data
.root_folders
.set_items(vec![$crate::models::servarr_models::RootFolder::default()]);
app
.data
.sonarr_data
.indexers
.set_items(vec![$crate::models::servarr_models::Indexer::default()]);
app
.data
.sonarr_data
.blocklist
.set_items(vec![$crate::models::sonarr_models::BlocklistItem::default()]);
app.data.sonarr_data.add_searched_series =
Some($crate::models::stateful_table::StatefulTable::default());
app
.data
.radarr_data
.movies
.set_items(vec![$crate::models::radarr_models::Movie::default()]);
app
.data
.radarr_data
.collections
.set_items(vec![$crate::models::radarr_models::Collection::default()]);
app.data.radarr_data.collection_movies.set_items(vec![
$crate::models::radarr_models::CollectionMovie::default(),
]);
app
.data
.radarr_data
.indexers
.set_items(vec![$crate::models::servarr_models::Indexer::default()]);
app
.data
.radarr_data
.root_folders
.set_items(vec![$crate::models::servarr_models::RootFolder::default()]);
app
.data
.radarr_data
.blocklist
.set_items(vec![$crate::models::radarr_models::BlocklistItem::default()]);
app.data.radarr_data.add_searched_movies =
Some($crate::models::stateful_table::StatefulTable::default());
let mut movie_details_modal =
$crate::models::servarr_data::radarr::modals::MovieDetailsModal::default();
movie_details_modal.movie_history.set_items(vec![
$crate::models::radarr_models::MovieHistoryItem::default(),
]);
movie_details_modal
.movie_history
.set_items(vec![$crate::models::radarr_models::MovieHistoryItem::default()]);
movie_details_modal.movie_cast.set_items(vec![$crate::models::radarr_models::Credit::default()]);
movie_details_modal.movie_crew.set_items(vec![$crate::models::radarr_models::Credit::default()]);
movie_details_modal.movie_releases.set_items(vec![$crate::models::radarr_models::RadarrRelease::default()]);
.movie_cast
.set_items(vec![$crate::models::radarr_models::Credit::default()]);
movie_details_modal
.movie_crew
.set_items(vec![$crate::models::radarr_models::Credit::default()]);
movie_details_modal
.movie_releases
.set_items(vec![$crate::models::radarr_models::RadarrRelease::default()]);
app.data.radarr_data.movie_details_modal = Some(movie_details_modal);
let mut season_details_modal = $crate::models::servarr_data::sonarr::modals::SeasonDetailsModal::default();
season_details_modal.season_history.set_items(vec![$crate::models::sonarr_models::SonarrHistoryItem::default()]);
season_details_modal.episode_details_modal = Some($crate::models::servarr_data::sonarr::modals::EpisodeDetailsModal::default());
let mut season_details_modal =
$crate::models::servarr_data::sonarr::modals::SeasonDetailsModal::default();
season_details_modal.season_history.set_items(vec![
$crate::models::sonarr_models::SonarrHistoryItem::default(),
]);
season_details_modal.episode_details_modal =
Some($crate::models::servarr_data::sonarr::modals::EpisodeDetailsModal::default());
app.data.sonarr_data.season_details_modal = Some(season_details_modal);
let mut series_history = $crate::models::stateful_table::StatefulTable::default();
series_history.set_items(vec![
$crate::models::sonarr_models::SonarrHistoryItem::default(),
]);
app.data.sonarr_data.series_history = Some(series_history);
app.data.sonarr_data.series.set_items(vec![
$crate::models::sonarr_models::Series::default(),
]);
app
.data
.sonarr_data
.series
.set_items(vec![$crate::models::sonarr_models::Series::default()]);
app.push_navigation_stack($base.into());
app.push_navigation_stack($active_block.into());
src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
+1 -1
View File
@@ -577,7 +577,7 @@ mod tests {
ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt,
None,
)
.handle();
.handle();
assert!(app.data.sonarr_data.prompt_confirm);
assert_eq!(
src/handlers/sonarr_handlers/library/library_handler_tests.rs
+6 -3
View File
@@ -10,7 +10,10 @@ mod tests {
use crate::event::Key;
use crate::handlers::sonarr_handlers::library::{series_sorting_options, LibraryHandler};
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, ADD_SERIES_BLOCKS, DELETE_SERIES_BLOCKS, EDIT_SERIES_BLOCKS, EPISODE_DETAILS_BLOCKS, LIBRARY_BLOCKS, SEASON_DETAILS_BLOCKS, SERIES_DETAILS_BLOCKS};
use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, ADD_SERIES_BLOCKS, DELETE_SERIES_BLOCKS, EDIT_SERIES_BLOCKS,
EPISODE_DETAILS_BLOCKS, LIBRARY_BLOCKS, SEASON_DETAILS_BLOCKS, SERIES_DETAILS_BLOCKS,
};
use crate::models::sonarr_models::{Series, SeriesStatus, SeriesType};
use crate::test_handler_delegation;
@@ -556,7 +559,7 @@ mod tests {
ActiveSonarrBlock::SeasonHistoryDetails,
ActiveSonarrBlock::ManualSeasonSearch,
ActiveSonarrBlock::ManualSeasonSearchSortPrompt,
ActiveSonarrBlock::DeleteEpisodeFilePrompt,
ActiveSonarrBlock::DeleteEpisodeFilePrompt
)]
active_sonarr_block: ActiveSonarrBlock,
) {
@@ -576,7 +579,7 @@ mod tests {
ActiveSonarrBlock::EpisodeHistoryDetails,
ActiveSonarrBlock::ManualEpisodeSearch,
ActiveSonarrBlock::ManualEpisodeSearchSortPrompt,
ActiveSonarrBlock::DeleteEpisodeFilePrompt,
ActiveSonarrBlock::DeleteEpisodeFilePrompt
)]
active_sonarr_block: ActiveSonarrBlock,
) {
src/handlers/sonarr_handlers/library/mod.rs
+2 -2
View File
@@ -30,12 +30,12 @@ use crate::handlers::table_handler::TableHandlingConfig;
mod add_series_handler;
mod delete_series_handler;
mod episode_details_handler;
#[cfg(test)]
#[path = "library_handler_tests.rs"]
mod library_handler_tests;
mod series_details_handler;
mod season_details_handler;
mod episode_details_handler;
mod series_details_handler;
pub(super) struct LibraryHandler<'a, 'b> {
key: Key,
src/handlers/sonarr_handlers/library/season_details_handler.rs
+6 -3
View File
@@ -342,8 +342,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
self.app.data.sonarr_data.prompt_confirm = true;
self.app.data.sonarr_data.prompt_confirm_action =
Some(SonarrEvent::ToggleEpisodeMonitoring(None));
self.app.pop_and_push_navigation_stack(self.active_sonarr_block.into());
self
.app
.pop_and_push_navigation_stack(self.active_sonarr_block.into());
}
ActiveSonarrBlock::SeasonDetails
| ActiveSonarrBlock::SeasonHistory
@@ -416,7 +418,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
}
}
pub(in crate::handlers::sonarr_handlers::library) fn releases_sorting_options() -> Vec<SortOption<SonarrRelease>> {
pub(in crate::handlers::sonarr_handlers::library) fn releases_sorting_options(
) -> Vec<SortOption<SonarrRelease>> {
vec![
SortOption {
name: "Source",
src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
+6 -3
View File
@@ -559,7 +559,7 @@ mod tests {
ActiveSonarrBlock::SeasonDetails,
None,
)
.handle();
.handle();
assert_eq!(
app.get_current_route(),
@@ -586,9 +586,12 @@ mod tests {
ActiveSonarrBlock::SeasonDetails,
None,
)
.handle();
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::SeasonDetails.into());
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeasonDetails.into()
);
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(app.data.sonarr_data.prompt_confirm_action.is_none());
assert!(!app.is_routing);
src/handlers/sonarr_handlers/library/series_details_handler.rs
+4 -2
View File
@@ -261,8 +261,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
self.app.data.sonarr_data.prompt_confirm = true;
self.app.data.sonarr_data.prompt_confirm_action =
Some(SonarrEvent::ToggleSeasonMonitoring(None));
self.app.pop_and_push_navigation_stack(self.active_sonarr_block.into());
self
.app
.pop_and_push_navigation_stack(self.active_sonarr_block.into());
}
_ => (),
},
src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
+6 -3
View File
@@ -388,7 +388,7 @@ mod tests {
ActiveSonarrBlock::SeriesDetails,
None,
)
.handle();
.handle();
assert_eq!(
app.get_current_route(),
@@ -415,9 +415,12 @@ mod tests {
ActiveSonarrBlock::SeriesDetails,
None,
)
.handle();
.handle();
assert_eq!(app.get_current_route(), ActiveSonarrBlock::SeriesDetails.into());
assert_eq!(
app.get_current_route(),
ActiveSonarrBlock::SeriesDetails.into()
);
assert!(!app.data.sonarr_data.prompt_confirm);
assert!(app.data.sonarr_data.prompt_confirm_action.is_none());
assert!(!app.is_routing);
src/handlers/table_handler.rs
+4 -4
View File
@@ -78,7 +78,7 @@ macro_rules! handle_table_events {
fn [<handle_ $name _table_scroll_up>](&mut $self, config: $crate::handlers::table_handler::TableHandlingConfig<$row>) -> bool {
use $crate::models::Scrollable;
match $self.app.get_current_route() {
_ if config.table_block == $self.app.get_current_route() => {
$table.scroll_up();
@@ -96,7 +96,7 @@ macro_rules! handle_table_events {
fn [<handle_ $name _table_scroll_down>](&mut $self, config: $crate::handlers::table_handler::TableHandlingConfig<$row>) -> bool {
use $crate::models::Scrollable;
match $self.app.get_current_route() {
_ if config.table_block == $self.app.get_current_route() => {
$table.scroll_down();
@@ -118,7 +118,7 @@ macro_rules! handle_table_events {
fn [<handle_ $name _table_home>](&mut $self, config: $crate::handlers::table_handler::TableHandlingConfig<$row>) -> bool {
use $crate::models::Scrollable;
match $self.app.get_current_route() {
_ if config.table_block == $self.app.get_current_route() => {
$table.scroll_to_top();
@@ -160,7 +160,7 @@ macro_rules! handle_table_events {
fn [<handle_ $name _table_end>](&mut $self, config: $crate::handlers::table_handler::TableHandlingConfig<$row>) -> bool {
use $crate::models::Scrollable;
match $self.app.get_current_route() {
_ if config.table_block == $self.app.get_current_route() => {
$table.scroll_to_bottom();
src/handlers/table_handler_tests.rs
+2 -2
View File
@@ -37,10 +37,10 @@ mod tests {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails => {
self.handle_movies_table_events(minimal_movie_table_handling_config);
}
}
_ => {
self.handle_movies_table_events(movie_table_handling_config);
},
}
}
}