From 2870a45ee6fb8c885423cfec78db00b2f12a026b Mon Sep 17 00:00:00 2001 From: Dark-Alex-17 Date: Tue, 8 Aug 2023 10:50:05 -0600 Subject: [PATCH] Fixed another bug with properly showing the right colors for downloading files. Accidentally named the download field `id` instead of `movie_id` --- src/models/radarr_models.rs | 2 +- src/network/radarr_network.rs | 10 +++++----- src/ui/radarr_ui/mod.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/models/radarr_models.rs b/src/models/radarr_models.rs index 2944178..ec9a445 100644 --- a/src/models/radarr_models.rs +++ b/src/models/radarr_models.rs @@ -154,7 +154,7 @@ pub struct DownloadRecord { pub title: String, pub status: String, #[derivative(Default(value = "Number::from(0)"))] - pub id: Number, + pub movie_id: Number, #[derivative(Default(value = "Number::from(0)"))] pub size: Number, #[derivative(Default(value = "Number::from(0)"))] diff --git a/src/network/radarr_network.rs b/src/network/radarr_network.rs index d50c702..7a5e2b5 100644 --- a/src/network/radarr_network.rs +++ b/src/network/radarr_network.rs @@ -648,7 +648,7 @@ impl<'a> Network<'a> { .radarr_data .downloads .current_selection() - .id + .movie_id .as_u64() .unwrap(); @@ -857,7 +857,7 @@ fn get_movie_status(has_file: bool, downloads_vec: &[DownloadRecord], movie_id: if !has_file { if let Some(download) = downloads_vec .iter() - .find(|&download| download.id.as_u64().unwrap() == movie_id.as_u64().unwrap()) + .find(|&download| download.movie_id.as_u64().unwrap() == movie_id.as_u64().unwrap()) { if download.status == "downloading" { return "Downloading".to_owned(); @@ -2004,7 +2004,7 @@ mod test { #[test] fn test_get_movie_status_missing() { let download_record = DownloadRecord { - id: 1.into(), + movie_id: 1.into(), ..DownloadRecord::default() }; @@ -2025,7 +2025,7 @@ mod test { get_movie_status( false, &[DownloadRecord { - id: 1.into(), + movie_id: 1.into(), status: "downloading".to_owned(), ..DownloadRecord::default() }], @@ -2238,7 +2238,7 @@ mod test { DownloadRecord { title: "Test Download Title".to_owned(), status: "downloading".to_owned(), - id: Number::from(1), + movie_id: Number::from(1), size: Number::from(3543348019u64), sizeleft: Number::from(1771674009u64), output_path: Some(HorizontallyScrollableText::from( diff --git a/src/ui/radarr_ui/mod.rs b/src/ui/radarr_ui/mod.rs index 2f5be77..1eb8c6a 100644 --- a/src/ui/radarr_ui/mod.rs +++ b/src/ui/radarr_ui/mod.rs @@ -591,7 +591,7 @@ fn determine_row_style(downloads_vec: &[DownloadRecord], movie: &Movie) -> Style if !movie.has_file { if let Some(download) = downloads_vec .iter() - .find(|&download| download.id == movie.id) + .find(|&download| download.movie_id == movie.id) { if download.status == "downloading" { return style_warning();