diff --git a/Cargo.toml b/Cargo.toml index bff4fa1..57737a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,5 +19,6 @@ reqwest = { version = "0.11.13", features = ["json"] } serde_yaml = "0.9.16" serde_json = "1.0.91" serde = { version = "1.0", features = ["derive"] } +strum = { version = "0.24.1", features = ["derive"] } tokio = { version = "1.24.1", features = ["full"] } tui = "0.19.0" diff --git a/src/app/key_binding.rs b/src/app/key_binding.rs index b36a306..a8632c2 100644 --- a/src/app/key_binding.rs +++ b/src/app/key_binding.rs @@ -12,6 +12,8 @@ generate_keybindings! { quit, up, down, + left, + right, submit, esc } @@ -34,6 +36,14 @@ pub const DEFAULT_KEYBINDINGS: KeyBindings = KeyBindings { key: Key::Down, desc: "Scroll down", }, + left: KeyBinding { + key: Key::Left, + desc: "Move left", + }, + right: KeyBinding { + key: Key::Right, + desc: "Move right", + }, submit: KeyBinding { key: Key::Enter, desc: "Select", diff --git a/src/app/models.rs b/src/app/models.rs index 559eb2f..5684de6 100644 --- a/src/app/models.rs +++ b/src/app/models.rs @@ -1,5 +1,7 @@ use tui::widgets::TableState; +use crate::app::Route; + pub trait Scrollable { fn scroll_down(&mut self); fn scroll_up(&mut self); @@ -105,3 +107,41 @@ impl Scrollable for ScrollableText { } } } + +#[derive(Clone)] +pub struct TabRoute { + pub title: String, + pub route: Route, +} + +pub struct TabState { + pub tabs: Vec, + pub index: usize, +} + +impl TabState { + pub fn new(tabs: Vec) -> TabState { + TabState { tabs, index: 0 } + } + + pub fn set_index(&mut self, index: usize) -> &TabRoute { + self.index = index; + &self.tabs[self.index] + } + + pub fn get_active_route(&self) -> &Route { + &self.tabs[self.index].route + } + + pub fn next(&mut self) { + self.index = (self.index + 1) % self.tabs.len(); + } + + pub fn previous(&mut self) { + if self.index > 0 { + self.index -= 1; + } else { + self.index = self.tabs.len() - 1; + } + } +} diff --git a/src/app/radarr.rs b/src/app/radarr.rs index ce2ca84..f0d745e 100644 --- a/src/app/radarr.rs +++ b/src/app/radarr.rs @@ -1,12 +1,12 @@ use std::collections::HashMap; use chrono::{DateTime, Utc}; +use strum::EnumIter; -use crate::app::models::{ScrollableText, StatefulTable}; +use crate::app::models::{ScrollableText, StatefulTable, TabRoute, TabState}; use crate::app::App; use crate::network::radarr_network::{DownloadRecord, Movie, RadarrEvent}; -#[derive(Default)] pub struct RadarrData { pub free_space: u64, pub total_space: u64, @@ -16,9 +16,35 @@ pub struct RadarrData { pub downloads: StatefulTable, pub quality_profile_map: HashMap, pub movie_details: ScrollableText, + pub main_tabs: TabState, } -#[derive(Clone, PartialEq, Eq, Debug)] +impl Default for RadarrData { + fn default() -> RadarrData { + RadarrData { + free_space: u64::default(), + total_space: u64::default(), + version: String::default(), + start_time: DateTime::default(), + movies: StatefulTable::default(), + downloads: StatefulTable::default(), + quality_profile_map: HashMap::default(), + movie_details: ScrollableText::default(), + main_tabs: TabState::new(vec![ + TabRoute { + title: "Library".to_owned(), + route: ActiveRadarrBlock::Movies.into(), + }, + TabRoute { + title: "Downloads".to_owned(), + route: ActiveRadarrBlock::Downloads.into(), + }, + ]), + } + } +} + +#[derive(Clone, PartialEq, Eq, Debug, EnumIter)] pub enum ActiveRadarrBlock { AddMovie, Calendar, diff --git a/src/event/key.rs b/src/event/key.rs index e0bb291..d5c1a78 100644 --- a/src/event/key.rs +++ b/src/event/key.rs @@ -7,6 +7,8 @@ use crossterm::event::{KeyCode, KeyEvent}; pub enum Key { Up, Down, + Left, + Right, Enter, Esc, Char(char), @@ -32,6 +34,14 @@ impl From for Key { code: KeyCode::Down, .. } => Key::Down, + KeyEvent { + code: KeyCode::Left, + .. + } => Key::Left, + KeyEvent { + code: KeyCode::Right, + .. + } => Key::Right, KeyEvent { code: KeyCode::Enter, .. diff --git a/src/handlers/radarr_handler.rs b/src/handlers/radarr_handler.rs index 56c1e6a..a47e571 100644 --- a/src/handlers/radarr_handler.rs +++ b/src/handlers/radarr_handler.rs @@ -11,16 +11,37 @@ pub async fn handle_radarr_key_events( match key { _ if key == DEFAULT_KEYBINDINGS.up.key => handle_scroll_up(app, active_radarr_block).await, _ if key == DEFAULT_KEYBINDINGS.down.key => handle_scroll_down(app, active_radarr_block).await, + _ if key == DEFAULT_KEYBINDINGS.left.key || key == DEFAULT_KEYBINDINGS.right.key => { + handle_tab_action(key, app, active_radarr_block).await + } _ if key == DEFAULT_KEYBINDINGS.submit.key => handle_submit(app, active_radarr_block).await, _ if key == DEFAULT_KEYBINDINGS.esc.key => handle_esc(app, active_radarr_block).await, _ => (), } } +async fn handle_tab_action(key: Key, app: &mut App, active_radarr_block: ActiveRadarrBlock) { + match active_radarr_block { + ActiveRadarrBlock::Movies | ActiveRadarrBlock::Downloads => match key { + _ if key == DEFAULT_KEYBINDINGS.left.key => { + app.data.radarr_data.main_tabs.previous(); + app.push_navigation_stack(app.data.radarr_data.main_tabs.get_active_route().clone()); + } + _ if key == DEFAULT_KEYBINDINGS.right.key => { + app.data.radarr_data.main_tabs.next(); + app.push_navigation_stack(app.data.radarr_data.main_tabs.get_active_route().clone()); + } + _ => (), + }, + _ => (), + } +} + async fn handle_scroll_up(app: &mut App, active_radarr_block: ActiveRadarrBlock) { match active_radarr_block { ActiveRadarrBlock::Movies => app.data.radarr_data.movies.scroll_up(), ActiveRadarrBlock::MovieDetails => app.data.radarr_data.movie_details.scroll_up(), + ActiveRadarrBlock::Downloads => app.data.radarr_data.downloads.scroll_up(), _ => (), } } @@ -29,6 +50,7 @@ async fn handle_scroll_down(app: &mut App, active_radarr_block: ActiveRadarrBloc match active_radarr_block { ActiveRadarrBlock::Movies => app.data.radarr_data.movies.scroll_down(), ActiveRadarrBlock::MovieDetails => app.data.radarr_data.movie_details.scroll_down(), + ActiveRadarrBlock::Downloads => app.data.radarr_data.downloads.scroll_down(), _ => (), } } diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 3acb9be..86fe546 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -10,8 +10,8 @@ use crate::logos::{ BAZARR_LOGO, LIDARR_LOGO, PROWLARR_LOGO, RADARR_LOGO, READARR_LOGO, SONARR_LOGO, }; use crate::ui::utils::{ - centered_rect, horizontal_chunks, horizontal_chunks_with_margin, style_secondary, - style_system_function, vertical_chunks, vertical_chunks_with_margin, + centered_rect, horizontal_chunks, horizontal_chunks_with_margin, style_system_function, + style_warning, vertical_chunks, vertical_chunks_with_margin, }; mod radarr_ui; @@ -28,17 +28,7 @@ pub fn ui(f: &mut Frame, app: &mut App) { draw_context_row(f, app, main_chunks[0]); match app.get_current_route().clone() { - Route::Radarr(active_radarr_block) => match active_radarr_block { - ActiveRadarrBlock::Movies => radarr_ui::draw_radarr_ui(f, app, main_chunks[1]), - ActiveRadarrBlock::MovieDetails => draw_small_popup_over( - f, - app, - main_chunks[1], - radarr_ui::draw_radarr_ui, - radarr_ui::draw_movie_details, - ), - _ => (), - }, + Route::Radarr(_) => radarr_ui::draw_radarr_ui(f, app, main_chunks[1]), } } diff --git a/src/ui/radarr_ui.rs b/src/ui/radarr_ui.rs index b761300..8d195e9 100644 --- a/src/ui/radarr_ui.rs +++ b/src/ui/radarr_ui.rs @@ -4,32 +4,72 @@ use std::ops::Sub; use chrono::{Duration, Utc}; use tui::backend::Backend; use tui::layout::{Alignment, Constraint, Rect}; -use tui::style::{Color, Modifier, Style}; +use tui::style::Style; use tui::text::{Span, Spans, Text}; -use tui::widgets::{Block, Borders, Cell, Paragraph, Row, Table, Wrap}; +use tui::widgets::{Block, Borders, Cell, Paragraph, Row, Table, Tabs, Wrap}; use tui::Frame; -use crate::app::radarr::RadarrData; -use crate::app::App; +use crate::app::radarr::{ActiveRadarrBlock, RadarrData}; +use crate::app::{App, Route}; use crate::logos::RADARR_LOGO; use crate::network::radarr_network::{DownloadRecord, Movie}; use crate::ui::utils::{ - horizontal_chunks_with_margin, line_gague, style_default, style_highlight, style_primary, - style_secondary, style_tertiary, title_block, vertical_chunks_with_margin, + horizontal_chunks_with_margin, line_gague, style_default, style_failure, style_highlight, + style_secondary, style_success, style_warning, title_block, vertical_chunks_with_margin, }; -use crate::ui::{loading, HIGHLIGHT_SYMBOL}; +use crate::ui::{draw_small_popup_over, loading, HIGHLIGHT_SYMBOL}; use crate::utils::{convert_runtime, convert_to_gb}; pub(super) fn draw_radarr_ui(f: &mut Frame<'_, B>, app: &mut App, area: Rect) { - let block = Block::default() - .borders(Borders::ALL) - .title(Spans::from(vec![Span::styled( - "Movies", - Style::default() - .fg(Color::Yellow) - .add_modifier(Modifier::BOLD), - )])); + let chunks = + vertical_chunks_with_margin(vec![Constraint::Length(2), Constraint::Min(0)], area, 1); + let block = title_block(" Movies"); + let titles = app + .data + .radarr_data + .main_tabs + .tabs + .iter() + .map(|tab_route| Spans::from(Span::styled(&tab_route.title, style_default()))) + .collect(); + let tabs = Tabs::new(titles) + .block(block) + .highlight_style(style_secondary()) + .select(app.data.radarr_data.main_tabs.index); + + f.render_widget(tabs, area); + + if let Route::Radarr(active_radarr_block) = app.get_current_route() { + match active_radarr_block { + ActiveRadarrBlock::Movies => draw_radarr_library(f, app, chunks[1]), + ActiveRadarrBlock::Downloads => draw_downloads(f, app, chunks[1]), + ActiveRadarrBlock::MovieDetails => { + draw_small_popup_over(f, app, chunks[1], draw_radarr_library, draw_movie_details) + } + _ => (), + } + } +} + +pub(super) fn draw_radarr_context_row(f: &mut Frame<'_, B>, app: &App, area: Rect) { + let chunks = horizontal_chunks_with_margin( + vec![ + Constraint::Ratio(1, 3), + Constraint::Ratio(1, 3), + Constraint::Ratio(1, 3), + ], + area, + 1, + ); + + draw_stats_context(f, app, chunks[0]); + f.render_widget(Block::default().borders(Borders::ALL), chunks[1]); + draw_downloads_context(f, app, chunks[2]); +} + +fn draw_radarr_library(f: &mut Frame<'_, B>, app: &mut App, area: Rect) { + let block = Block::default().borders(Borders::TOP); let movies_vec = &app.data.radarr_data.movies.items; if !movies_vec.is_empty() { @@ -80,23 +120,7 @@ pub(super) fn draw_radarr_ui(f: &mut Frame<'_, B>, app: &mut App, ar } } -pub(super) fn draw_radarr_context_row(f: &mut Frame<'_, B>, app: &App, area: Rect) { - let chunks = horizontal_chunks_with_margin( - vec![ - Constraint::Ratio(1, 3), - Constraint::Ratio(1, 3), - Constraint::Ratio(1, 3), - ], - area, - 1, - ); - - draw_stats(f, app, chunks[0]); - f.render_widget(Block::default().borders(Borders::ALL), chunks[1]); - draw_downloads(f, app, chunks[2]); -} - -pub(super) fn draw_downloads(f: &mut Frame<'_, B>, app: &App, area: Rect) { +fn draw_downloads_context(f: &mut Frame<'_, B>, app: &App, area: Rect) { let block = title_block("Downloads"); let downloads_vec = &app.data.radarr_data.downloads.items; @@ -126,7 +150,69 @@ pub(super) fn draw_downloads(f: &mut Frame<'_, B>, app: &App, area: } } -pub(super) fn draw_movie_details(f: &mut Frame<'_, B>, app: &App, area: Rect) { +fn draw_downloads(f: &mut Frame<'_, B>, app: &mut App, area: Rect) { + let block = Block::default().borders(Borders::TOP); + let downloads_vec = &app.data.radarr_data.downloads.items; + + if !downloads_vec.is_empty() { + let rows = downloads_vec.iter().map(|download_record| { + let DownloadRecord { + title, + size, + sizeleft, + download_client, + indexer, + output_path, + .. + } = download_record; + let percent = 1f64 - (sizeleft.as_f64().unwrap() / size.as_f64().unwrap()); + let file_size: f64 = convert_to_gb(size.as_u64().unwrap()); + + Row::new(vec![ + Cell::from(title.to_owned()), + Cell::from(format!("{:.0}%", percent * 100.0)), + Cell::from(format!("{:.2} GB", file_size)), + Cell::from(output_path.to_owned()), + Cell::from(indexer.to_owned()), + Cell::from(download_client.to_owned()), + ]) + .style(style_success()) + }); + + let header_row = Row::new(vec![ + "Title", + "Percent Complete", + "Size", + "Output Path", + "Indexer", + "Download Client", + ]) + .style(style_default()) + .bottom_margin(0); + + let constraints = vec![ + Constraint::Percentage(30), + Constraint::Percentage(11), + Constraint::Percentage(11), + Constraint::Percentage(18), + Constraint::Percentage(17), + Constraint::Percentage(13), + ]; + + let table = Table::new(rows) + .header(header_row) + .block(block) + .highlight_style(style_highlight()) + .highlight_symbol(HIGHLIGHT_SYMBOL) + .widths(&constraints); + + f.render_stateful_widget(table, area, &mut app.data.radarr_data.downloads.state); + } else { + loading(f, block, area, app.is_loading); + } +} + +fn draw_movie_details(f: &mut Frame<'_, B>, app: &App, area: Rect) { let block = title_block("Movie Details"); let movie_details = app.data.radarr_data.movie_details.get_text(); @@ -155,7 +241,7 @@ pub(super) fn draw_movie_details(f: &mut Frame<'_, B>, app: &App, ar } } -pub(super) fn draw_stats(f: &mut Frame<'_, B>, app: &App, area: Rect) { +fn draw_stats_context(f: &mut Frame<'_, B>, app: &App, area: Rect) { let block = title_block("Stats"); if !app.data.radarr_data.version.is_empty() { @@ -233,21 +319,21 @@ fn determine_row_style(app: &App, movie: &Movie) -> Style { .find(|&download| download.movie_id == movie.id) { if download.status == "downloading" { - return style_secondary(); + return style_warning(); } } - return style_tertiary(); + return style_failure(); } - style_primary() + style_success() } fn determine_style_from_download_status(download_status: &str) -> Style { match download_status { - "Downloaded" => style_primary(), - "Downloading" => style_secondary(), - "Missing" => style_tertiary(), - _ => style_primary(), + "Downloaded" => style_success(), + "Downloading" => style_warning(), + "Missing" => style_failure(), + _ => style_success(), } } diff --git a/src/ui/utils.rs b/src/ui/utils.rs index d81eaa0..9e4bde6 100644 --- a/src/ui/utils.rs +++ b/src/ui/utils.rs @@ -54,6 +54,10 @@ pub fn layout_block(title_span: Span<'_>) -> Block<'_> { Block::default().borders(Borders::ALL).title(title_span) } +pub fn layout_block_top_border(title_span: Span<'_>) -> Block<'_> { + Block::default().borders(Borders::TOP).title(title_span) +} + pub fn style_bold() -> Style { Style::default().add_modifier(Modifier::BOLD) } @@ -66,19 +70,27 @@ pub fn style_default() -> Style { Style::default().fg(Color::White) } +pub fn style_primary() -> Style { + Style::default().fg(Color::Cyan) +} + +pub fn style_secondary() -> Style { + Style::default().fg(Color::Yellow) +} + pub fn style_system_function() -> Style { Style::default().fg(Color::Yellow) } -pub fn style_primary() -> Style { +pub fn style_success() -> Style { Style::default().fg(Color::Green) } -pub fn style_secondary() -> Style { +pub fn style_warning() -> Style { Style::default().fg(Color::Magenta) } -pub fn style_tertiary() -> Style { +pub fn style_failure() -> Style { Style::default().fg(Color::Red) } diff --git a/src/utils.rs b/src/utils.rs index 30e8a82..a5d1f1c 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -2,7 +2,6 @@ use log::LevelFilter; use log4rs::append::file::FileAppender; use log4rs::config::{Appender, Root}; use log4rs::encode::pattern::PatternEncoder; -use serde_json::Number; pub fn init_logging_config() -> log4rs::Config { let file_path = "/tmp/managarr.log";