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

Refactored handlers and UI to have a separate radarr module, and implemented movie search functionality for existing movies.

Browse Source
This commit is contained in:
Dark-Alex-17
2023-08-08 10:50:04 -06:00
parent 3f378fb25a
commit a304367e0e
14 changed files with 1263 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/mod.rs
+36 -5
View File
@@ -1,20 +1,51 @@
use radarr_handlers::RadarrHandler;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handlers::radarr_handler::handle_radarr_key_events;
use crate::models::{HorizontallyScrollableText, Route};
mod radarr_handler;
mod radarr_handlers;
pub async fn handle_key_events(key: Key, app: &mut App) {
pub trait KeyEventHandler<'a, T: Into<Route>> {
fn handle_key_event(&mut self) {
let key = self.get_key();
match key {
_ if *key == DEFAULT_KEYBINDINGS.up.key => self.handle_scroll_up(),
_ if *key == DEFAULT_KEYBINDINGS.down.key => self.handle_scroll_down(),
_ if *key == DEFAULT_KEYBINDINGS.left.key || *key == DEFAULT_KEYBINDINGS.right.key => {
self.handle_tab_action()
}
_ if *key == DEFAULT_KEYBINDINGS.submit.key => self.handle_submit(),
_ if *key == DEFAULT_KEYBINDINGS.esc.key => self.handle_esc(),
_ => self.handle_char_key_event(),
}
}
fn handle(&mut self) {
self.handle_key_event();
}
fn with(key: &'a Key, app: &'a mut App, active_block: &'a T) -> Self;
fn get_key(&self) -> &Key;
fn handle_scroll_up(&mut self);
fn handle_scroll_down(&mut self);
fn handle_tab_action(&mut self);
fn handle_submit(&mut self);
fn handle_esc(&mut self);
fn handle_char_key_event(&mut self);
}
pub fn handle_events(key: Key, app: &mut App) {
match app.get_current_route().clone() {
Route::Radarr(active_radarr_block) => {
handle_radarr_key_events(key, app, active_radarr_block).await
RadarrHandler::with(&key, app, &active_radarr_block).handle()
}
_ => (),
}
}
pub async fn handle_clear_errors(app: &mut App) {
pub fn handle_clear_errors(app: &mut App) {
if !app.error.text.is_empty() {
app.error = HorizontallyScrollableText::default();
}
src/handlers/radarr_handler.rs
-134
View File
@@ -1,134 +0,0 @@
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::radarr::ActiveRadarrBlock;
use crate::handlers::handle_clear_errors;
use crate::models::Scrollable;
use crate::{App, Key};
pub async fn handle_radarr_key_events(
key: Key,
app: &mut App,
active_radarr_block: ActiveRadarrBlock,
) {
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 | ActiveRadarrBlock::Collections => {
match key {
_ if key == DEFAULT_KEYBINDINGS.left.key => {
app.data.radarr_data.main_tabs.previous();
app.pop_and_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.pop_and_push_navigation_stack(
app.data.radarr_data.main_tabs.get_active_route().clone(),
);
}
_ => (),
}
}
ActiveRadarrBlock::MovieDetails
| ActiveRadarrBlock::MovieHistory
| ActiveRadarrBlock::FileInfo
| ActiveRadarrBlock::Cast
| ActiveRadarrBlock::Crew => match key {
_ if key == DEFAULT_KEYBINDINGS.left.key => {
app.data.radarr_data.movie_info_tabs.previous();
app.pop_and_push_navigation_stack(
app
.data
.radarr_data
.movie_info_tabs
.get_active_route()
.clone(),
);
}
_ if key == DEFAULT_KEYBINDINGS.right.key => {
app.data.radarr_data.movie_info_tabs.next();
app.pop_and_push_navigation_stack(
app
.data
.radarr_data
.movie_info_tabs
.get_active_route()
.clone(),
);
}
_ => (),
},
_ => (),
}
}
async fn handle_scroll_up(app: &mut App, active_radarr_block: ActiveRadarrBlock) {
match active_radarr_block {
ActiveRadarrBlock::Collections => app.data.radarr_data.collections.scroll_up(),
ActiveRadarrBlock::CollectionDetails => app.data.radarr_data.collection_movies.scroll_up(),
ActiveRadarrBlock::Movies => app.data.radarr_data.movies.scroll_up(),
ActiveRadarrBlock::MovieDetails => app.data.radarr_data.movie_details.scroll_up(),
ActiveRadarrBlock::MovieHistory => app.data.radarr_data.movie_history.scroll_up(),
ActiveRadarrBlock::Cast => app.data.radarr_data.movie_cast.scroll_up(),
ActiveRadarrBlock::Crew => app.data.radarr_data.movie_crew.scroll_up(),
ActiveRadarrBlock::Downloads => app.data.radarr_data.downloads.scroll_up(),
_ => (),
}
}
async fn handle_scroll_down(app: &mut App, active_radarr_block: ActiveRadarrBlock) {
match active_radarr_block {
ActiveRadarrBlock::Collections => app.data.radarr_data.collections.scroll_down(),
ActiveRadarrBlock::CollectionDetails => app.data.radarr_data.collection_movies.scroll_down(),
ActiveRadarrBlock::Movies => app.data.radarr_data.movies.scroll_down(),
ActiveRadarrBlock::MovieDetails => app.data.radarr_data.movie_details.scroll_down(),
ActiveRadarrBlock::MovieHistory => app.data.radarr_data.movie_history.scroll_down(),
ActiveRadarrBlock::Cast => app.data.radarr_data.movie_cast.scroll_down(),
ActiveRadarrBlock::Crew => app.data.radarr_data.movie_crew.scroll_down(),
ActiveRadarrBlock::Downloads => app.data.radarr_data.downloads.scroll_down(),
_ => (),
}
}
async fn handle_submit(app: &mut App, active_radarr_block: ActiveRadarrBlock) {
match active_radarr_block {
ActiveRadarrBlock::Movies => app.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into()),
ActiveRadarrBlock::Collections => {
app.push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into())
}
ActiveRadarrBlock::CollectionDetails => {
app.push_navigation_stack(ActiveRadarrBlock::ViewMovieOverview.into())
}
_ => (),
}
}
async fn handle_esc(app: &mut App, active_radarr_block: ActiveRadarrBlock) {
match active_radarr_block {
ActiveRadarrBlock::MovieDetails
| ActiveRadarrBlock::MovieHistory
| ActiveRadarrBlock::FileInfo
| ActiveRadarrBlock::Cast
| ActiveRadarrBlock::Crew => {
app.pop_navigation_stack();
app.data.radarr_data.reset_movie_info_tabs();
}
ActiveRadarrBlock::CollectionDetails => {
app.pop_navigation_stack();
app.data.radarr_data.reset_movie_collection_table();
}
ActiveRadarrBlock::ViewMovieOverview => app.pop_navigation_stack(),
_ => handle_clear_errors(app).await,
}
}
src/handlers/radarr_handlers/collection_details_handler.rs
+64
View File
@@ -0,0 +1,64 @@
use crate::app::radarr::ActiveRadarrBlock;
use crate::app::App;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::models::Scrollable;
pub(super) struct CollectionDetailsHandler<'a> {
key: &'a Key,
app: &'a mut App,
active_radarr_block: &'a ActiveRadarrBlock,
}
impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for CollectionDetailsHandler<'a> {
fn with(
key: &'a Key,
app: &'a mut App,
active_block: &'a ActiveRadarrBlock,
) -> CollectionDetailsHandler<'a> {
CollectionDetailsHandler {
key,
app,
active_radarr_block: active_block,
}
}
fn get_key(&self) -> &Key {
self.key
}
fn handle_scroll_up(&mut self) {
if ActiveRadarrBlock::CollectionDetails == *self.active_radarr_block {
self.app.data.radarr_data.collection_movies.scroll_up()
}
}
fn handle_scroll_down(&mut self) {
if ActiveRadarrBlock::CollectionDetails == *self.active_radarr_block {
self.app.data.radarr_data.collection_movies.scroll_down()
}
}
fn handle_tab_action(&mut self) {}
fn handle_submit(&mut self) {
if ActiveRadarrBlock::CollectionDetails == *self.active_radarr_block {
self
.app
.push_navigation_stack(ActiveRadarrBlock::ViewMovieOverview.into())
}
}
fn handle_esc(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::CollectionDetails => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_movie_collection_table();
}
ActiveRadarrBlock::ViewMovieOverview => self.app.pop_navigation_stack(),
_ => (),
}
}
fn handle_char_key_event(&mut self) {}
}
src/handlers/radarr_handlers/mod.rs
+180
View File
@@ -0,0 +1,180 @@
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::radarr::ActiveRadarrBlock;
use crate::handlers::radarr_handlers::collection_details_handler::CollectionDetailsHandler;
use crate::handlers::radarr_handlers::movie_details_handler::MovieDetailsHandler;
use crate::handlers::{handle_clear_errors, KeyEventHandler};
use crate::models::Scrollable;
use crate::{App, Key};
mod collection_details_handler;
mod movie_details_handler;
pub(super) struct RadarrHandler<'a> {
key: &'a Key,
app: &'a mut App,
active_radarr_block: &'a ActiveRadarrBlock,
}
impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for RadarrHandler<'a> {
fn handle(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails
| ActiveRadarrBlock::MovieHistory
| ActiveRadarrBlock::FileInfo
| ActiveRadarrBlock::Cast
| ActiveRadarrBlock::Crew => {
MovieDetailsHandler::with(self.key, self.app, self.active_radarr_block).handle()
}
ActiveRadarrBlock::CollectionDetails | ActiveRadarrBlock::ViewMovieOverview => {
CollectionDetailsHandler::with(self.key, self.app, self.active_radarr_block).handle()
}
_ => self.handle_key_event(),
}
}
fn with(
key: &'a Key,
app: &'a mut App,
active_block: &'a ActiveRadarrBlock,
) -> RadarrHandler<'a> {
RadarrHandler {
key,
app,
active_radarr_block: active_block,
}
}
fn get_key(&self) -> &Key {
self.key
}
fn handle_scroll_up(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::Collections => self.app.data.radarr_data.collections.scroll_up(),
ActiveRadarrBlock::CollectionDetails => {
self.app.data.radarr_data.collection_movies.scroll_up()
}
ActiveRadarrBlock::Movies => self.app.data.radarr_data.movies.scroll_up(),
ActiveRadarrBlock::Downloads => self.app.data.radarr_data.downloads.scroll_up(),
_ => (),
}
}
fn handle_scroll_down(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::Collections => self.app.data.radarr_data.collections.scroll_down(),
ActiveRadarrBlock::CollectionDetails => {
self.app.data.radarr_data.collection_movies.scroll_down()
}
ActiveRadarrBlock::Movies => self.app.data.radarr_data.movies.scroll_down(),
ActiveRadarrBlock::Downloads => self.app.data.radarr_data.downloads.scroll_down(),
_ => (),
}
}
fn handle_tab_action(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::Movies | ActiveRadarrBlock::Downloads | ActiveRadarrBlock::Collections => {
match self.key {
_ if *self.key == DEFAULT_KEYBINDINGS.left.key => {
self.app.data.radarr_data.main_tabs.previous();
self.app.pop_and_push_navigation_stack(
self
.app
.data
.radarr_data
.main_tabs
.get_active_route()
.clone(),
);
}
_ if *self.key == DEFAULT_KEYBINDINGS.right.key => {
self.app.data.radarr_data.main_tabs.next();
self.app.pop_and_push_navigation_stack(
self
.app
.data
.radarr_data
.main_tabs
.get_active_route()
.clone(),
);
}
_ => (),
}
}
_ => (),
}
}
fn handle_submit(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::Movies => self
.app
.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into()),
ActiveRadarrBlock::Collections => self
.app
.push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into()),
ActiveRadarrBlock::SearchMovie => {
let search_string = self
.app
.data
.radarr_data
.search
.drain(..)
.collect::<String>()
.to_lowercase();
let movie_index = self
.app
.data
.radarr_data
.movies
.items
.iter()
.position(|movie| movie.title.to_lowercase() == search_string);
self.app.data.radarr_data.is_searching = false;
self.app.data.radarr_data.movies.select_index(movie_index);
if movie_index.is_some() {
self.app.pop_navigation_stack();
}
}
_ => (),
}
}
fn handle_esc(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::SearchMovie => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.is_searching = false;
self.app.data.radarr_data.search = String::default();
}
_ => handle_clear_errors(self.app),
}
}
fn handle_char_key_event(&mut self) {
let key = self.key;
match *self.active_radarr_block {
ActiveRadarrBlock::Movies => match key {
_ if *key == DEFAULT_KEYBINDINGS.search.key => {
self
.app
.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
self.app.data.radarr_data.is_searching = true;
}
_ => (),
},
ActiveRadarrBlock::SearchMovie => match key {
_ if *key == DEFAULT_KEYBINDINGS.backspace.key => {
self.app.data.radarr_data.search.pop();
}
Key::Char(character) => self.app.data.radarr_data.search.push(*character),
_ => (),
},
_ => {}
}
}
}
src/handlers/radarr_handlers/movie_details_handler.rs
+105
View File
@@ -0,0 +1,105 @@
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::radarr::ActiveRadarrBlock;
use crate::app::App;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::models::Scrollable;
pub(super) struct MovieDetailsHandler<'a> {
key: &'a Key,
app: &'a mut App,
active_radarr_block: &'a ActiveRadarrBlock,
}
impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for MovieDetailsHandler<'a> {
fn with(
key: &'a Key,
app: &'a mut App,
active_block: &'a ActiveRadarrBlock,
) -> MovieDetailsHandler<'a> {
MovieDetailsHandler {
key,
app,
active_radarr_block: active_block,
}
}
fn get_key(&self) -> &Key {
self.key
}
fn handle_scroll_up(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails => self.app.data.radarr_data.movie_details.scroll_up(),
ActiveRadarrBlock::MovieHistory => self.app.data.radarr_data.movie_history.scroll_up(),
ActiveRadarrBlock::Cast => self.app.data.radarr_data.movie_cast.scroll_up(),
ActiveRadarrBlock::Crew => self.app.data.radarr_data.movie_crew.scroll_up(),
_ => (),
}
}
fn handle_scroll_down(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails => self.app.data.radarr_data.movie_details.scroll_down(),
ActiveRadarrBlock::MovieHistory => self.app.data.radarr_data.movie_history.scroll_down(),
ActiveRadarrBlock::Cast => self.app.data.radarr_data.movie_cast.scroll_down(),
ActiveRadarrBlock::Crew => self.app.data.radarr_data.movie_crew.scroll_down(),
_ => (),
}
}
fn handle_tab_action(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails
| ActiveRadarrBlock::MovieHistory
| ActiveRadarrBlock::FileInfo
| ActiveRadarrBlock::Cast
| ActiveRadarrBlock::Crew => match self.key {
_ if *self.key == DEFAULT_KEYBINDINGS.left.key => {
self.app.data.radarr_data.movie_info_tabs.previous();
self.app.pop_and_push_navigation_stack(
self
.app
.data
.radarr_data
.movie_info_tabs
.get_active_route()
.clone(),
);
}
_ if *self.key == DEFAULT_KEYBINDINGS.right.key => {
self.app.data.radarr_data.movie_info_tabs.next();
self.app.pop_and_push_navigation_stack(
self
.app
.data
.radarr_data
.movie_info_tabs
.get_active_route()
.clone(),
);
}
_ => (),
},
_ => (),
}
}
fn handle_submit(&mut self) {}
fn handle_esc(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::MovieDetails
| ActiveRadarrBlock::MovieHistory
| ActiveRadarrBlock::FileInfo
| ActiveRadarrBlock::Cast
| ActiveRadarrBlock::Crew => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_movie_info_tabs();
}
_ => (),
}
}
fn handle_char_key_event(&mut self) {}
}