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

Did a lot of things in this one: Cleaned up a bit of leftover unused code from yesterday; deprecated the use of drain() on HorizontallyScrollableText; Refactored the uses of search and filter to be wrapped in Options; Fixed a race condition when closing the Add Movie modals in rapid succession; upgraded to ratatui 0.22.0; Fixed a bug in attempting to close an empty root folder; fixed a bug in attempting to close an empty filter; fixed a bug in attempting to close an empty search; fixed a bug in attempting to close an empty filter without resetting the view; fixed a bug in attempting to delete a movie after dynamically added one and updating the main library table

Browse Source
This commit is contained in:
Dark-Alex-17
2023-08-08 10:50:07 -06:00
parent 2d624e2648
commit 77fd9e621f
28 changed files with 1151 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/models/servarr_data/radarr/modals_tests.rs
+1 -4
View File
@@ -6,7 +6,7 @@ mod test {
};
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::RadarrData;
use crate::models::{HorizontallyScrollableText, StatefulTable};
use crate::models::StatefulTable;
use bimap::BiMap;
use pretty_assertions::{assert_eq, assert_str_eq};
use rstest::rstest;
@@ -16,9 +16,6 @@ mod test {
#[rstest]
fn test_edit_movie_modal_from_radarr_data(#[values(true, false)] test_filtered_movies: bool) {
let mut radarr_data = RadarrData {
edit_path: HorizontallyScrollableText::default(),
edit_tags: HorizontallyScrollableText::default(),
edit_monitored: None,
quality_profile_map: BiMap::from_iter([
(2222, "HD - 1080p".to_owned()),
(1111, "Any".to_owned()),
src/models/servarr_data/radarr/radarr_data.rs
+11 -25
View File
@@ -7,8 +7,7 @@ use crate::app::radarr::radarr_context_clues::{
};
use crate::models::radarr_models::{
AddMovieSearchResult, Collection, CollectionMovie, Credit, DiskSpace, DownloadRecord, Indexer,
IndexerSettings, MinimumAvailability, Monitor, Movie, MovieHistoryItem, QueueEvent, Release,
ReleaseField, RootFolder, Task,
IndexerSettings, Movie, MovieHistoryItem, QueueEvent, Release, ReleaseField, RootFolder, Task,
};
use crate::models::servarr_data::radarr::modals::{
AddMovieModal, EditCollectionModal, EditMovieModal,
@@ -38,10 +37,6 @@ pub struct RadarrData<'a> {
pub movies: StatefulTable<Movie>,
pub filtered_movies: StatefulTable<Movie>,
pub add_searched_movies: StatefulTable<AddMovieSearchResult>,
pub monitor_list: StatefulList<Monitor>,
pub minimum_availability_list: StatefulList<MinimumAvailability>,
pub quality_profile_list: StatefulList<String>,
pub root_folder_list: StatefulList<RootFolder>,
pub selected_block: BlockSelectionState<'a, ActiveRadarrBlock>,
pub downloads: StatefulTable<DownloadRecord>,
pub indexers: StatefulTable<Indexer>,
@@ -68,15 +63,12 @@ pub struct RadarrData<'a> {
pub prompt_confirm_action: Option<RadarrEvent>,
pub main_tabs: TabState,
pub movie_info_tabs: TabState,
pub search: HorizontallyScrollableText,
pub filter: HorizontallyScrollableText,
pub search: Option<HorizontallyScrollableText>,
pub filter: Option<HorizontallyScrollableText>,
pub add_movie_modal: Option<AddMovieModal>,
pub edit_movie_modal: Option<EditMovieModal>,
pub edit_collection_modal: Option<EditCollectionModal>,
pub edit_path: HorizontallyScrollableText,
pub edit_tags: HorizontallyScrollableText,
pub edit_monitored: Option<bool>,
pub edit_search_on_add: Option<bool>,
pub edit_root_folder: Option<HorizontallyScrollableText>,
pub sort_ascending: Option<bool>,
pub prompt_confirm: bool,
pub delete_movie_files: bool,
@@ -93,8 +85,8 @@ impl<'a> RadarrData<'a> {
pub fn reset_search(&mut self) {
self.is_searching = false;
self.search = HorizontallyScrollableText::default();
self.filter = HorizontallyScrollableText::default();
self.search = None;
self.filter = None;
self.filtered_movies = StatefulTable::default();
self.filtered_collections = StatefulTable::default();
self.add_searched_movies = StatefulTable::default();
@@ -102,7 +94,7 @@ impl<'a> RadarrData<'a> {
pub fn reset_filter(&mut self) {
self.is_filtering = false;
self.filter = HorizontallyScrollableText::default();
self.filter = None;
self.filtered_movies = StatefulTable::default();
self.filtered_collections = StatefulTable::default();
}
@@ -131,10 +123,6 @@ impl<'a> Default for RadarrData<'a> {
start_time: DateTime::default(),
movies: StatefulTable::default(),
add_searched_movies: StatefulTable::default(),
monitor_list: StatefulList::default(),
minimum_availability_list: StatefulList::default(),
quality_profile_list: StatefulList::default(),
root_folder_list: StatefulList::default(),
selected_block: BlockSelectionState::default(),
filtered_movies: StatefulTable::default(),
downloads: StatefulTable::default(),
@@ -160,15 +148,12 @@ impl<'a> Default for RadarrData<'a> {
queued_events: StatefulTable::default(),
updates: ScrollableText::default(),
prompt_confirm_action: None,
search: HorizontallyScrollableText::default(),
filter: HorizontallyScrollableText::default(),
search: None,
filter: None,
add_movie_modal: None,
edit_movie_modal: None,
edit_collection_modal: None,
edit_path: HorizontallyScrollableText::default(),
edit_tags: HorizontallyScrollableText::default(),
edit_monitored: None,
edit_search_on_add: None,
edit_root_folder: None,
sort_ascending: None,
is_searching: false,
is_filtering: false,
@@ -497,6 +482,7 @@ impl From<(ActiveRadarrBlock, Option<ActiveRadarrBlock>)> for Route {
}
}
#[allow(dead_code)] // Returning to this work tomorrow
pub struct EditIndexerSettings {
pub allow_hardcoded_subs: bool,
pub availability_delay: HorizontallyScrollableText,
src/models/servarr_data/radarr/radarr_data_tests.rs
+3 -10
View File
@@ -81,10 +81,6 @@ mod tests {
assert_eq!(radarr_data.start_time, <DateTime<Utc>>::default());
assert!(radarr_data.movies.items.is_empty());
assert!(radarr_data.add_searched_movies.items.is_empty());
assert!(radarr_data.monitor_list.items.is_empty());
assert!(radarr_data.minimum_availability_list.items.is_empty());
assert!(radarr_data.quality_profile_list.items.is_empty());
assert!(radarr_data.root_folder_list.items.is_empty());
assert_eq!(radarr_data.selected_block, BlockSelectionState::default());
assert!(radarr_data.filtered_movies.items.is_empty());
assert!(radarr_data.downloads.items.is_empty());
@@ -110,15 +106,12 @@ mod tests {
assert!(radarr_data.queued_events.items.is_empty());
assert!(radarr_data.updates.get_text().is_empty());
assert!(radarr_data.prompt_confirm_action.is_none());
assert!(radarr_data.search.text.is_empty());
assert!(radarr_data.filter.text.is_empty());
assert!(radarr_data.search.is_none());
assert!(radarr_data.filter.is_none());
assert!(radarr_data.add_movie_modal.is_none());
assert!(radarr_data.edit_movie_modal.is_none());
assert!(radarr_data.edit_collection_modal.is_none());
assert!(radarr_data.edit_path.text.is_empty());
assert!(radarr_data.edit_tags.text.is_empty());
assert!(radarr_data.edit_monitored.is_none());
assert!(radarr_data.edit_search_on_add.is_none());
assert!(radarr_data.edit_root_folder.is_none());
assert!(radarr_data.sort_ascending.is_none());
assert!(!radarr_data.is_searching);
assert!(!radarr_data.is_filtering);
src/models/servarr_data/radarr/radarr_test_utils.rs
+8 -21
View File
@@ -1,8 +1,8 @@
#[cfg(test)]
pub mod utils {
use crate::models::radarr_models::{
AddMovieSearchResult, Collection, CollectionMovie, Credit, MinimumAvailability, Monitor, Movie,
MovieHistoryItem, Release, ReleaseField, RootFolder,
AddMovieSearchResult, Collection, CollectionMovie, Credit, Movie, MovieHistoryItem, Release,
ReleaseField,
};
use crate::models::servarr_data::radarr::radarr_data::RadarrData;
use crate::models::{HorizontallyScrollableText, ScrollableText};
@@ -13,12 +13,9 @@ pub mod utils {
is_filtering: true,
delete_movie_files: true,
add_list_exclusion: true,
search: "test search".to_owned().into(),
filter: "test filter".to_owned().into(),
edit_path: "test path".to_owned().into(),
edit_tags: "usenet, test".to_owned().into(),
edit_monitored: Some(true),
edit_search_on_add: Some(true),
search: Some("test search".into()),
filter: Some("test filter".into()),
edit_root_folder: Some("test path".into()),
file_details: "test file details".to_owned(),
audio_details: "test audio details".to_owned(),
video_details: "test video details".to_owned(),
@@ -34,16 +31,6 @@ pub mod utils {
.movie_releases
.set_items(vec![Release::default()]);
radarr_data.movie_info_tabs.index = 1;
radarr_data.monitor_list.set_items(vec![Monitor::default()]);
radarr_data
.minimum_availability_list
.set_items(vec![MinimumAvailability::default()]);
radarr_data
.quality_profile_list
.set_items(vec![String::default()]);
radarr_data
.root_folder_list
.set_items(vec![RootFolder::default()]);
radarr_data
.movie_releases_sort
.set_items(vec![ReleaseField::default()]);
@@ -71,8 +58,8 @@ pub mod utils {
macro_rules! assert_search_reset {
($radarr_data:expr) => {
assert!(!$radarr_data.is_searching);
assert!($radarr_data.search.text.is_empty());
assert!($radarr_data.filter.text.is_empty());
assert!($radarr_data.search.is_none());
assert!($radarr_data.filter.is_none());
assert!($radarr_data.filtered_movies.items.is_empty());
assert!($radarr_data.filtered_collections.items.is_empty());
assert!($radarr_data.add_searched_movies.items.is_empty());
@@ -83,7 +70,7 @@ pub mod utils {
macro_rules! assert_filter_reset {
($radarr_data:expr) => {
assert!(!$radarr_data.is_filtering);
assert!($radarr_data.filter.text.is_empty());
assert!($radarr_data.filter.is_none());
assert!($radarr_data.filtered_movies.items.is_empty());
assert!($radarr_data.filtered_collections.items.is_empty());
};