Partial implementation of Tasks and Logs and test refactor

This commit is contained in:
2023-08-08 10:50:06 -06:00
parent 9d943a266e
commit 519778c0ca
42 changed files with 9914 additions and 9436 deletions
+3 -3
View File
@@ -20,8 +20,8 @@ use crate::ui::utils::{
vertical_chunks_with_margin,
};
use crate::ui::{
draw_button, draw_drop_down_list, draw_drop_down_menu_button, draw_drop_down_popup,
draw_error_popup, draw_error_popup_over, draw_large_popup_over, draw_medium_popup_over,
draw_button, draw_drop_down_menu_button, draw_drop_down_popup, draw_error_popup,
draw_error_popup_over, draw_large_popup_over, draw_medium_popup_over, draw_selectable_list,
draw_table, draw_text_box, draw_text_box_with_label, DrawUi, TableProps,
};
use crate::utils::convert_runtime;
@@ -311,7 +311,7 @@ fn draw_select_monitor_popup<B: Backend>(
app: &mut App<'_>,
popup_area: Rect,
) {
draw_drop_down_list(
draw_selectable_list(
f,
popup_area,
&mut app.data.radarr_data.monitor_list,
+7 -4
View File
@@ -18,9 +18,10 @@ use crate::app::App;
use crate::logos::RADARR_LOGO;
use crate::models::radarr_models::{DiskSpace, DownloadRecord, Movie, RootFolder};
use crate::models::Route;
use crate::ui::draw_drop_down_list;
use crate::ui::draw_selectable_list;
use crate::ui::draw_tabs;
use crate::ui::loading;
use crate::ui::radarr_ui::system_ui::SystemUi;
use crate::ui::radarr_ui::{
add_movie_ui::AddMoviesUi, collection_details_ui::CollectionDetailsUi,
collections_ui::CollectionsUi, delete_movie_ui::DeleteMovieUi, downloads_ui::DownloadsUi,
@@ -45,6 +46,7 @@ mod edit_movie_ui;
mod library_ui;
mod movie_details_ui;
mod root_folders_ui;
mod system_ui;
pub(super) struct RadarrUi {}
@@ -70,6 +72,7 @@ impl DrawUi for RadarrUi {
ActiveRadarrBlock::RootFolders
| ActiveRadarrBlock::AddRootFolderPrompt
| ActiveRadarrBlock::DeleteRootFolderPrompt => RootFoldersUi::draw(f, app, content_rect),
ActiveRadarrBlock::System => SystemUi::draw(f, app, content_rect),
_ if MOVIE_DETAILS_BLOCKS.contains(&active_radarr_block) => {
MovieDetailsUi::draw(f, app, content_rect)
}
@@ -265,7 +268,7 @@ fn draw_select_minimum_availability_popup<B: Backend>(
app: &mut App<'_>,
popup_area: Rect,
) {
draw_drop_down_list(
draw_selectable_list(
f,
popup_area,
&mut app.data.radarr_data.minimum_availability_list,
@@ -278,7 +281,7 @@ fn draw_select_quality_profile_popup<B: Backend>(
app: &mut App<'_>,
popup_area: Rect,
) {
draw_drop_down_list(
draw_selectable_list(
f,
popup_area,
&mut app.data.radarr_data.quality_profile_list,
@@ -291,7 +294,7 @@ fn draw_select_root_folder_popup<B: Backend>(
app: &mut App<'_>,
popup_area: Rect,
) {
draw_drop_down_list(
draw_selectable_list(
f,
popup_area,
&mut app.data.radarr_data.root_folder_list,
+4 -4
View File
@@ -18,9 +18,9 @@ use crate::ui::utils::{
style_primary, style_success, style_warning, vertical_chunks,
};
use crate::ui::{
draw_drop_down_list, draw_drop_down_popup, draw_large_popup_over, draw_prompt_box,
draw_prompt_box_with_content, draw_prompt_popup_over, draw_small_popup_over, draw_table,
draw_tabs, loading, DrawUi, TableProps,
draw_drop_down_popup, draw_large_popup_over, draw_prompt_box, draw_prompt_box_with_content,
draw_prompt_popup_over, draw_selectable_list, draw_small_popup_over, draw_table, draw_tabs,
loading, DrawUi, TableProps,
};
use crate::utils::convert_to_gb;
@@ -58,7 +58,7 @@ impl DrawUi for MovieDetailsUi {
content_area,
draw_movie_info,
|f, app, content_area| {
draw_drop_down_list(
draw_selectable_list(
f,
content_area,
&mut app.data.radarr_data.movie_releases_sort,
+147
View File
@@ -0,0 +1,147 @@
use crate::ui::utils::{style_primary, style_secondary};
use crate::ui::{draw_table, TableProps};
use crate::{
app::{radarr::ActiveRadarrBlock, App},
models::Route,
ui::{
draw_list_box,
utils::{horizontal_chunks, style_default, style_failure, title_block, vertical_chunks},
DrawUi,
},
};
use chrono::DateTime;
use std::ops::Sub;
use tui::style::Modifier;
use tui::text::{Span, Text};
use tui::widgets::{Cell, Row};
use tui::{
backend::Backend,
layout::{Constraint, Rect},
style::{Color, Style},
widgets::ListItem,
Frame,
};
pub(super) struct SystemUi {}
impl DrawUi for SystemUi {
fn draw<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, content_rect: Rect) {
if matches!(
*app.get_current_route(),
Route::Radarr(ActiveRadarrBlock::System, _)
) {
draw_system_ui_layout(f, app, content_rect)
}
}
}
fn draw_system_ui_layout<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, area: Rect) {
let vertical_chunks =
vertical_chunks(vec![Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)], area);
let horizontal_chunks = horizontal_chunks(
vec![Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)],
vertical_chunks[0],
);
draw_tasks(f, app, horizontal_chunks[0]);
f.render_widget(title_block("Queue"), horizontal_chunks[1]);
draw_logs(f, app, vertical_chunks[1]);
}
fn draw_tasks<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, area: Rect) {
let block = title_block("Tasks");
draw_table(
f,
area,
block,
TableProps {
content: &mut app.data.radarr_data.tasks,
table_headers: vec![
"Name",
"Interval",
"Last Execution",
"Last Duration",
"Next Duration",
],
constraints: vec![
Constraint::Percentage(30),
Constraint::Percentage(12),
Constraint::Percentage(16),
Constraint::Percentage(16),
Constraint::Percentage(16),
],
help: None,
},
|task| {
let interval = format!("{} hours", task.interval.as_u64().as_ref().unwrap() / 60);
let last_duration = &task.last_duration[..8];
let next_execution = task.next_execution.sub(DateTime::default()).num_minutes();
let next_execution_string = if next_execution > 60 {
format!("{} hours", next_execution / 60)
} else {
format!("{} minutes", next_execution)
};
let last_execution = task.last_execution.sub(DateTime::default()).num_minutes();
let last_execution_string = if last_execution > 60 {
format!("{} hours", last_execution / 60)
} else {
format!("{} minutes", last_execution)
};
Row::new(vec![
Cell::from(task.name.clone()),
Cell::from(interval),
Cell::from(last_execution_string),
Cell::from(last_duration.to_owned()),
Cell::from(next_execution_string),
])
.style(style_primary())
},
app.is_loading,
);
}
fn draw_logs<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, area: Rect) {
draw_list_box(
f,
area,
&mut app.data.radarr_data.logs,
"Logs",
|log| {
let log_line = if log.exception.is_some() {
Text::from(Span::raw(format!(
"{}|{}|{}|{}|{}",
log.time,
log.level.as_ref().unwrap().to_uppercase(),
log.logger.as_ref().unwrap(),
log.exception_type.as_ref().unwrap(),
log.exception.as_ref().unwrap()
)))
} else {
Text::from(Span::raw(format!(
"{}|{}|{}|{}",
log.time,
log.level.as_ref().unwrap().to_uppercase(),
log.logger.as_ref().unwrap(),
log.message.as_ref().unwrap()
)))
};
ListItem::new(log_line).style(determine_log_style_by_level(log.level.as_ref().unwrap()))
},
app.is_loading,
);
}
fn determine_log_style_by_level(level: &str) -> Style {
match level.to_lowercase().as_str() {
"trace" => Style::default().fg(Color::Gray),
"debug" => Style::default().fg(Color::Blue),
"info" => style_default(),
"warn" => style_secondary(),
"error" => style_failure(),
"fatal" => style_failure().add_modifier(Modifier::BOLD),
_ => style_default(),
}
}