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

refactor(ui): Simplified the popup delegation so all future UI is easier to implement

Browse Source
This commit is contained in:
Alex Clarke
2024-12-11 15:08:52 -07:00
parent e9a30382a3
commit c09950d0af
59 changed files with 488 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/sonarr_ui/library/add_series_ui.rs
+19 -44
View File
@@ -13,7 +13,6 @@ use crate::models::servarr_data::sonarr::modals::AddSeriesModal;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, ADD_SERIES_BLOCKS};
use crate::models::sonarr_models::AddSeriesSearchResult;
use crate::models::{EnumDisplayStyle, Route};
use crate::ui::sonarr_ui::library::draw_library;
use crate::ui::styles::ManagarrStyle;
use crate::ui::utils::{
borderless_block, get_width_from_percentage, layout_block, layout_paragraph_borderless,
@@ -26,7 +25,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable;
use crate::ui::widgets::message::Message;
use crate::ui::widgets::popup::{Popup, Size};
use crate::ui::widgets::selectable_list::SelectableList;
use crate::ui::{draw_popup_over, DrawUi};
use crate::ui::{draw_popup, DrawUi};
use crate::{render_selectable_input_box, App};
#[cfg(test)]
@@ -44,50 +43,26 @@ impl DrawUi for AddSeriesUi {
false
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
let draw_add_series_search_popup =
|f: &mut Frame<'_>, app: &mut App<'_>, area: Rect| match active_sonarr_block {
ActiveSonarrBlock::AddSeriesSearchInput
| ActiveSonarrBlock::AddSeriesSearchResults
| ActiveSonarrBlock::AddSeriesEmptySearchResults => {
draw_add_series_search(f, app, area);
}
ActiveSonarrBlock::AddSeriesPrompt
| ActiveSonarrBlock::AddSeriesSelectMonitor
| ActiveSonarrBlock::AddSeriesSelectSeriesType
| ActiveSonarrBlock::AddSeriesSelectQualityProfile
| ActiveSonarrBlock::AddSeriesSelectLanguageProfile
| ActiveSonarrBlock::AddSeriesSelectRootFolder
| ActiveSonarrBlock::AddSeriesTagsInput => {
draw_popup_over(
f,
app,
area,
draw_add_series_search,
draw_confirmation_popup,
Size::Long,
);
}
ActiveSonarrBlock::AddSeriesAlreadyInLibrary => {
draw_add_series_search(f, app, area);
f.render_widget(
Popup::new(Message::new("This film is already in your library")).size(Size::Message),
f.area(),
);
}
_ => (),
};
draw_popup(f, app, draw_add_series_search, Size::Large);
match active_sonarr_block {
_ if ADD_SERIES_BLOCKS.contains(&active_sonarr_block) => draw_popup_over(
f,
app,
area,
draw_library,
draw_add_series_search_popup,
Size::Large,
),
ActiveSonarrBlock::AddSeriesPrompt
| ActiveSonarrBlock::AddSeriesSelectMonitor
| ActiveSonarrBlock::AddSeriesSelectSeriesType
| ActiveSonarrBlock::AddSeriesSelectQualityProfile
| ActiveSonarrBlock::AddSeriesSelectLanguageProfile
| ActiveSonarrBlock::AddSeriesSelectRootFolder
| ActiveSonarrBlock::AddSeriesTagsInput => {
draw_popup(f, app, draw_confirmation_popup, Size::Long);
}
ActiveSonarrBlock::AddSeriesAlreadyInLibrary => {
f.render_widget(
Popup::new(Message::new("This series is already in your library")).size(Size::Message),
f.area(),
);
}
_ => (),
}
}
src/ui/sonarr_ui/library/delete_series_ui.rs
+2 -4
View File
@@ -4,7 +4,6 @@ use ratatui::Frame;
use crate::app::App;
use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DELETE_SERIES_BLOCKS};
use crate::models::Route;
use crate::ui::sonarr_ui::library::draw_library;
use crate::ui::widgets::checkbox::Checkbox;
use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
use crate::ui::widgets::popup::{Popup, Size};
@@ -25,14 +24,14 @@ impl DrawUi for DeleteSeriesUi {
false
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
if matches!(
app.get_current_route(),
Route::Sonarr(ActiveSonarrBlock::DeleteSeriesPrompt, _)
) {
let selected_block = app.data.sonarr_data.selected_block.get_active_block();
let prompt = format!(
"Do you really want to delete: \n{}?",
"Do you really want to delete the series: \n{}?",
app.data.sonarr_data.series.current_selection().title.text
);
let checkboxes = vec![
@@ -50,7 +49,6 @@ impl DrawUi for DeleteSeriesUi {
.yes_no_highlighted(selected_block == ActiveSonarrBlock::DeleteSeriesConfirmPrompt)
.yes_no_value(app.data.sonarr_data.prompt_confirm);
draw_library(f, app, area);
f.render_widget(
Popup::new(confirmation_prompt).size(Size::MediumPrompt),
f.area(),
src/ui/sonarr_ui/library/edit_series_ui.rs
+24 -43
View File
@@ -14,7 +14,6 @@ use crate::models::servarr_data::sonarr::sonarr_data::{
};
use crate::models::{EnumDisplayStyle, Route};
use crate::render_selectable_input_box;
use crate::ui::sonarr_ui::library::draw_library;
use crate::ui::styles::ManagarrStyle;
use crate::ui::utils::{layout_paragraph_borderless, title_block_centered};
@@ -23,7 +22,7 @@ use crate::ui::widgets::checkbox::Checkbox;
use crate::ui::widgets::input_box::InputBox;
use crate::ui::widgets::popup::{Popup, Size};
use crate::ui::widgets::selectable_list::SelectableList;
use crate::ui::{draw_popup, draw_popup_over, draw_popup_over_ui, DrawUi};
use crate::ui::{draw_popup, DrawUi};
use super::series_details_ui::SeriesDetailsUi;
@@ -42,51 +41,33 @@ impl DrawUi for EditSeriesUi {
false
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
if let Route::Sonarr(active_sonarr_block, context_option) = app.get_current_route() {
let draw_edit_series_prompt =
|f: &mut Frame<'_>, app: &mut App<'_>, prompt_area: Rect| match active_sonarr_block {
ActiveSonarrBlock::EditSeriesSelectSeriesType => {
draw_edit_series_confirmation_prompt(f, app, prompt_area);
draw_edit_series_select_series_type_popup(f, app);
}
ActiveSonarrBlock::EditSeriesSelectQualityProfile => {
draw_edit_series_confirmation_prompt(f, app, prompt_area);
draw_edit_series_select_quality_profile_popup(f, app);
}
ActiveSonarrBlock::EditSeriesSelectLanguageProfile => {
draw_edit_series_confirmation_prompt(f, app, prompt_area);
draw_edit_series_select_language_profile_popup(f, app);
}
ActiveSonarrBlock::EditSeriesPrompt
| ActiveSonarrBlock::EditSeriesToggleMonitored
| ActiveSonarrBlock::EditSeriesToggleSeasonFolder
| ActiveSonarrBlock::EditSeriesPathInput
| ActiveSonarrBlock::EditSeriesTagsInput => {
draw_edit_series_confirmation_prompt(f, app, prompt_area)
}
_ => (),
};
if let Some(context) = context_option {
match context {
ActiveSonarrBlock::Series => {
draw_popup_over(
f,
app,
area,
draw_library,
draw_edit_series_prompt,
Size::Long,
);
}
_ if SERIES_DETAILS_BLOCKS.contains(&context) => {
draw_popup_over_ui::<SeriesDetailsUi>(f, app, area, draw_library, Size::Large);
draw_popup(f, app, draw_edit_series_prompt, Size::Long);
}
_ => (),
if SERIES_DETAILS_BLOCKS.contains(&context) {
draw_popup(f, app, SeriesDetailsUi::draw, Size::Large);
}
}
let draw_edit_series_prompt =
|f: &mut Frame<'_>, app: &mut App<'_>, prompt_area: Rect| {
draw_edit_series_confirmation_prompt(f, app, prompt_area);
match active_sonarr_block {
ActiveSonarrBlock::EditSeriesSelectSeriesType => {
draw_edit_series_select_series_type_popup(f, app);
}
ActiveSonarrBlock::EditSeriesSelectQualityProfile => {
draw_edit_series_select_quality_profile_popup(f, app);
}
ActiveSonarrBlock::EditSeriesSelectLanguageProfile => {
draw_edit_series_select_language_profile_popup(f, app);
}
_ => (),
}
};
draw_popup(f, app, draw_edit_series_prompt, Size::Long);
}
}
}
src/ui/sonarr_ui/library/mod.rs
+9 -25
View File
@@ -54,46 +54,30 @@ impl DrawUi for LibraryUi {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
let route = app.get_current_route();
let mut series_ui_matchers = |active_sonarr_block: ActiveSonarrBlock| match active_sonarr_block
{
ActiveSonarrBlock::Series
| ActiveSonarrBlock::SeriesSortPrompt
| ActiveSonarrBlock::SearchSeries
| ActiveSonarrBlock::SearchSeriesError
| ActiveSonarrBlock::FilterSeries
| ActiveSonarrBlock::FilterSeriesError => draw_library(f, app, area),
ActiveSonarrBlock::UpdateAllSeriesPrompt => {
draw_library(f, app, area);
match route {
_ if AddSeriesUi::accepts(route) => AddSeriesUi::draw(f, app, area),
_ if DeleteSeriesUi::accepts(route) => DeleteSeriesUi::draw(f, app, area),
_ if EditSeriesUi::accepts(route) => EditSeriesUi::draw(f, app, area),
_ if SeriesDetailsUi::accepts(route) => SeriesDetailsUi::draw(f, app, area),
Route::Sonarr(ActiveSonarrBlock::UpdateAllSeriesPrompt, _) => {
let confirmation_prompt = ConfirmationPrompt::new()
.title("Update All Series")
.prompt("Do you want to update info and scan your disks for all of your series?")
.yes_no_value(app.data.sonarr_data.prompt_confirm);
draw_library(f, app, area);
f.render_widget(
Popup::new(confirmation_prompt).size(Size::MediumPrompt),
f.area(),
);
}
_ => (),
};
match route {
_ if AddSeriesUi::accepts(route) => AddSeriesUi::draw(f, app, area),
_ if DeleteSeriesUi::accepts(route) => DeleteSeriesUi::draw(f, app, area),
_ if EditSeriesUi::accepts(route) => EditSeriesUi::draw(f, app, area),
_ if SeriesDetailsUi::accepts(route) => {
draw_library(f, app, area);
SeriesDetailsUi::draw(f, app, area)
},
Route::Sonarr(active_sonarr_block, _) if LIBRARY_BLOCKS.contains(&active_sonarr_block) => {
series_ui_matchers(active_sonarr_block)
}
_ => (),
}
}
}
pub(super) fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
if let Route::Sonarr(active_sonarr_block, _) = app.get_current_route() {
let current_selection = if !app.data.sonarr_data.series.items.is_empty() {
app.data.sonarr_data.series.current_selection().clone()
src/ui/sonarr_ui/library/series_details_ui.rs
+7 -21
View File
@@ -12,6 +12,7 @@ use crate::models::sonarr_models::{
Season, SeasonStatistics, SonarrHistoryEventType, SonarrHistoryItem,
};
use crate::models::{EnumDisplayStyle, Route};
use crate::ui::sonarr_ui::library::season_details_ui::SeasonDetailsUi;
use crate::ui::sonarr_ui::sonarr_ui_utils::{
create_download_failed_history_event_details,
create_download_folder_imported_history_event_details,
@@ -28,12 +29,9 @@ use crate::ui::widgets::loading_block::LoadingBlock;
use crate::ui::widgets::managarr_table::ManagarrTable;
use crate::ui::widgets::message::Message;
use crate::ui::widgets::popup::{Popup, Size};
use crate::ui::{draw_popup, draw_popup_over, draw_tabs, DrawUi};
use crate::ui::sonarr_ui::library::season_details_ui::SeasonDetailsUi;
use crate::ui::{draw_popup, draw_tabs, DrawUi};
use crate::utils::convert_to_gb;
use super::draw_library;
#[cfg(test)]
#[path = "series_details_ui_tests.rs"]
mod series_details_ui_tests;
@@ -107,28 +105,16 @@ impl DrawUi for SeriesDetailsUi {
};
};
match route {
_ if SeasonDetailsUi::accepts(route) => {
draw_popup(f, app, draw_series_details_popup, Size::XXLarge);
SeasonDetailsUi::draw(f, app, area);
},
Route::Sonarr(active_sonarr_block, _) if SERIES_DETAILS_BLOCKS.contains(&active_sonarr_block) => {
draw_popup_over(
f,
app,
area,
draw_library,
draw_series_details_popup,
Size::XXLarge,
);
}
_ => (),
draw_popup(f, app, draw_series_details_popup, Size::XXLarge);
if SeasonDetailsUi::accepts(route) {
SeasonDetailsUi::draw(f, app, area);
}
}
}
}
pub fn draw_series_description(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
fn draw_series_description(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
let current_selection = app.data.sonarr_data.series.current_selection();
let monitored = if current_selection.monitored {
"Yes"