Implemented full system browsing support with logs, events, and tasks.

This commit is contained in:
2023-08-08 10:50:06 -06:00
parent 460efb2497
commit b2e475200c
25 changed files with 1209 additions and 233 deletions
+10
View File
@@ -19,6 +19,8 @@ generate_keybindings! {
filter,
sort,
edit,
logs,
tasks,
refresh,
update,
home,
@@ -75,6 +77,14 @@ pub const DEFAULT_KEYBINDINGS: KeyBindings = KeyBindings {
key: Key::Char('e'),
desc: "Edit",
},
logs: KeyBinding {
key: Key::Char('l'),
desc: "Logs",
},
tasks: KeyBinding {
key: Key::Char('t'),
desc: "Tasks",
},
refresh: KeyBinding {
key: Key::Char('r'),
desc: "Refresh",
+24 -7
View File
@@ -4,8 +4,9 @@ use strum::IntoEnumIterator;
use crate::app::{App, Route};
use crate::models::radarr_models::{
AddMovieSearchResult, Collection, CollectionMovie, Credit, DiskSpace, DownloadRecord, Event, Log,
MinimumAvailability, Monitor, Movie, MovieHistoryItem, Release, ReleaseField, RootFolder, Task,
AddMovieSearchResult, Collection, CollectionMovie, Credit, DiskSpace, DownloadRecord,
MinimumAvailability, Monitor, Movie, MovieHistoryItem, QueueEvent, Release, ReleaseField,
RootFolder, Task,
};
use crate::models::{
BlockSelectionState, HorizontallyScrollableText, ScrollableText, StatefulList, StatefulTable,
@@ -49,9 +50,10 @@ pub struct RadarrData<'a> {
pub collections: StatefulTable<Collection>,
pub filtered_collections: StatefulTable<Collection>,
pub collection_movies: StatefulTable<CollectionMovie>,
pub logs: StatefulList<Log>,
pub logs: StatefulList<HorizontallyScrollableText>,
pub log_details: StatefulList<HorizontallyScrollableText>,
pub tasks: StatefulTable<Task>,
pub events: StatefulTable<Event>,
pub queued_events: StatefulTable<QueueEvent>,
pub prompt_confirm_action: Option<RadarrEvent>,
pub main_tabs: TabState,
pub movie_info_tabs: TabState,
@@ -74,6 +76,10 @@ impl<'a> RadarrData<'a> {
self.collection_movies = StatefulTable::default();
}
pub fn reset_log_details_list(&mut self) {
self.log_details = StatefulList::default();
}
pub fn reset_delete_movie_preferences(&mut self) {
self.delete_movie_files = false;
self.add_list_exclusion = false;
@@ -269,8 +275,9 @@ impl<'a> Default for RadarrData<'a> {
filtered_collections: StatefulTable::default(),
collection_movies: StatefulTable::default(),
logs: StatefulList::default(),
log_details: StatefulList::default(),
tasks: StatefulTable::default(),
events: StatefulTable::default(),
queued_events: StatefulTable::default(),
prompt_confirm_action: None,
search: HorizontallyScrollableText::default(),
filter: HorizontallyScrollableText::default(),
@@ -313,7 +320,7 @@ impl<'a> Default for RadarrData<'a> {
title: "System",
route: ActiveRadarrBlock::System.into(),
help: "",
contextual_help: Some("<t> open tasks | <u> open queue | <l> open logs")
contextual_help: Some("<t> open tasks | <u> open queue | <l> open logs | <r> refresh")
}
]),
movie_info_tabs: TabState::new(vec![
@@ -410,6 +417,10 @@ pub enum ActiveRadarrBlock {
Movies,
RootFolders,
System,
SystemLogs,
SystemTasks,
SystemTaskStartConfirmPrompt,
SystemQueue,
UpdateAndScanPrompt,
UpdateAllCollectionsPrompt,
UpdateAllMoviesPrompt,
@@ -508,6 +519,12 @@ pub static DELETE_MOVIE_SELECTION_BLOCKS: [ActiveRadarrBlock; 3] = [
ActiveRadarrBlock::DeleteMovieToggleAddListExclusion,
ActiveRadarrBlock::DeleteMovieConfirmPrompt,
];
pub static SYSTEM_DETAILS_BLOCKS: [ActiveRadarrBlock; 4] = [
ActiveRadarrBlock::SystemLogs,
ActiveRadarrBlock::SystemTasks,
ActiveRadarrBlock::SystemQueue,
ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
];
impl From<ActiveRadarrBlock> for Route {
fn from(active_radarr_block: ActiveRadarrBlock) -> Route {
@@ -557,7 +574,7 @@ impl<'a> App<'a> {
.dispatch_network_event(RadarrEvent::GetTasks.into())
.await;
self
.dispatch_network_event(RadarrEvent::GetEvents.into())
.dispatch_network_event(RadarrEvent::GetQueuedEvents.into())
.await;
self
.dispatch_network_event(RadarrEvent::GetLogs.into())
+6 -4
View File
@@ -2,10 +2,10 @@
pub mod utils {
use crate::app::radarr::RadarrData;
use crate::models::radarr_models::{
AddMovieSearchResult, Collection, CollectionMovie, Credit, Log, MinimumAvailability, Monitor,
Movie, MovieHistoryItem, Release, ReleaseField, RootFolder,
AddMovieSearchResult, Collection, CollectionMovie, Credit, MinimumAvailability, Monitor, Movie,
MovieHistoryItem, Release, ReleaseField, RootFolder,
};
use crate::models::ScrollableText;
use crate::models::{HorizontallyScrollableText, ScrollableText};
pub fn create_test_radarr_data<'a>() -> RadarrData<'a> {
let mut radarr_data = RadarrData {
@@ -60,7 +60,9 @@ pub mod utils {
radarr_data
.collection_movies
.set_items(vec![CollectionMovie::default()]);
radarr_data.logs.set_items(vec![Log::default()]);
radarr_data
.log_details
.set_items(vec![HorizontallyScrollableText::default()]);
radarr_data
}
+13 -3
View File
@@ -44,6 +44,15 @@ mod tests {
assert!(radarr_data.collection_movies.items.is_empty());
}
#[test]
fn test_reset_log_details_list() {
let mut radarr_data = create_test_radarr_data();
radarr_data.reset_log_details_list();
assert!(radarr_data.log_details.items.is_empty());
}
#[test]
fn test_reset_delete_movie_preferences() {
let mut radarr_data = create_test_radarr_data();
@@ -279,8 +288,9 @@ mod tests {
assert!(radarr_data.filtered_collections.items.is_empty());
assert!(radarr_data.collection_movies.items.is_empty());
assert!(radarr_data.logs.items.is_empty());
assert!(radarr_data.log_details.items.is_empty());
assert!(radarr_data.tasks.items.is_empty());
assert!(radarr_data.events.items.is_empty());
assert!(radarr_data.queued_events.items.is_empty());
assert!(radarr_data.prompt_confirm_action.is_none());
assert!(radarr_data.search.text.is_empty());
assert!(radarr_data.filter.text.is_empty());
@@ -345,7 +355,7 @@ mod tests {
assert!(radarr_data.main_tabs.tabs[4].help.is_empty());
assert_eq!(
radarr_data.main_tabs.tabs[4].contextual_help,
Some("<t> open tasks | <u> open queue | <l> open logs")
Some("<t> open tasks | <u> open queue | <l> open logs | <r> refresh")
);
assert_eq!(radarr_data.movie_info_tabs.tabs.len(), 6);
@@ -688,7 +698,7 @@ mod tests {
);
assert_eq!(
sync_network_rx.recv().await.unwrap(),
RadarrEvent::GetEvents.into()
RadarrEvent::GetQueuedEvents.into()
);
assert_eq!(
sync_network_rx.recv().await.unwrap(),