From fe8150b923b89c2428cc7cfd8e4aebb87e08f710 Mon Sep 17 00:00:00 2001 From: Dark-Alex-17 Date: Tue, 8 Aug 2023 10:50:05 -0600 Subject: [PATCH] Fixed output path being nullable bug for downloads --- src/models/radarr_models.rs | 2 +- src/network/radarr_network.rs | 4 +++- src/ui/radarr_ui/mod.rs | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/models/radarr_models.rs b/src/models/radarr_models.rs index 108d49d..64f4cbe 100644 --- a/src/models/radarr_models.rs +++ b/src/models/radarr_models.rs @@ -155,7 +155,7 @@ pub struct DownloadRecord { pub size: Number, #[derivative(Default(value = "Number::from(0)"))] pub sizeleft: Number, - pub output_path: HorizontallyScrollableText, + pub output_path: Option, pub indexer: String, pub download_client: String, } diff --git a/src/network/radarr_network.rs b/src/network/radarr_network.rs index 4a10dd3..ef3bc7b 100644 --- a/src/network/radarr_network.rs +++ b/src/network/radarr_network.rs @@ -2197,7 +2197,9 @@ mod test { id: Number::from(1), size: Number::from(3543348019u64), sizeleft: Number::from(1771674009u64), - output_path: HorizontallyScrollableText::from("/nfs/movies/Test".to_owned()), + output_path: Some(HorizontallyScrollableText::from( + "/nfs/movies/Test".to_owned(), + )), indexer: "kickass torrents".to_owned(), download_client: "transmission".to_owned(), } diff --git a/src/ui/radarr_ui/mod.rs b/src/ui/radarr_ui/mod.rs index e516df2..1e755d1 100644 --- a/src/ui/radarr_ui/mod.rs +++ b/src/ui/radarr_ui/mod.rs @@ -384,7 +384,8 @@ fn draw_downloads(f: &mut Frame<'_, B>, app: &mut App, area: Rect) { .. } = download_record; - output_path.scroll_or_reset(get_width(area), current_selection == *download_record); + let path = output_path.clone().unwrap_or_default(); + path.scroll_or_reset(get_width(area), current_selection == *download_record); let percent = 1f64 - (sizeleft.as_f64().unwrap() / size.as_f64().unwrap()); let file_size: f64 = convert_to_gb(size.as_u64().unwrap()); @@ -393,7 +394,7 @@ fn draw_downloads(f: &mut Frame<'_, B>, app: &mut App, area: Rect) { Cell::from(title.to_owned()), Cell::from(format!("{:.0}%", percent * 100.0)), Cell::from(format!("{:.2} GB", file_size)), - Cell::from(output_path.to_string()), + Cell::from(path.to_string()), Cell::from(indexer.to_owned()), Cell::from(download_client.to_owned()), ])