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:
Dark-Alex-17 committed 2024-12-11 15:08:52 -07:00
1 parent e9a30382a3
commit c09950d0af
59 files changed
+488 -660
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/ui/radarr_ui/library/add_movie_ui.rs
+12 -56
View File
@@ -13,8 +13,6 @@ 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::{draw_collection_details, draw_collections};
use crate::ui::radarr_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,9 +24,10 @@ 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::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"]
@@ -47,72 +46,34 @@ impl DrawUi for AddMovieUi {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
if let Route::Radarr(active_radarr_block, context_option) = app.get_current_route() {
let draw_add_movie_search_popup =
|f: &mut Frame<'_>, app: &mut App<'_>, area: Rect| match active_radarr_block {
ActiveRadarrBlock::AddMovieSearchInput
| ActiveRadarrBlock::AddMovieSearchResults
| ActiveRadarrBlock::AddMovieEmptySearchResults => {
draw_add_movie_search(f, app, area);
}
if context_option.is_some() {
CollectionsUi::draw(f, app, area);
draw_popup(f, app, draw_confirmation_popup, Size::Medium);
} else {
draw_popup(f, app, draw_add_movie_search, Size::Large);
match active_radarr_block {
ActiveRadarrBlock::AddMoviePrompt
| ActiveRadarrBlock::AddMovieSelectMonitor
| ActiveRadarrBlock::AddMovieSelectMinimumAvailability
| ActiveRadarrBlock::AddMovieSelectQualityProfile
| ActiveRadarrBlock::AddMovieSelectRootFolder
| ActiveRadarrBlock::AddMovieTagsInput => {
if context_option.is_some() {
draw_popup_over(
draw_popup(
f,
app,
area,
draw_collection_details,
draw_confirmation_popup,
Size::Medium,
);
} else {
draw_popup_over(
f,
app,
area,
draw_add_movie_search,
draw_confirmation_popup,
Size::Medium,
);
}
}
ActiveRadarrBlock::AddMovieAlreadyInLibrary => {
draw_add_movie_search(f, app, area);
f.render_widget(
Popup::new(Message::new("This film is already in your library")).size(Size::Message),
f.area(),
);
}
_ => (),
};
match active_radarr_block {
_ if ADD_MOVIE_BLOCKS.contains(&active_radarr_block) => {
if context_option.is_some() {
draw_popup_over(
f,
app,
area,
draw_collections,
draw_add_movie_search_popup,
Size::Large,
)
} else {
draw_popup_over(
f,
app,
area,
draw_library,
draw_add_movie_search_popup,
Size::Large,
)
}
}
_ => (),
}
}
}
@@ -285,26 +246,21 @@ fn draw_add_movie_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
fn draw_confirmation_popup(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
if let Route::Radarr(active_radarr_block, _) = app.get_current_route() {
draw_confirmation_prompt(f, app, area);
match active_radarr_block {
ActiveRadarrBlock::AddMovieSelectMonitor => {
draw_confirmation_prompt(f, app, area);
draw_add_movie_select_monitor_popup(f, app);
}
ActiveRadarrBlock::AddMovieSelectMinimumAvailability => {
draw_confirmation_prompt(f, app, area);
draw_add_movie_select_minimum_availability_popup(f, app);
}
ActiveRadarrBlock::AddMovieSelectQualityProfile => {
draw_confirmation_prompt(f, app, area);
draw_add_movie_select_quality_profile_popup(f, app);
}
ActiveRadarrBlock::AddMovieSelectRootFolder => {
draw_confirmation_prompt(f, app, area);
draw_add_movie_select_root_folder_popup(f, app);
}
ActiveRadarrBlock::AddMoviePrompt | ActiveRadarrBlock::AddMovieTagsInput => {
draw_confirmation_prompt(f, app, area)
}
_ => (),
}
}
src/ui/radarr_ui/library/delete_movie_ui.rs
+1 -3
View File
@@ -4,7 +4,6 @@ use ratatui::Frame;
use crate::app::App;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
use crate::models::Route;
use crate::ui::radarr_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,7 +24,7 @@ impl DrawUi for DeleteMovieUi {
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::Radarr(ActiveRadarrBlock::DeleteMoviePrompt, _)
@@ -50,7 +49,6 @@ impl DrawUi for DeleteMovieUi {
.yes_no_highlighted(selected_block == ActiveRadarrBlock::DeleteMovieConfirmPrompt)
.yes_no_value(app.data.radarr_data.prompt_confirm);
draw_library(f, app, area);
f.render_widget(
Popup::new(confirmation_prompt).size(Size::MediumPrompt),
f.area(),
src/ui/radarr_ui/library/edit_movie_ui.rs
+16 -38
View File
@@ -14,7 +14,6 @@ use crate::models::servarr_data::radarr::radarr_data::{
};
use crate::models::{EnumDisplayStyle, Route};
use crate::render_selectable_input_box;
use crate::ui::radarr_ui::library::draw_library;
use crate::ui::radarr_ui::library::movie_details_ui::MovieDetailsUi;
use crate::ui::styles::ManagarrStyle;
@@ -24,7 +23,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};
#[cfg(test)]
#[path = "edit_movie_ui_tests.rs"]
@@ -41,46 +40,25 @@ impl DrawUi for EditMovieUi {
false
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
if let Route::Radarr(active_radarr_block, context_option) = app.get_current_route() {
let draw_edit_movie_prompt =
|f: &mut Frame<'_>, app: &mut App<'_>, prompt_area: Rect| match active_radarr_block {
ActiveRadarrBlock::EditMovieSelectMinimumAvailability => {
draw_edit_movie_confirmation_prompt(f, app, prompt_area);
draw_edit_movie_select_minimum_availability_popup(f, app);
}
ActiveRadarrBlock::EditMovieSelectQualityProfile => {
draw_edit_movie_confirmation_prompt(f, app, prompt_area);
draw_edit_movie_select_quality_profile_popup(f, app);
}
ActiveRadarrBlock::EditMoviePrompt
| ActiveRadarrBlock::EditMovieToggleMonitored
| ActiveRadarrBlock::EditMoviePathInput
| ActiveRadarrBlock::EditMovieTagsInput => {
draw_edit_movie_confirmation_prompt(f, app, prompt_area)
}
_ => (),
};
if let Some(context) = context_option {
match context {
ActiveRadarrBlock::Movies => {
draw_popup_over(
f,
app,
area,
draw_library,
draw_edit_movie_prompt,
Size::Medium,
);
}
_ if MOVIE_DETAILS_BLOCKS.contains(&context) => {
draw_popup_over_ui::<MovieDetailsUi>(f, app, area, draw_library, Size::Large);
draw_popup(f, app, draw_edit_movie_prompt, Size::Medium);
}
_ => (),
if MOVIE_DETAILS_BLOCKS.contains(&context) {
draw_popup(f, app, MovieDetailsUi::draw, Size::Large);
}
}
draw_popup(f, app, draw_edit_movie_confirmation_prompt, Size::Medium);
match active_radarr_block {
ActiveRadarrBlock::EditMovieSelectMinimumAvailability => {
draw_edit_movie_select_minimum_availability_popup(f, app);
}
ActiveRadarrBlock::EditMovieSelectQualityProfile => {
draw_edit_movie_select_quality_profile_popup(f, app);
}
_ => (),
}
}
}
}
src/ui/radarr_ui/library/mod.rs
+11 -22
View File
@@ -44,43 +44,32 @@ impl DrawUi for LibraryUi {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
let route = app.get_current_route();
let mut library_ui_matchers = |active_radarr_block: ActiveRadarrBlock| match active_radarr_block
{
ActiveRadarrBlock::Movies
| ActiveRadarrBlock::MoviesSortPrompt
| ActiveRadarrBlock::SearchMovie
| ActiveRadarrBlock::SearchMovieError
| ActiveRadarrBlock::FilterMovies
| ActiveRadarrBlock::FilterMoviesError => draw_library(f, app, area),
ActiveRadarrBlock::UpdateAllMoviesPrompt => {
if !matches!(route, Route::Radarr(_, Some(_))) {
draw_library(f, app, area);
}
match route {
_ if MovieDetailsUi::accepts(route) => MovieDetailsUi::draw(f, app, area),
_ if AddMovieUi::accepts(route) => AddMovieUi::draw(f, app, area),
_ if EditMovieUi::accepts(route) => EditMovieUi::draw(f, app, area),
_ if DeleteMovieUi::accepts(route) => DeleteMovieUi::draw(f, app, area),
Route::Radarr(ActiveRadarrBlock::UpdateAllMoviesPrompt, _) => {
let confirmation_prompt = ConfirmationPrompt::new()
.title("Update All Movies")
.prompt("Do you want to update info and scan your disks for all of your movies?")
.yes_no_value(app.data.radarr_data.prompt_confirm);
draw_library(f, app, area);
f.render_widget(
Popup::new(confirmation_prompt).size(Size::MediumPrompt),
f.area(),
);
}
_ => (),
};
match route {
_ if MovieDetailsUi::accepts(route) => MovieDetailsUi::draw(f, app, area),
_ if AddMovieUi::accepts(route) => AddMovieUi::draw(f, app, area),
_ if EditMovieUi::accepts(route) => EditMovieUi::draw(f, app, area),
_ if DeleteMovieUi::accepts(route) => DeleteMovieUi::draw(f, app, area),
Route::Radarr(active_radarr_block, _) if LIBRARY_BLOCKS.contains(&active_radarr_block) => {
library_ui_matchers(active_radarr_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::Radarr(active_radarr_block, _) = app.get_current_route() {
let current_selection = if !app.data.radarr_data.movies.items.is_empty() {
app.data.radarr_data.movies.current_selection().clone()
src/ui/radarr_ui/library/movie_details_ui.rs
+3 -6
View File
@@ -11,14 +11,13 @@ use crate::models::radarr_models::{Credit, MovieHistoryItem, RadarrRelease};
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::radarr_ui::library::draw_library;
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::widgets::confirmation_prompt::ConfirmationPrompt;
use crate::ui::widgets::loading_block::LoadingBlock;
use crate::ui::widgets::managarr_table::ManagarrTable;
use crate::ui::widgets::popup::{Popup, Size};
use crate::ui::{draw_popup_over, draw_tabs, DrawUi};
use crate::ui::{draw_popup, draw_tabs, DrawUi};
use crate::utils::convert_to_gb;
#[cfg(test)]
@@ -36,7 +35,7 @@ impl DrawUi for MovieDetailsUi {
false
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
if let Route::Radarr(active_radarr_block, context_option) = app.get_current_route() {
let draw_movie_info_popup = |f: &mut Frame<'_>, app: &mut App<'_>, popup_area: Rect| {
let content_area = draw_tabs(
@@ -85,11 +84,9 @@ impl DrawUi for MovieDetailsUi {
}
};
draw_popup_over(
draw_popup(
f,
app,
area,
draw_library,
draw_movie_info_popup,
Size::Large,
);