fix(style): Addressed linter complaints on formatting

This commit is contained in:
2024-12-13 19:48:22 -07:00
parent 682bc91855
commit 412cb2408e
51 changed files with 343 additions and 259 deletions
+1 -1
View File
@@ -33,7 +33,7 @@ impl DrawUi for BlocklistUi {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
if let Route::Radarr(active_radarr_block, _) = app.get_current_route() {
draw_blocklist_table(f, app, area);
match active_radarr_block {
ActiveRadarrBlock::BlocklistItemDetails => {
draw_blocklist_item_details_popup(f, app);
@@ -17,7 +17,13 @@ mod tests {
assert!(!CollectionDetailsUi::accepts(active_radarr_block.into()));
}
});
assert!(CollectionDetailsUi::accepts((ActiveRadarrBlock::CollectionDetails, Some(ActiveRadarrBlock::CollectionDetails)).into()));
assert!(CollectionDetailsUi::accepts(
(
ActiveRadarrBlock::CollectionDetails,
Some(ActiveRadarrBlock::CollectionDetails)
)
.into()
));
}
}
@@ -35,7 +35,7 @@ impl DrawUi for EditCollectionUi {
return EDIT_COLLECTION_BLOCKS.contains(&active_radarr_block)
&& context == ActiveRadarrBlock::CollectionDetails;
}
return EDIT_COLLECTION_BLOCKS.contains(&active_radarr_block);
}
@@ -18,6 +18,12 @@ mod tests {
}
});
assert!(EditCollectionUi::accepts((ActiveRadarrBlock::EditCollectionPrompt, Some(ActiveRadarrBlock::CollectionDetails)).into()));
assert!(EditCollectionUi::accepts(
(
ActiveRadarrBlock::EditCollectionPrompt,
Some(ActiveRadarrBlock::CollectionDetails)
)
.into()
));
}
}
+1 -1
View File
@@ -32,7 +32,7 @@ impl DrawUi for DownloadsUi {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
if let Route::Radarr(active_radarr_block, _) = app.get_current_route() {
draw_downloads(f, app, area);
match active_radarr_block {
ActiveRadarrBlock::DeleteDownloadPrompt => {
let prompt = format!(
+1 -6
View File
@@ -34,12 +34,7 @@ impl DrawUi for EditIndexerUi {
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
draw_popup(
f,
app,
draw_edit_indexer_prompt,
Size::WideLargePrompt,
);
draw_popup(f, app, draw_edit_indexer_prompt, Size::WideLargePrompt);
}
}
+7 -2
View File
@@ -61,8 +61,13 @@ impl DrawUi for IndexersUi {
f.render_widget(loading_popup, f.area());
} else {
let popup = {
let result = app.data.radarr_data.indexer_test_errors.as_ref().expect("Test result is unpopulated");
let result = app
.data
.radarr_data
.indexer_test_errors
.as_ref()
.expect("Test result is unpopulated");
if !result.is_empty() {
Popup::new(Message::new(result.clone())).size(Size::LargeMessage)
} else {
+2 -7
View File
@@ -13,6 +13,7 @@ use crate::models::radarr_models::AddMovieSearchResult;
use crate::models::servarr_data::radarr::modals::AddMovieModal;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
use crate::models::{EnumDisplayStyle, Route};
use crate::ui::radarr_ui::collections::CollectionsUi;
use crate::ui::styles::ManagarrStyle;
use crate::ui::utils::{
borderless_block, get_width_from_percentage, layout_block, layout_paragraph_borderless,
@@ -27,7 +28,6 @@ use crate::ui::widgets::selectable_list::SelectableList;
use crate::ui::{draw_popup, DrawUi};
use crate::utils::convert_runtime;
use crate::{render_selectable_input_box, App};
use crate::ui::radarr_ui::collections::CollectionsUi;
#[cfg(test)]
#[path = "add_movie_ui_tests.rs"]
@@ -59,12 +59,7 @@ impl DrawUi for AddMovieUi {
| ActiveRadarrBlock::AddMovieSelectQualityProfile
| ActiveRadarrBlock::AddMovieSelectRootFolder
| ActiveRadarrBlock::AddMovieTagsInput => {
draw_popup(
f,
app,
draw_confirmation_popup,
Size::Medium,
);
draw_popup(f, app, draw_confirmation_popup, Size::Medium);
}
ActiveRadarrBlock::AddMovieAlreadyInLibrary => {
f.render_widget(
+1 -1
View File
@@ -47,7 +47,7 @@ impl DrawUi for EditMovieUi {
draw_popup(f, app, MovieDetailsUi::draw, Size::Large);
}
}
draw_popup(f, app, draw_edit_movie_confirmation_prompt, Size::Medium);
match active_radarr_block {
+5 -7
View File
@@ -12,7 +12,10 @@ use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
use crate::models::Route;
use crate::ui::styles::ManagarrStyle;
use crate::ui::utils::{borderless_block, decorate_peer_style, get_width_from_percentage, layout_block_bottom_border, layout_block_top_border};
use crate::ui::utils::{
borderless_block, decorate_peer_style, get_width_from_percentage, layout_block_bottom_border,
layout_block_top_border,
};
use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
use crate::ui::widgets::loading_block::LoadingBlock;
use crate::ui::widgets::managarr_table::ManagarrTable;
@@ -84,12 +87,7 @@ impl DrawUi for MovieDetailsUi {
}
};
draw_popup(
f,
app,
draw_movie_info_popup,
Size::Large,
);
draw_popup(f, app, draw_movie_info_popup, Size::Large);
}
}
}
@@ -6,7 +6,8 @@ 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::{style_from_download_status, MovieDetailsUi,
use crate::ui::radarr_ui::library::movie_details_ui::{
style_from_download_status, MovieDetailsUi,
};
use crate::ui::styles::ManagarrStyle;
use crate::ui::DrawUi;
+4 -7
View File
@@ -32,14 +32,11 @@ impl DrawUi for RootFoldersUi {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
if let Route::Radarr(active_radarr_block, _) = app.get_current_route() {
draw_root_folders(f, app, area);
match active_radarr_block {
ActiveRadarrBlock::AddRootFolderPrompt => draw_popup(
f,
app,
draw_add_root_folder_prompt_box,
Size::InputBox,
),
ActiveRadarrBlock::AddRootFolderPrompt => {
draw_popup(f, app, draw_add_root_folder_prompt_box, Size::InputBox)
}
ActiveRadarrBlock::DeleteRootFolderPrompt => {
let prompt = format!(
"Do you really want to delete this root folder: \n{}?",
+1 -1
View File
@@ -64,7 +64,7 @@ impl DrawUi for SystemUi {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
let route = app.get_current_route();
draw_system_ui_layout(f, app, area);
if SystemDetailsUi::accepts(route) {
SystemDetailsUi::draw(f, app, area);
}
+5 -14
View File
@@ -10,8 +10,7 @@ use crate::models::radarr_models::RadarrTask;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
use crate::models::Route;
use crate::ui::radarr_ui::system::{
draw_queued_events, extract_task_props, TASK_TABLE_CONSTRAINTS,
TASK_TABLE_HEADERS,
draw_queued_events, extract_task_props, TASK_TABLE_CONSTRAINTS, TASK_TABLE_HEADERS,
};
use crate::ui::styles::ManagarrStyle;
use crate::ui::utils::{borderless_block, style_log_list_item, title_block};
@@ -44,19 +43,11 @@ impl DrawUi for SystemDetailsUi {
draw_logs_popup(f, app);
}
ActiveRadarrBlock::SystemTasks | ActiveRadarrBlock::SystemTaskStartConfirmPrompt => {
draw_popup(
f,
app,
draw_tasks_popup,
Size::Large,
)
draw_popup(f, app, draw_tasks_popup, Size::Large)
}
ActiveRadarrBlock::SystemQueuedEvents => {
draw_popup(f, app, draw_queued_events, Size::Medium)
}
ActiveRadarrBlock::SystemQueuedEvents => draw_popup(
f,
app,
draw_queued_events,
Size::Medium,
),
ActiveRadarrBlock::SystemUpdates => {
draw_updates_popup(f, app);
}