diff --git a/src/models/servarr_data/readarr/readarr_data.rs b/src/models/servarr_data/readarr/readarr_data.rs index df0d8379..6d40006d 100644 --- a/src/models/servarr_data/readarr/readarr_data.rs +++ b/src/models/servarr_data/readarr/readarr_data.rs @@ -295,7 +295,7 @@ impl ReadarrData<'_> { statistics: Some(BookStatistics { book_file_count: 3, total_book_count: 7, - size_on_disk: 2469606195, + size_on_disk: 2457600, percent_of_books: 42.86, }), ..Book::default() @@ -538,7 +538,7 @@ impl ReadarrData<'_> { author_id: 1, book_id: 1, path: "/nfs/books/Test Author/Test Book.epub".to_owned(), - size: 3543348019, + size: 3355443, date_added: date, quality: quality.clone(), media_info: Some(MediaInfo { diff --git a/src/network/lidarr_network/library/albums/lidarr_albums_network_tests.rs b/src/network/lidarr_network/library/albums/lidarr_albums_network_tests.rs index 4023e4f5..bf7d1c34 100644 --- a/src/network/lidarr_network/library/albums/lidarr_albums_network_tests.rs +++ b/src/network/lidarr_network/library/albums/lidarr_albums_network_tests.rs @@ -34,7 +34,7 @@ mod tests { "trackFileCount": 8, "trackCount": 10, "totalTrackCount": 10, - "sizeOnDisk": 1024, + "sizeOnDisk": 317162578, "percentOfTracks": 99.9 } }]); diff --git a/src/network/lidarr_network/lidarr_network_test_utils.rs b/src/network/lidarr_network/lidarr_network_test_utils.rs index d35ad579..4d18199c 100644 --- a/src/network/lidarr_network/lidarr_network_test_utils.rs +++ b/src/network/lidarr_network/lidarr_network_test_utils.rs @@ -74,7 +74,7 @@ pub mod test_utils { "trackFileCount": 8, "trackCount": 10, "totalTrackCount": 10, - "sizeOnDisk": 1024, + "sizeOnDisk": 317162578, "percentOfTracks": 99.9 } }"#; @@ -250,7 +250,7 @@ pub mod test_utils { track_file_count: 8, track_count: 10, total_track_count: 10, - size_on_disk: 1024, + size_on_disk: 317162578, percent_of_tracks: 99.9, } } diff --git a/src/network/radarr_network/library/mod.rs b/src/network/radarr_network/library/mod.rs index 7bee027e..f17dfe94 100644 --- a/src/network/radarr_network/library/mod.rs +++ b/src/network/radarr_network/library/mod.rs @@ -11,7 +11,7 @@ use crate::models::stateful_table::StatefulTable; use crate::models::{Route, ScrollableText}; use crate::network::radarr_network::RadarrEvent; use crate::network::{Network, RequestMethod}; -use crate::utils::{convert_runtime, convert_to_gb}; +use crate::utils::{convert_runtime, format_size}; use anyhow::Result; use indoc::formatdoc; use log::{debug, info, warn}; @@ -319,7 +319,7 @@ impl Network<'_, '_> { .. } = movie_response; let (hours, minutes) = convert_runtime(runtime); - let size = convert_to_gb(size_on_disk); + let size = format_size(size_on_disk, 2); let studio = studio.clone().unwrap_or_default(); let quality_profile = app .data @@ -374,7 +374,7 @@ impl Network<'_, '_> { IMDB: {imdb_rating} Rotten Tomatoes: {rotten_tomatoes_rating} Quality Profile: {quality_profile} - Size: {size:.2} GB + Size: {size} Path: {path} Studio: {studio} Genres: {}", @@ -393,7 +393,7 @@ impl Network<'_, '_> { movie_details_modal.file_details = formatdoc!( "Relative Path: {} Absolute Path: {} - Size: {size:.2} GB + Size: {size} Date Added: {}", file.relative_path, file.path, diff --git a/src/network/radarr_network/library/radarr_library_network_tests.rs b/src/network/radarr_network/library/radarr_library_network_tests.rs index 97ca4491..bcafe528 100644 --- a/src/network/radarr_network/library/radarr_library_network_tests.rs +++ b/src/network/radarr_network/library/radarr_library_network_tests.rs @@ -759,7 +759,7 @@ mod tests { IMDB: Rotten Tomatoes: Quality Profile: HD - 1080p - Size: 0.00 GB + Size: 0.00 MB Path: /nfs/movies Studio: 21st Century Alex Genres: cool, family, fun" diff --git a/src/network/sonarr_network/library/episodes/mod.rs b/src/network/sonarr_network/library/episodes/mod.rs index 897e5ba9..25810653 100644 --- a/src/network/sonarr_network/library/episodes/mod.rs +++ b/src/network/sonarr_network/library/episodes/mod.rs @@ -8,7 +8,7 @@ use crate::models::sonarr_models::{ use crate::models::{Route, ScrollableText}; use crate::network::sonarr_network::SonarrEvent; use crate::network::{Network, RequestMethod}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use anyhow::Result; use indoc::formatdoc; use log::info; @@ -222,12 +222,12 @@ impl Network<'_, '_> { overview.unwrap_or_default(), )); if let Some(file) = episode_file { - let size = convert_to_gb(file.size); + let size = format_size(file.size, 2); episode_details_modal.file_details = formatdoc!( " Relative Path: {} Absolute Path: {} - Size: {size:.2} GB + Size: {size} Language: {} Date Added: {}", file.relative_path, diff --git a/src/ui/lidarr_ui/downloads/mod.rs b/src/ui/lidarr_ui/downloads/mod.rs index 004606da..0de74e66 100644 --- a/src/ui/lidarr_ui/downloads/mod.rs +++ b/src/ui/lidarr_ui/downloads/mod.rs @@ -12,7 +12,7 @@ use crate::ui::utils::{get_width_from_percentage, layout_block_top_border}; use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; -use crate::utils::convert_f64_to_gb; +use crate::utils::format_size; #[cfg(test)] #[path = "downloads_ui_tests.rs"] @@ -97,12 +97,12 @@ fn draw_downloads(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { } else { 1f64 - (*sizeleft / *size) }; - let file_size: f64 = convert_f64_to_gb(*size); + let file_size = format_size(*size as i64, 2); Row::new(vec![ Cell::from(title.to_owned()), Cell::from(format!("{:.0}%", percent * 100.0)), - Cell::from(format!("{file_size:.2} GB")), + Cell::from(file_size), Cell::from( output_path .as_ref() diff --git a/src/ui/lidarr_ui/library/album_details_ui.rs b/src/ui/lidarr_ui/library/album_details_ui.rs index 74c71fb5..46624d97 100644 --- a/src/ui/lidarr_ui/library/album_details_ui.rs +++ b/src/ui/lidarr_ui/library/album_details_ui.rs @@ -15,7 +15,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::message::Message; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_popup, draw_tabs}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use ratatui::Frame; use ratatui::layout::{Alignment, Constraint, Rect}; use ratatui::prelude::{Line, Stylize, Text}; @@ -377,7 +377,7 @@ fn draw_album_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { && active_lidarr_block != ActiveLidarrBlock::ManualAlbumSearchConfirmPrompt, app.should_text_scroll, ); - let size = convert_to_gb(*size); + let size = format_size(*size, 1); let rejected_str = if *rejected { "⛔" } else { "" }; let peers = if seeders.is_none() || leechers.is_none() { Text::from("") @@ -408,7 +408,7 @@ fn draw_album_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(rejected_str), Cell::from(title.to_string()), Cell::from(indexer.clone()), - Cell::from(format!("{size:.1} GB")), + Cell::from(size), Cell::from(peers), Cell::from(quality_name), ]) diff --git a/src/ui/lidarr_ui/library/artist_details_ui.rs b/src/ui/lidarr_ui/library/artist_details_ui.rs index fe79a7ce..9f86c456 100644 --- a/src/ui/lidarr_ui/library/artist_details_ui.rs +++ b/src/ui/lidarr_ui/library/artist_details_ui.rs @@ -26,7 +26,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::message::Message; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_popup, draw_tabs}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use ratatui::layout::Alignment; use ratatui::text::Text; use serde_json::Number; @@ -223,7 +223,7 @@ fn draw_artist_description(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { ]; if let Some(stats) = current_selection.statistics.as_ref() { - let size = convert_to_gb(stats.size_on_disk); + let size = format_size(stats.size_on_disk, 2); artist_description.extend(vec![ Line::from(vec![ "Albums: ".primary().bold(), @@ -235,7 +235,7 @@ fn draw_artist_description(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { ]), Line::from(vec![ "Size on Disk: ".primary().bold(), - format!("{size:.2} GB").default_color(), + size.default_color(), ]), ]); } @@ -282,13 +282,10 @@ fn draw_albums_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { || "N/A".to_owned(), |s| format!("{}/{}", s.track_file_count, s.total_track_count), ); - let size = album.statistics.as_ref().map_or_else( - || "N/A".to_owned(), - |s| { - let size = convert_to_gb(s.size_on_disk); - format!("{size:.2} GB") - }, - ); + let size = album + .statistics + .as_ref() + .map_or_else(|| "N/A".to_owned(), |s| format_size(s.size_on_disk, 2)); let duration_mins = album.duration / 60000; decorate_album_row_with_style( @@ -500,7 +497,7 @@ fn draw_artist_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { && active_lidarr_block != ActiveLidarrBlock::ManualArtistSearchConfirmPrompt, app.should_text_scroll, ); - let size = convert_to_gb(*size); + let size = format_size(*size, 1); let rejected_str = if *rejected { "⛔" } else { "" }; let peers = if seeders.is_none() || leechers.is_none() { Text::from("") @@ -531,7 +528,7 @@ fn draw_artist_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(rejected_str), Cell::from(title.to_string()), Cell::from(indexer.clone()), - Cell::from(format!("{size:.1} GB")), + Cell::from(size), Cell::from(peers), Cell::from(quality_name), ]) diff --git a/src/ui/lidarr_ui/library/mod.rs b/src/ui/lidarr_ui/library/mod.rs index 2100d8de..ed6584f1 100644 --- a/src/ui/lidarr_ui/library/mod.rs +++ b/src/ui/lidarr_ui/library/mod.rs @@ -13,7 +13,7 @@ use crate::ui::widgets::{ confirmation_prompt::ConfirmationPrompt, popup::{Popup, Size}, }; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use crate::{ app::App, models::{ @@ -104,7 +104,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { let size = artist .statistics .as_ref() - .map_or(0f64, |stats| convert_to_gb(stats.size_on_disk)); + .map_or(0, |stats| stats.size_on_disk); let quality_profile = quality_profile_map .get_by_left(&artist.quality_profile_id) .cloned() @@ -140,7 +140,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(metadata_profile), Cell::from(albums.to_string()), Cell::from(tracks), - Cell::from(format!("{size:.2} GB")), + Cell::from(format_size(size, 2)), Cell::from(monitored.to_owned()), Cell::from(tags), ]), diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_AutomaticallySearchAlbumPrompt_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_AutomaticallySearchAlbumPrompt_2.snap index 70a533ed..bd30a682 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_AutomaticallySearchAlbumPrompt_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_AutomaticallySearchAlbumPrompt_2.snap @@ -10,8 +10,8 @@ expression: output │ Tracks │ History │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 Lossless │ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB Lossless │ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 Lossless │ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB Lossless │ │ │ │ │ │ │ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearchConfirmPrompt_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearchConfirmPrompt_2.snap index 6791f5c7..c6e6e8a3 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearchConfirmPrompt_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearchConfirmPrompt_2.snap @@ -10,8 +10,8 @@ expression: output │ Tracks │ History │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 Lossless │ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB Lossless │ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 Lossless │ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB Lossless │ │ │ │ │ │ │ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearchSortPrompt_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearchSortPrompt_2.snap index 9bfe80d5..43271405 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearchSortPrompt_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearchSortPrompt_2.snap @@ -10,8 +10,8 @@ expression: output │ Tracks │ History │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source Age ⛔ Title Indexer Size Peers Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 Lossless │ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB Lossless │ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 Lossless │ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB Lossless │ │ │ │ │ │ │ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearch_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearch_2.snap index 9c738089..5406c4be 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearch_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__album_details_ui__album_details_ui_tests__tests__snapshot_tests__album_details_renders_ManualAlbumSearch_2.snap @@ -10,8 +10,8 @@ expression: output │ Tracks │ History │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 Lossless │ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB Lossless │ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 Lossless │ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB Lossless │ │ │ │ │ │ │ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ArtistDetails_0.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ArtistDetails_0.snap index 651ed30a..1c6b39d2 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ArtistDetails_0.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ArtistDetails_0.snap @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Monitored Title Type Tracks Duration Release Date Size ││ - ││=> 🏷 Test Album Album 8/10 0 min 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album Album 8/10 0 min 2023-01-01 302.47 MB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_AutomaticallySearchArtistPrompt_0.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_AutomaticallySearchArtistPrompt_0.snap index 1ff0a887..96959850 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_AutomaticallySearchArtistPrompt_0.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_AutomaticallySearchArtistPrompt_0.snap @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search │ │ ││ ││─────────────────────────────────────────│ │───────────────────────────────────────────││ ││ Monitored Title │ │ Release Date Size ││ - ││=> 🏷 Test Album │ │ 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album │ │ 2023-01-01 302.47 MB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_AutomaticallySearchArtistPrompt_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_AutomaticallySearchArtistPrompt_2.snap index 202d5722..2115191a 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_AutomaticallySearchArtistPrompt_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_AutomaticallySearchArtistPrompt_2.snap @@ -24,8 +24,8 @@ expression: output ││ Albums │ History │ Manual Search │ │ ││ ││─────────────────────────────────────────│ │───────────────────────────────────────────││ ││ Source ▼ Age ⛔ Title │ │ Size Peers Quality ││ - ││=> torrent 1 days ⛔ Test Releas│ │ 0.0 GB 2 / 1 Lossless ││ - ││ usenet 1 days ⛔ Test Releas│ │ 0.0 GB Lossless ││ + ││=> torrent 1 days ⛔ Test Releas│ │ 0.0 MB 2 / 1 Lossless ││ + ││ usenet 1 days ⛔ Test Releas│ │ 0.0 MB Lossless ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearchConfirmPrompt_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearchConfirmPrompt_2.snap index 1a8aa658..983b1e5e 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearchConfirmPrompt_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearchConfirmPrompt_2.snap @@ -24,8 +24,8 @@ expression: output ││ Albums │ History │ Manual Search │ │ ││ ││────────────────────────────────────────│Rejection reasons: │───────────────────────────────────────││ ││ Source ▼ Age ⛔ Title │• Unknown quality profile │e Peers Quality ││ - ││=> torrent 1 days ⛔ Test Relea│• Release is already mapped │ GB 2 / 1 Lossless ││ - ││ usenet 1 days ⛔ Test Relea│ │ GB Lossless ││ + ││=> torrent 1 days ⛔ Test Relea│• Release is already mapped │ MB 2 / 1 Lossless ││ + ││ usenet 1 days ⛔ Test Relea│ │ MB Lossless ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearchSortPrompt_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearchSortPrompt_2.snap index cd61dab9..8beb877d 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearchSortPrompt_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearchSortPrompt_2.snap @@ -24,8 +24,8 @@ expression: output ││ Albums │ History │ Manual Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Source Age ⛔ Title Indexer Size Peers Quality ││ - ││=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 Lossless ││ - ││ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB Lossless ││ + ││=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 Lossless ││ + ││ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB Lossless ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearch_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearch_2.snap index 2b649fe3..46a9082a 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearch_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ManualArtistSearch_2.snap @@ -24,8 +24,8 @@ expression: output ││ Albums │ History │ Manual Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Source ▼ Age ⛔ Title Indexer Size Peers Quality ││ - ││=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 Lossless ││ - ││ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB Lossless ││ + ││=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 Lossless ││ + ││ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB Lossless ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_SearchAlbumsError_0.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_SearchAlbumsError_0.snap index 756fe8e1..c65c57da 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_SearchAlbumsError_0.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_SearchAlbumsError_0.snap @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Monitored Title Type Tracks Duration Release Date Size ││ - ││=> 🏷 Test Album Album 8/10 0 min 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album Album 8/10 0 min 2023-01-01 302.47 MB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_SearchAlbums_0.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_SearchAlbums_0.snap index 8e46d73d..be5daf72 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_SearchAlbums_0.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_SearchAlbums_0.snap @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Monitored Title Type Tracks Duration Release Date Size ││ - ││=> 🏷 Test Album Album 8/10 0 min 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album Album 8/10 0 min 2023-01-01 302.47 MB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_UpdateAndScanArtistPrompt_0.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_UpdateAndScanArtistPrompt_0.snap index d112a74d..5b615091 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_UpdateAndScanArtistPrompt_0.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_UpdateAndScanArtistPrompt_0.snap @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search │ │ ││ ││─────────────────────────────────────────│ │───────────────────────────────────────────││ ││ Monitored Title │ │ Release Date Size ││ - ││=> 🏷 Test Album │ │ 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album │ │ 2023-01-01 302.47 MB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_UpdateAndScanArtistPrompt_2.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_UpdateAndScanArtistPrompt_2.snap index cb9bd135..96b7f3da 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_UpdateAndScanArtistPrompt_2.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_UpdateAndScanArtistPrompt_2.snap @@ -24,8 +24,8 @@ expression: output ││ Albums │ History │ Manual Search │ │ ││ ││─────────────────────────────────────────│ │───────────────────────────────────────────││ ││ Source ▼ Age ⛔ Title │ │ Size Peers Quality ││ - ││=> torrent 1 days ⛔ Test Releas│ │ 0.0 GB 2 / 1 Lossless ││ - ││ usenet 1 days ⛔ Test Releas│ │ 0.0 GB Lossless ││ + ││=> torrent 1 days ⛔ Test Releas│ │ 0.0 MB 2 / 1 Lossless ││ + ││ usenet 1 days ⛔ Test Releas│ │ 0.0 MB Lossless ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_automatic_search_prompt_over_artist_details.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_automatic_search_prompt_over_artist_details.snap index 1ff0a887..96959850 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_automatic_search_prompt_over_artist_details.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_automatic_search_prompt_over_artist_details.snap @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search │ │ ││ ││─────────────────────────────────────────│ │───────────────────────────────────────────││ ││ Monitored Title │ │ Release Date Size ││ - ││=> 🏷 Test Album │ │ 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album │ │ 2023-01-01 302.47 MB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_delete_album_prompt_over_artist_details.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_delete_album_prompt_over_artist_details.snap index 2a032e8c..f6ba7021 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_delete_album_prompt_over_artist_details.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_delete_album_prompt_over_artist_details.snap @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search │ │ ││ ││─────────────────────────────────────────│ │───────────────────────────────────────────││ ││ Monitored Title │ ╭───╮ │ Release Date Size ││ - ││=> 🏷 Test Album │ Delete Album Files: │ ✔ │ │ 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album │ Delete Album Files: │ ✔ │ │ 2023-01-01 302.47 MB ││ ││ │ ╰───╯ │ ││ ││ │ ╭───╮ │ ││ ││ │ Add List Exclusion: │ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_update_and_scan_prompt_over_artist_details.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_update_and_scan_prompt_over_artist_details.snap index d112a74d..5b615091 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_update_and_scan_prompt_over_artist_details.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_update_and_scan_prompt_over_artist_details.snap @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search │ │ ││ ││─────────────────────────────────────────│ │───────────────────────────────────────────││ ││ Monitored Title │ │ Release Date Size ││ - ││=> 🏷 Test Album │ │ 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album │ │ 2023-01-01 302.47 MB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ArtistDetails.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ArtistDetails.snap index 4757389b..a1f208d5 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ArtistDetails.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ArtistDetails.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex ╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Artist: Alex │ │Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│ @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Monitor New Albums: │All Albums ▼ │ │ ││ ││──────────────────│ ╰─────────────────────────────────────────────────╯ │────────────────────││ ││ Monitored Titl│ ╭─────────────────────────────────────────────────╮ │ize ││ - ││=> 🏷 Test│ Quality Profile: │Lossless ▼ │ │.00 GB ││ + ││=> 🏷 Test│ Quality Profile: │Lossless ▼ │ │02.47 MB ││ ││ │ ╰─────────────────────────────────────────────────╯ │ ││ ││ │ ╭─────────────────────────────────────────────────╮ │ ││ ││ │ Metadata Profile: │Standard ▼ │ │ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ArtistHistory.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ArtistHistory.snap index bfc2c4fe..87198105 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ArtistHistory.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ArtistHistory.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex ╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Artist: Alex │ │Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ManualArtistSearch.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ManualArtistSearch.snap index 71401ee8..18e0d3ab 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ManualArtistSearch.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__edit_artist_renders_over_ManualArtistSearch.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex ╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Artist: Alex │ │Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_artist_details_over_library.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_artist_details_over_library.snap index 28aacdbb..a36b629b 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_artist_details_over_library.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_artist_details_over_library.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex ╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Artist: Alex │ │Overview: some interesting description of the artist She was born in Madison, Wisconsin: a city she has never really left. Her first album took her│ @@ -24,7 +24,7 @@ expression: output ││ Albums │ History │ Manual Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Monitored Title Type Tracks Duration Release Date Size ││ - ││=> 🏷 Test Album Album 8/10 0 min 2023-01-01 0.00 GB ││ + ││=> 🏷 Test Album Album 8/10 0 min 2023-01-01 302.47 MB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_delete_artist_over_library.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_delete_artist_over_library.snap index ee7c69bf..ca9ffab9 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_delete_artist_over_library.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_delete_artist_over_library.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_dropdown_over_edit_artist_over_artist_details.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_dropdown_over_edit_artist_over_artist_details.snap index 1955204e..1a02d863 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_dropdown_over_edit_artist_over_artist_details.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_dropdown_over_edit_artist_over_artist_details.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_update_all_artists_prompt.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_update_all_artists_prompt.snap index 83c5301c..6c895a09 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_update_all_artists_prompt.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_update_all_artists_prompt.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_Artists.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_Artists.snap index 45fd1574..6c07d7e7 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_Artists.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_Artists.snap @@ -4,4 +4,4 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_ArtistsSortPrompt.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_ArtistsSortPrompt.snap index 1c960b3f..bac43a58 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_ArtistsSortPrompt.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_ArtistsSortPrompt.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_FilterArtists.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_FilterArtists.snap index fea1362e..6230c0e2 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_FilterArtists.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_FilterArtists.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_FilterArtistsError.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_FilterArtistsError.snap index f02c2d86..0b6f6a3c 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_FilterArtistsError.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_FilterArtistsError.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_SearchArtists.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_SearchArtists.snap index 2bfaefbb..16a1fd84 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_SearchArtists.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_SearchArtists.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_SearchArtistsError.snap b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_SearchArtistsError.snap index 0d39a1c7..06e0c83a 100644 --- a/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_SearchArtistsError.snap +++ b/src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__library_ui_tests__tests__snapshot_tests__lidarr_library_SearchArtistsError.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags -=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex +=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex diff --git a/src/ui/lidarr_ui/mod.rs b/src/ui/lidarr_ui/mod.rs index dbf277d4..a8fe835b 100644 --- a/src/ui/lidarr_ui/mod.rs +++ b/src/ui/lidarr_ui/mod.rs @@ -37,7 +37,7 @@ use crate::{ servarr_data::lidarr::lidarr_data::LidarrData, servarr_models::{DiskSpace, RootFolder}, }, - utils::convert_to_gb, + utils::format_size, }; mod blocklist; @@ -176,8 +176,8 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) { let RootFolder { path, free_space, .. } = &monitored_root_folders[i]; - let space: f64 = convert_to_gb(*free_space); - let root_folder_space = Paragraph::new(format!("{path}: {space:.2} GB free")) + let space = format_size(*free_space, 2); + let root_folder_space = Paragraph::new(format!("{path}: {space} free")) .block(borderless_block()) .default_color(); diff --git a/src/ui/lidarr_ui/root_folders/mod.rs b/src/ui/lidarr_ui/root_folders/mod.rs index ac2afa10..61603a0e 100644 --- a/src/ui/lidarr_ui/root_folders/mod.rs +++ b/src/ui/lidarr_ui/root_folders/mod.rs @@ -15,7 +15,7 @@ use crate::ui::utils::layout_block_top_border; use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; mod add_root_folder_ui; @@ -69,11 +69,11 @@ fn draw_root_folders(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { .. } = root_folders; - let space: f64 = convert_to_gb(*free_space); + let space = format_size(*free_space, 2); Row::new(vec![ Cell::from(path.to_owned()), - Cell::from(format!("{space:.2} GB")), + Cell::from(space), Cell::from( unmapped_folders .as_ref() diff --git a/src/ui/lidarr_ui/snapshots/managarr__ui__lidarr_ui__lidarr_ui_tests__tests__snapshot_tests__lidarr_tabs_Artists.snap b/src/ui/lidarr_ui/snapshots/managarr__ui__lidarr_ui__lidarr_ui_tests__tests__snapshot_tests__lidarr_tabs_Artists.snap index bf284634..1140ba12 100644 --- a/src/ui/lidarr_ui/snapshots/managarr__ui__lidarr_ui__lidarr_ui_tests__tests__snapshot_tests__lidarr_tabs_Artists.snap +++ b/src/ui/lidarr_ui/snapshots/managarr__ui__lidarr_ui__lidarr_ui_tests__tests__snapshot_tests__lidarr_tabs_Artists.snap @@ -6,7 +6,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags │ -│=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex │ +│=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/radarr_ui/downloads/mod.rs b/src/ui/radarr_ui/downloads/mod.rs index af147896..bdaf2615 100644 --- a/src/ui/radarr_ui/downloads/mod.rs +++ b/src/ui/radarr_ui/downloads/mod.rs @@ -12,7 +12,7 @@ use crate::ui::utils::{get_width_from_percentage, layout_block_top_border}; use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; #[cfg(test)] #[path = "downloads_ui_tests.rs"] @@ -96,12 +96,12 @@ fn draw_downloads(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { } else { 1f64 - (*sizeleft as f64 / *size as f64) }; - let file_size: f64 = convert_to_gb(*size); + let file_size = format_size(*size, 2); Row::new(vec![ Cell::from(title.to_owned()), Cell::from(format!("{:.0}%", percent * 100.0)), - Cell::from(format!("{file_size:.2} GB")), + Cell::from(file_size), Cell::from( output_path .as_ref() diff --git a/src/ui/radarr_ui/library/mod.rs b/src/ui/radarr_ui/library/mod.rs index 0b1af8d7..58669ce0 100644 --- a/src/ui/radarr_ui/library/mod.rs +++ b/src/ui/radarr_ui/library/mod.rs @@ -16,7 +16,7 @@ use crate::ui::utils::{get_width_from_percentage, layout_block_top_border}; use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; -use crate::utils::{convert_runtime, convert_to_gb}; +use crate::utils::{convert_runtime, format_size}; mod add_movie_ui; mod delete_movie_ui; @@ -95,7 +95,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { let monitored = if movie.monitored { "🏷" } else { "" }; let studio = movie.studio.clone().unwrap_or_default(); let (hours, minutes) = convert_runtime(movie.runtime); - let file_size: f64 = convert_to_gb(movie.size_on_disk); + let file_size = format_size(movie.size_on_disk, 2); let certification = movie.certification.clone().unwrap_or_default(); let quality_profile = quality_profile_map .get_by_left(&movie.quality_profile_id) @@ -121,7 +121,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(format!("{hours}h {minutes}m")), Cell::from(certification), Cell::from(movie.original_language.name.to_owned()), - Cell::from(format!("{file_size:.2} GB")), + Cell::from(file_size), Cell::from(quality_profile), Cell::from(monitored.to_owned()), Cell::from(tags), diff --git a/src/ui/radarr_ui/library/movie_details_ui.rs b/src/ui/radarr_ui/library/movie_details_ui.rs index fa2f5903..ee38b7dd 100644 --- a/src/ui/radarr_ui/library/movie_details_ui.rs +++ b/src/ui/radarr_ui/library/movie_details_ui.rs @@ -26,7 +26,7 @@ use crate::ui::widgets::loading_block::LoadingBlock; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_popup, draw_tabs}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; #[cfg(test)] #[path = "movie_details_ui_tests.rs"] @@ -398,7 +398,7 @@ fn draw_movie_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { && current_route != ActiveRadarrBlock::ManualSearchConfirmPrompt.into(), app.should_text_scroll, ); - let size = convert_to_gb(*size); + let size = format_size(*size, 1); let rejected_str = if *rejected { "⛔" } else { "" }; let peers = if seeders.is_none() || leechers.is_none() { Text::from("") @@ -434,7 +434,7 @@ fn draw_movie_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(rejected_str), Cell::from(title.to_string()), Cell::from(indexer.clone()), - Cell::from(format!("{size:.1} GB")), + Cell::from(size), Cell::from(peers), Cell::from(language), Cell::from(quality), diff --git a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch.snap b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch.snap index b66682e8..e9b04342 100644 --- a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch.snap +++ b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Cast │ Crew │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 GB 25 / 3 English HD - 1080p │ - │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 GB English HD - 1080p │ + │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 MB 25 / 3 English HD - 1080p │ + │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 MB English HD - 1080p │ │ │ │ │ │ │ diff --git a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearchConfirmPrompt.snap b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearchConfirmPrompt.snap index e94e5ddc..dff44a15 100644 --- a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearchConfirmPrompt.snap +++ b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearchConfirmPrompt.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Cast │ Crew │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 GB 25 / 3 English HD - 1080p │ - │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 GB English HD - 1080p │ + │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 MB 25 / 3 English HD - 1080p │ + │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 MB English HD - 1080p │ │ │ │ │ │ │ diff --git a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearchSortPrompt.snap b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearchSortPrompt.snap index faf0a485..2f9e989d 100644 --- a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearchSortPrompt.snap +++ b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearchSortPrompt.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Cast │ Crew │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 GB 25 / 3 English HD - 1080p │ - │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 GB English HD - 1080p │ + │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 MB 25 / 3 English HD - 1080p │ + │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 MB English HD - 1080p │ │ │ │ │ │ │ diff --git a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch_AutomaticallySearchMoviePrompt.snap b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch_AutomaticallySearchMoviePrompt.snap index 9d72a3fc..812ce100 100644 --- a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch_AutomaticallySearchMoviePrompt.snap +++ b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch_AutomaticallySearchMoviePrompt.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Cast │ Crew │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 GB 25 / 3 English HD - 1080p │ - │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 GB English HD - 1080p │ + │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 MB 25 / 3 English HD - 1080p │ + │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 MB English HD - 1080p │ │ │ │ │ │ │ diff --git a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch_UpdateAndScanPrompt.snap b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch_UpdateAndScanPrompt.snap index 8be43539..d4f855aa 100644 --- a/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch_UpdateAndScanPrompt.snap +++ b/src/ui/radarr_ui/library/snapshots/managarr__ui__radarr_ui__library__movie_details_ui__movie_details_ui_tests__tests__snapshot_tests__movie_details_render_ManualSearch_UpdateAndScanPrompt.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Cast │ Crew │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 GB 25 / 3 English HD - 1080p │ - │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 GB English HD - 1080p │ + │=> torrent 12 days ⛔ Some movie release The Pirate Bay 0.0 MB 25 / 3 English HD - 1080p │ + │ usenet 22 days ⛔ Some Other movie rele The Pirate Bay 0.0 MB English HD - 1080p │ │ │ │ │ │ │ diff --git a/src/ui/radarr_ui/mod.rs b/src/ui/radarr_ui/mod.rs index 667a207a..7e2c9cc1 100644 --- a/src/ui/radarr_ui/mod.rs +++ b/src/ui/radarr_ui/mod.rs @@ -22,7 +22,7 @@ use crate::ui::utils::{ line_gauge_with_label, line_gauge_with_title, title_block, }; use crate::ui::widgets::loading_block::LoadingBlock; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use chrono::Duration; #[cfg(not(test))] use chrono::Utc; @@ -170,8 +170,8 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) { let RootFolder { path, free_space, .. } = &monitored_root_folders[i]; - let space: f64 = convert_to_gb(*free_space); - let root_folder_space = Paragraph::new(format!("{path}: {space:.2} GB free")) + let space = format_size(*free_space, 2); + let root_folder_space = Paragraph::new(format!("{path}: {space} free")) .block(borderless_block()) .default_color(); diff --git a/src/ui/radarr_ui/root_folders/mod.rs b/src/ui/radarr_ui/root_folders/mod.rs index 9c5ecfea..3fcadec9 100644 --- a/src/ui/radarr_ui/root_folders/mod.rs +++ b/src/ui/radarr_ui/root_folders/mod.rs @@ -12,7 +12,7 @@ use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_input_box_popup, draw_popup}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; #[cfg(test)] #[path = "root_folders_ui_tests.rs"] @@ -66,11 +66,11 @@ fn draw_root_folders(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { .. } = root_folders; - let space: f64 = convert_to_gb(*free_space); + let space = format_size(*free_space, 2); Row::new(vec![ Cell::from(path.to_owned()), - Cell::from(format!("{space:.2} GB")), + Cell::from(space), Cell::from( unmapped_folders .as_ref() diff --git a/src/ui/readarr_ui/downloads/mod.rs b/src/ui/readarr_ui/downloads/mod.rs index ac1a7c6e..60863a51 100644 --- a/src/ui/readarr_ui/downloads/mod.rs +++ b/src/ui/readarr_ui/downloads/mod.rs @@ -12,7 +12,7 @@ use crate::ui::utils::{get_width_from_percentage, layout_block_top_border}; use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; -use crate::utils::convert_f64_to_gb; +use crate::utils::format_size; #[cfg(test)] #[path = "downloads_ui_tests.rs"] @@ -97,12 +97,12 @@ fn draw_downloads(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { } else { 1f64 - (*sizeleft / *size) }; - let file_size: f64 = convert_f64_to_gb(*size); + let file_size = format_size(*size as i64, 2); Row::new(vec![ Cell::from(title.to_owned()), Cell::from(format!("{:.0}%", percent * 100.0)), - Cell::from(format!("{file_size:.2} GB")), + Cell::from(file_size), Cell::from( output_path .as_ref() diff --git a/src/ui/readarr_ui/library/author_details_ui.rs b/src/ui/readarr_ui/library/author_details_ui.rs index 4d38f2d9..1b49197b 100644 --- a/src/ui/readarr_ui/library/author_details_ui.rs +++ b/src/ui/readarr_ui/library/author_details_ui.rs @@ -28,7 +28,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::message::Message; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_popup, draw_tabs}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use ratatui::layout::Alignment; use ratatui::text::Text; use serde_json::Number; @@ -215,7 +215,7 @@ fn draw_author_description(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { ]; if let Some(stats) = current_selection.statistics.as_ref() { - let size = convert_to_gb(stats.size_on_disk); + let size = format_size(stats.size_on_disk, 2); author_description.extend(vec![ Line::from(vec![ "Books: ".primary().bold(), @@ -227,7 +227,7 @@ fn draw_author_description(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { ]), Line::from(vec![ "Size on Disk: ".primary().bold(), - format!("{size:.2} GB").default_color(), + size.default_color(), ]), ]); } @@ -278,13 +278,10 @@ fn draw_books_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { || "N/A".to_owned(), |s| format!("{}/{}", s.book_file_count, s.total_book_count), ); - let size = book.statistics.as_ref().map_or_else( - || "N/A".to_owned(), - |s| { - let size = convert_to_gb(s.size_on_disk); - format!("{size:.2} GB") - }, - ); + let size = book + .statistics + .as_ref() + .map_or_else(|| "N/A".to_owned(), |s| format_size(s.size_on_disk, 2)); decorate_book_row_with_style( book, @@ -483,7 +480,7 @@ fn draw_author_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { && active_readarr_block != ActiveReadarrBlock::ManualAuthorSearchConfirmPrompt, app.should_text_scroll, ); - let size = convert_to_gb(*size); + let size = format_size(*size, 1); let rejected_str = if *rejected { "⛔" } else { "" }; let peers = if seeders.is_none() || leechers.is_none() { Text::from("") @@ -514,7 +511,7 @@ fn draw_author_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(rejected_str), Cell::from(title.to_string()), Cell::from(indexer.clone()), - Cell::from(format!("{size:.1} GB")), + Cell::from(size), Cell::from(peers), Cell::from(quality_name), ]) diff --git a/src/ui/readarr_ui/library/book_details_ui.rs b/src/ui/readarr_ui/library/book_details_ui.rs index a2b3b714..f34a9c2b 100644 --- a/src/ui/readarr_ui/library/book_details_ui.rs +++ b/src/ui/readarr_ui/library/book_details_ui.rs @@ -14,7 +14,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::message::Message; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_popup, draw_tabs}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use ratatui::Frame; use ratatui::layout::{Alignment, Constraint, Rect}; use ratatui::prelude::{Line, Stylize, Text}; @@ -234,7 +234,7 @@ fn draw_book_file_info(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { .. } = book_file; - let size = convert_to_gb(*size); + let size = format_size(*size, 2); let audio_info = media_info .as_ref() .map(|media_info| { @@ -249,7 +249,7 @@ fn draw_book_file_info(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Row::new(vec![ Cell::from(path.clone()), - Cell::from(format!("{size:.2} GB")), + Cell::from(size), Cell::from(quality.quality.name.clone()), Cell::from(audio_info), ]) @@ -395,7 +395,7 @@ fn draw_book_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { && active_readarr_block != ActiveReadarrBlock::ManualBookSearchConfirmPrompt, app.should_text_scroll, ); - let size = convert_to_gb(*size); + let size = format_size(*size, 1); let rejected_str = if *rejected { "⛔" } else { "" }; let peers = if seeders.is_none() || leechers.is_none() { Text::from("") @@ -426,7 +426,7 @@ fn draw_book_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(rejected_str), Cell::from(title.to_string()), Cell::from(indexer.clone()), - Cell::from(format!("{size:.1} GB")), + Cell::from(size), Cell::from(peers), Cell::from(quality_name), ]) diff --git a/src/ui/readarr_ui/library/mod.rs b/src/ui/readarr_ui/library/mod.rs index 2f6a3655..8af624ee 100644 --- a/src/ui/readarr_ui/library/mod.rs +++ b/src/ui/readarr_ui/library/mod.rs @@ -13,7 +13,7 @@ use crate::ui::widgets::{ confirmation_prompt::ConfirmationPrompt, popup::{Popup, Size}, }; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use crate::{ app::App, models::{ @@ -103,7 +103,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { let size = author .statistics .as_ref() - .map_or(0f64, |stats| convert_to_gb(stats.size_on_disk)); + .map_or(0, |stats| stats.size_on_disk); let quality_profile = quality_profile_map .get_by_left(&author.quality_profile_id) .cloned() @@ -134,7 +134,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(quality_profile), Cell::from(metadata_profile), Cell::from(books.to_string()), - Cell::from(format!("{size:.2} GB")), + Cell::from(format_size(size, 2)), Cell::from(monitored.to_owned()), Cell::from(tags), ]), diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AuthorDetails_0.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AuthorDetails_0.snap index e6343be1..6056c1d9 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AuthorDetails_0.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AuthorDetails_0.snap @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Monitored Title Files Release Date Size ││ - ││=> 🏷 Test Book 3/7 2023-05-20 2.30 GB ││ + ││=> 🏷 Test Book 3/7 2023-05-20 2.34 MB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AutomaticallySearchAuthorPrompt_0.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AutomaticallySearchAuthorPrompt_0.snap index b2da3535..3b9cae99 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AutomaticallySearchAuthorPrompt_0.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AutomaticallySearchAuthorPrompt_0.snap @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search │Do you want to trigger an automatic search of your indexers│ ││ ││─────────────────────────────────────────│ for all monitored book(s) for the author: Test Author? │───────────────────────────────────────────││ ││ Monitored Title │ │Date Size ││ - ││=> 🏷 Test Book │ │20 2.30 GB ││ + ││=> 🏷 Test Book │ │20 2.34 MB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AutomaticallySearchAuthorPrompt_2.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AutomaticallySearchAuthorPrompt_2.snap index a333c344..5c3954f2 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AutomaticallySearchAuthorPrompt_2.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_AutomaticallySearchAuthorPrompt_2.snap @@ -22,8 +22,8 @@ expression: output ││ Books │ History │ Author Search │Do you want to trigger an automatic search of your indexers│ ││ ││─────────────────────────────────────────│ for all monitored book(s) for the author: Test Author? │───────────────────────────────────────────││ ││ Source ▼ Age ⛔ Title │ │ Size Peers Quality ││ - ││=> torrent 1 days ⛔ Test Torren│ │ 0.0 GB 2 / 1 EPUB ││ - ││ usenet 1 days ⛔ Test Usenet│ │ 0.0 GB EPUB ││ + ││=> torrent 1 days ⛔ Test Torren│ │ 0.0 MB 2 / 1 EPUB ││ + ││ usenet 1 days ⛔ Test Usenet│ │ 0.0 MB EPUB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearchConfirmPrompt_2.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearchConfirmPrompt_2.snap index 1c097c0f..58a0be00 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearchConfirmPrompt_2.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearchConfirmPrompt_2.snap @@ -22,8 +22,8 @@ expression: output ││ Books │ History │ Author Search │ Torrent Release? │ ││ ││────────────────────────────────────────│ │───────────────────────────────────────││ ││ Source ▼ Age ⛔ Title │ │e Peers Quality ││ - ││=> torrent 1 days ⛔ Test Torre│Rejection reasons: │ GB 2 / 1 EPUB ││ - ││ usenet 1 days ⛔ Test Usene│• Unknown quality profile │ GB EPUB ││ + ││=> torrent 1 days ⛔ Test Torre│Rejection reasons: │ MB 2 / 1 EPUB ││ + ││ usenet 1 days ⛔ Test Usene│• Unknown quality profile │ MB EPUB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearchSortPrompt_2.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearchSortPrompt_2.snap index 36480ec8..7bd3d5aa 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearchSortPrompt_2.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearchSortPrompt_2.snap @@ -22,8 +22,8 @@ expression: output ││ Books │ History │ Author Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Source Age ⛔ Title Indexer Size Peers Quality ││ - ││=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 GB 2 / 1 EPUB ││ - ││ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 GB EPUB ││ + ││=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 MB 2 / 1 EPUB ││ + ││ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 MB EPUB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearch_2.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearch_2.snap index 98da33f3..9b9afa69 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearch_2.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ManualAuthorSearch_2.snap @@ -22,8 +22,8 @@ expression: output ││ Books │ History │ Author Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Source ▼ Age ⛔ Title Indexer Size Peers Quality ││ - ││=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 GB 2 / 1 EPUB ││ - ││ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 GB EPUB ││ + ││=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 MB 2 / 1 EPUB ││ + ││ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 MB EPUB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_SearchBooksError_0.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_SearchBooksError_0.snap index 61b74938..54c2b491 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_SearchBooksError_0.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_SearchBooksError_0.snap @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Monitored Title Files Release Date Size ││ - ││=> 🏷 Test Book 3/7 2023-05-20 2.30 GB ││ + ││=> 🏷 Test Book 3/7 2023-05-20 2.34 MB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_SearchBooks_0.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_SearchBooks_0.snap index 69d3bec3..d4d1bdf6 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_SearchBooks_0.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_SearchBooks_0.snap @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Monitored Title Files Release Date Size ││ - ││=> 🏷 Test Book 3/7 2023-05-20 2.30 GB ││ + ││=> 🏷 Test Book 3/7 2023-05-20 2.34 MB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_UpdateAndScanAuthorPrompt_0.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_UpdateAndScanAuthorPrompt_0.snap index f6ed5de7..a68e61e9 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_UpdateAndScanAuthorPrompt_0.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_UpdateAndScanAuthorPrompt_0.snap @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search │ Do you want to trigger an update and disk scan for the │ ││ ││─────────────────────────────────────────│ author: Test Author? │───────────────────────────────────────────││ ││ Monitored Title │ │Date Size ││ - ││=> 🏷 Test Book │ │20 2.30 GB ││ + ││=> 🏷 Test Book │ │20 2.34 MB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_UpdateAndScanAuthorPrompt_2.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_UpdateAndScanAuthorPrompt_2.snap index 57bc41c4..abd34e3b 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_UpdateAndScanAuthorPrompt_2.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_UpdateAndScanAuthorPrompt_2.snap @@ -22,8 +22,8 @@ expression: output ││ Books │ History │ Author Search │ Do you want to trigger an update and disk scan for the │ ││ ││─────────────────────────────────────────│ author: Test Author? │───────────────────────────────────────────││ ││ Source ▼ Age ⛔ Title │ │ Size Peers Quality ││ - ││=> torrent 1 days ⛔ Test Torren│ │ 0.0 GB 2 / 1 EPUB ││ - ││ usenet 1 days ⛔ Test Usenet│ │ 0.0 GB EPUB ││ + ││=> torrent 1 days ⛔ Test Torren│ │ 0.0 MB 2 / 1 EPUB ││ + ││ usenet 1 days ⛔ Test Usenet│ │ 0.0 MB EPUB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_automatic_search_prompt_over_author_details.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_automatic_search_prompt_over_author_details.snap index b2da3535..3b9cae99 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_automatic_search_prompt_over_author_details.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_automatic_search_prompt_over_author_details.snap @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search │Do you want to trigger an automatic search of your indexers│ ││ ││─────────────────────────────────────────│ for all monitored book(s) for the author: Test Author? │───────────────────────────────────────────││ ││ Monitored Title │ │Date Size ││ - ││=> 🏷 Test Book │ │20 2.30 GB ││ + ││=> 🏷 Test Book │ │20 2.34 MB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_delete_book_over_author_details.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_delete_book_over_author_details.snap index 97cb8bbc..595aca7a 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_delete_book_over_author_details.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_delete_book_over_author_details.snap @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search │ Do you really want to delete the book: │ ││ ││─────────────────────────────────────────│ Test Book? │───────────────────────────────────────────││ ││ Monitored Title │ │Date Size ││ - ││=> 🏷 Test Book │ │20 2.30 GB ││ + ││=> 🏷 Test Book │ │20 2.34 MB ││ ││ │ ╭───╮ │ ││ ││ │ Delete Book Files: │ ✔ │ │ ││ ││ │ ╰───╯ │ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_update_and_scan_prompt_over_author_details.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_update_and_scan_prompt_over_author_details.snap index f6ed5de7..a68e61e9 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_update_and_scan_prompt_over_author_details.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__author_details_ui__author_details_ui_tests__tests__snapshot_tests__author_details_ui_renders_update_and_scan_prompt_over_author_details.snap @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search │ Do you want to trigger an update and disk scan for the │ ││ ││─────────────────────────────────────────│ author: Test Author? │───────────────────────────────────────────││ ││ Monitored Title │ │Date Size ││ - ││=> 🏷 Test Book │ │20 2.30 GB ││ + ││=> 🏷 Test Book │ │20 2.34 MB ││ ││ │ │ ││ ││ │ │ ││ ││ │ │ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_AutomaticallySearchBookPrompt_2.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_AutomaticallySearchBookPrompt_2.snap index 3cfc96fa..56d7d96b 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_AutomaticallySearchBookPrompt_2.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_AutomaticallySearchBookPrompt_2.snap @@ -10,7 +10,7 @@ expression: output │ Editions │ History │ File │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Path Size Quality Media Info │ - │=> /nfs/books/Test Author/Test Book.epub 3.30 GB EPUB MP3 - 2.0 - 128 kbps - 44100 - 16 │ + │=> /nfs/books/Test Author/Test Book.epub 3.20 MB EPUB MP3 - 2.0 - 128 kbps - 44100 - 16 │ │ │ │ │ │ │ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_AutomaticallySearchBookPrompt_3.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_AutomaticallySearchBookPrompt_3.snap index a41752fe..feb16d8d 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_AutomaticallySearchBookPrompt_3.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_AutomaticallySearchBookPrompt_3.snap @@ -10,8 +10,8 @@ expression: output │ Editions │ History │ File │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Quality │ - │=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 GB 2 / 1 EPUB │ - │ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 GB EPUB │ + │=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 MB 2 / 1 EPUB │ + │ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 MB EPUB │ │ │ │ │ │ │ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_BookFileInfo_2.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_BookFileInfo_2.snap index 17c7120e..0b9b0686 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_BookFileInfo_2.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_BookFileInfo_2.snap @@ -10,7 +10,7 @@ expression: output │ Editions │ History │ File │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Path Size Quality Media Info │ - │=> /nfs/books/Test Author/Test Book.epub 3.30 GB EPUB MP3 - 2.0 - 128 kbps - 44100 - 16 │ + │=> /nfs/books/Test Author/Test Book.epub 3.20 MB EPUB MP3 - 2.0 - 128 kbps - 44100 - 16 │ │ │ │ │ │ │ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_DeleteBookFilePrompt_2.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_DeleteBookFilePrompt_2.snap index c594e320..8125a1df 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_DeleteBookFilePrompt_2.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_DeleteBookFilePrompt_2.snap @@ -10,7 +10,7 @@ expression: output │ Editions │ History │ File │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Path Size Quality Media Info │ - │=> /nfs/books/Test Author/Test Book.epub 3.30 GB EPUB MP3 - 2.0 - 128 kbps - 44100 - 16 │ + │=> /nfs/books/Test Author/Test Book.epub 3.20 MB EPUB MP3 - 2.0 - 128 kbps - 44100 - 16 │ │ │ │ │ │ │ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearchConfirmPrompt_3.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearchConfirmPrompt_3.snap index 39997ba8..069bd165 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearchConfirmPrompt_3.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearchConfirmPrompt_3.snap @@ -10,8 +10,8 @@ expression: output │ Editions │ History │ File │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Quality │ - │=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 GB 2 / 1 EPUB │ - │ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 GB EPUB │ + │=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 MB 2 / 1 EPUB │ + │ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 MB EPUB │ │ │ │ │ │ │ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearchSortPrompt_3.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearchSortPrompt_3.snap index cf700c01..fcd51d70 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearchSortPrompt_3.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearchSortPrompt_3.snap @@ -10,8 +10,8 @@ expression: output │ Editions │ History │ File │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source Age ⛔ Title Indexer Size Peers Quality │ - │=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 GB 2 / 1 EPUB │ - │ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 GB EPUB │ + │=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 MB 2 / 1 EPUB │ + │ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 MB EPUB │ │ │ │ │ │ │ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearch_3.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearch_3.snap index d94fdc1b..c1290151 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearch_3.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__book_details_ui__book_details_ui_tests__tests__snapshot_tests__book_details_renders_ManualBookSearch_3.snap @@ -10,8 +10,8 @@ expression: output │ Editions │ History │ File │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Quality │ - │=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 GB 2 / 1 EPUB │ - │ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 GB EPUB │ + │=> torrent 1 days ⛔ Test Torrent Release kickass torrents 0.0 MB 2 / 1 EPUB │ + │ usenet 1 days ⛔ Test Usenet Release DrunkenSlug 0.0 MB EPUB │ │ │ │ │ │ │ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_add_author_over_library.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_add_author_over_library.snap index ffe0ab6c..b0dadcd4 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_add_author_over_library.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_add_author_over_library.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_author_details_over_library.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_author_details_over_library.snap index 37368057..fe2d10c2 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_author_details_over_library.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_author_details_over_library.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex ╭ Test Author ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ │Author: Test Author │ │Status: Continuing │ @@ -22,7 +22,7 @@ expression: output ││ Books │ History │ Author Search ││ ││─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────││ ││ Monitored Title Files Release Date Size ││ - ││=> 🏷 Test Book 3/7 2023-05-20 2.30 GB ││ + ││=> 🏷 Test Book 3/7 2023-05-20 2.34 MB ││ ││ ││ ││ ││ ││ ││ diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_delete_author_over_library.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_delete_author_over_library.snap index b81749cd..de77d3b3 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_delete_author_over_library.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_delete_author_over_library.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_edit_author_over_library.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_edit_author_over_library.snap index 914bcf22..7309c501 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_edit_author_over_library.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_edit_author_over_library.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_update_all_authors_prompt.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_update_all_authors_prompt.snap index df266ef9..6a07d373 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_update_all_authors_prompt.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__library_ui_renders_update_all_authors_prompt.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_Authors.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_Authors.snap index 17605ff3..160bda7d 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_Authors.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_Authors.snap @@ -4,4 +4,4 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_AuthorsSortPrompt.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_AuthorsSortPrompt.snap index 21b5d910..671ab115 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_AuthorsSortPrompt.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_AuthorsSortPrompt.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_FilterAuthors.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_FilterAuthors.snap index f41de851..52b83327 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_FilterAuthors.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_FilterAuthors.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_FilterAuthorsError.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_FilterAuthorsError.snap index 82929938..4ac7e1e4 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_FilterAuthorsError.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_FilterAuthorsError.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_SearchAuthors.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_SearchAuthors.snap index b473f952..0c70718d 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_SearchAuthors.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_SearchAuthors.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_SearchAuthorsError.snap b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_SearchAuthorsError.snap index bf0cd322..cf31bc39 100644 --- a/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_SearchAuthorsError.snap +++ b/src/ui/readarr_ui/library/snapshots/managarr__ui__readarr_ui__library__library_ui_tests__tests__snapshot_tests__readarr_library_SearchAuthorsError.snap @@ -4,7 +4,7 @@ expression: output --- ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags -=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex +=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex diff --git a/src/ui/readarr_ui/mod.rs b/src/ui/readarr_ui/mod.rs index 3b6b7712..23ce5dee 100644 --- a/src/ui/readarr_ui/mod.rs +++ b/src/ui/readarr_ui/mod.rs @@ -37,7 +37,7 @@ use crate::{ servarr_data::readarr::readarr_data::ReadarrData, servarr_models::{DiskSpace, RootFolder}, }, - utils::convert_to_gb, + utils::format_size, }; mod blocklist; @@ -176,8 +176,8 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) { let RootFolder { path, free_space, .. } = &monitored_root_folders[i]; - let space: f64 = convert_to_gb(*free_space); - let root_folder_space = Paragraph::new(format!("{path}: {space:.2} GB free")) + let space = format_size(*free_space, 2); + let root_folder_space = Paragraph::new(format!("{path}: {space} free")) .block(borderless_block()) .default_color(); diff --git a/src/ui/readarr_ui/root_folders/mod.rs b/src/ui/readarr_ui/root_folders/mod.rs index c99469e0..8fa93f8f 100644 --- a/src/ui/readarr_ui/root_folders/mod.rs +++ b/src/ui/readarr_ui/root_folders/mod.rs @@ -15,7 +15,7 @@ use crate::ui::utils::layout_block_top_border; use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; mod add_root_folder_ui; @@ -69,11 +69,11 @@ fn draw_root_folders(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { .. } = root_folders; - let space: f64 = convert_to_gb(*free_space); + let space = format_size(*free_space, 2); Row::new(vec![ Cell::from(path.to_owned()), - Cell::from(format!("{space:.2} GB")), + Cell::from(space), Cell::from( unmapped_folders .as_ref() diff --git a/src/ui/readarr_ui/snapshots/managarr__ui__readarr_ui__readarr_ui_tests__tests__snapshot_tests__readarr_tabs_Authors.snap b/src/ui/readarr_ui/snapshots/managarr__ui__readarr_ui__readarr_ui_tests__tests__snapshot_tests__readarr_tabs_Authors.snap index 3287bf78..2f9793fb 100644 --- a/src/ui/readarr_ui/snapshots/managarr__ui__readarr_ui__readarr_ui_tests__tests__snapshot_tests__readarr_tabs_Authors.snap +++ b/src/ui/readarr_ui/snapshots/managarr__ui__readarr_ui__readarr_ui_tests__tests__snapshot_tests__readarr_tabs_Authors.snap @@ -6,7 +6,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags │ -│=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex │ +│=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab.snap index 42749d4e..8a709b87 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab.snap @@ -19,7 +19,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags │ -│=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex │ +│=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_error_popup.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_error_popup.snap index 23f6c68a..a6922ef9 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_error_popup.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_error_popup.snap @@ -19,7 +19,7 @@ expression: output │ Library │ Downloads │ Blocklist │ │ u update all │ │ │───────────────────────────────────│ enter details │─────────────────────────────────────│ │ Name ▼ Typ│ esc cancel filter │e Monitored Tags │ -│=> Alex Per│ ↑ k scroll up │0 GB 🏷 alex │ +│=> Alex Per│ ↑ k scroll up │1 MB 🏷 alex │ │ │ ↓ j scroll down │ │ │ │ ← h previous tab │ │ │ │ → l next tab │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_with_error.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_with_error.snap index 3e81a80f..544110f3 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_with_error.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_library_tab_with_error.snap @@ -22,7 +22,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags │ -│=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex │ +│=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_notification_success_popup.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_notification_success_popup.snap index cec6243f..6ed014c7 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_notification_success_popup.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__lidarr_ui_renders_notification_success_popup.snap @@ -19,7 +19,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags │ -│=> Alex Person Continuing Lossless Standard 1 12/15 0.00 GB 🏷 alex │ +│=> Alex Person Continuing Lossless Standard 1 12/15 0.01 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab.snap index 1c1261ed..06339f5d 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab.snap @@ -19,7 +19,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags │ -│=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex │ +│=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab_error_popup.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab_error_popup.snap index af4527c1..dadc6114 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab_error_popup.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab_error_popup.snap @@ -19,7 +19,7 @@ expression: output │ Library │ Downloads │ Blocklist │ │ u update all │ │ │───────────────────────────────────│ enter details │─────────────────────────────────────│ │ Name ▼ │ esc cancel filter │e Monitored Tags │ -│=> Test Author │ ↑ k scroll up │0 GB 🏷 alex │ +│=> Test Author │ ↑ k scroll up │0 MB 🏷 alex │ │ │ ↓ j scroll down │ │ │ │ ← h previous tab │ │ │ │ → l next tab │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab_with_error.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab_with_error.snap index 19225520..87e67a20 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab_with_error.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_library_tab_with_error.snap @@ -22,7 +22,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags │ -│=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex │ +│=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_notification_failure_popup.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_notification_failure_popup.snap index 8ea9985c..1baa65ab 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_notification_failure_popup.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_notification_failure_popup.snap @@ -19,7 +19,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags │ -│=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex │ +│=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_notification_success_popup.snap b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_notification_success_popup.snap index ebd2dc03..1916849e 100644 --- a/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_notification_success_popup.snap +++ b/src/ui/snapshots/managarr__ui__ui_tests__snapshot_tests__readarr_ui_renders_notification_success_popup.snap @@ -19,7 +19,7 @@ expression: output │ Library │ Downloads │ Blocklist │ History │ Root Folders │ Indexers │ System │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Name ▼ Status Quality Profile Metadata Profile Books Size Monitored Tags │ -│=> Test Author Continuing Standard Comprehensive 0 0.00 GB 🏷 alex │ +│=> Test Author Continuing Standard Comprehensive 0 0.00 MB 🏷 alex │ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/downloads/mod.rs b/src/ui/sonarr_ui/downloads/mod.rs index bf46b5bc..a1a0ba1d 100644 --- a/src/ui/sonarr_ui/downloads/mod.rs +++ b/src/ui/sonarr_ui/downloads/mod.rs @@ -12,7 +12,7 @@ use crate::ui::utils::{get_width_from_percentage, layout_block_top_border}; use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; -use crate::utils::convert_f64_to_gb; +use crate::utils::format_size; #[cfg(test)] #[path = "downloads_ui_tests.rs"] @@ -97,12 +97,12 @@ fn draw_downloads(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { } else { 1f64 - (*sizeleft / *size) }; - let file_size: f64 = convert_f64_to_gb(*size); + let file_size = format_size(*size as i64, 2); Row::new(vec![ Cell::from(title.to_owned()), Cell::from(format!("{:.0}%", percent * 100.0)), - Cell::from(format!("{file_size:.2} GB")), + Cell::from(file_size), Cell::from( output_path .as_ref() diff --git a/src/ui/sonarr_ui/library/episode_details_ui.rs b/src/ui/sonarr_ui/library/episode_details_ui.rs index 5e0ee30c..80a8d77f 100644 --- a/src/ui/sonarr_ui/library/episode_details_ui.rs +++ b/src/ui/sonarr_ui/library/episode_details_ui.rs @@ -19,7 +19,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::message::Message; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_popup, draw_tabs}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use chrono::Utc; use ratatui::Frame; use ratatui::layout::{Alignment, Constraint, Layout, Rect}; @@ -414,7 +414,7 @@ fn draw_episode_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { && active_sonarr_block != ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt, app.should_text_scroll, ); - let size = convert_to_gb(*size); + let size = format_size(*size, 1); let rejected_str = if *rejected { "⛔" } else { "" }; let peers = if seeders.is_none() || leechers.is_none() { Text::from("") @@ -454,7 +454,7 @@ fn draw_episode_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(rejected_str), Cell::from(title.to_string()), Cell::from(indexer.clone()), - Cell::from(format!("{size:.1} GB")), + Cell::from(size), Cell::from(peers), Cell::from(language), Cell::from(quality), diff --git a/src/ui/sonarr_ui/library/mod.rs b/src/ui/sonarr_ui/library/mod.rs index eb179001..e44ea2c0 100644 --- a/src/ui/sonarr_ui/library/mod.rs +++ b/src/ui/sonarr_ui/library/mod.rs @@ -12,7 +12,7 @@ use crate::ui::widgets::{ confirmation_prompt::ConfirmationPrompt, popup::{Popup, Size}, }; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use crate::{ app::App, models::{ @@ -104,7 +104,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { let size = series .statistics .as_ref() - .map_or(0f64, |stats| convert_to_gb(stats.size_on_disk)); + .map_or(0, |stats| stats.size_on_disk); let quality_profile = quality_profile_map .get_by_left(&series.quality_profile_id) .expect("Quality profile ID must exist in quality_profile_map") @@ -134,7 +134,7 @@ fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(series.series_type.to_display_str()), Cell::from(quality_profile), Cell::from(language_profile), - Cell::from(format!("{size:.2} GB")), + Cell::from(format_size(size, 2)), Cell::from(monitored.to_owned()), Cell::from(tags), ]), diff --git a/src/ui/sonarr_ui/library/season_details_ui.rs b/src/ui/sonarr_ui/library/season_details_ui.rs index a746e7d7..a06931b3 100644 --- a/src/ui/sonarr_ui/library/season_details_ui.rs +++ b/src/ui/sonarr_ui/library/season_details_ui.rs @@ -16,7 +16,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::message::Message; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_popup, draw_tabs}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; use chrono::Utc; use ratatui::Frame; use ratatui::layout::{Alignment, Constraint, Rect}; @@ -188,7 +188,7 @@ fn draw_episodes_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { }; let episode_monitored = if episode.monitored { "🏷" } else { "" }; - let size = convert_to_gb(size_on_disk); + let size = format_size(size_on_disk, 2); let air_date = if let Some(air_date) = air_date_utc.as_ref() { air_date.to_string() } else { @@ -203,7 +203,7 @@ fn draw_episodes_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(episode_number.to_string()), Cell::from(title.clone()), Cell::from(air_date), - Cell::from(format!("{size:.2} GB")), + Cell::from(size), Cell::from(quality_profile), ]), ) @@ -378,7 +378,7 @@ fn draw_season_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { && active_sonarr_block != ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt, app.should_text_scroll, ); - let size = convert_to_gb(*size); + let size = format_size(*size, 1); let rejected_str = if *rejected { "⛔" } else { "" }; let peers = if seeders.is_none() || leechers.is_none() { Text::from("") @@ -418,7 +418,7 @@ fn draw_season_releases(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { Cell::from(rejected_str), Cell::from(title.to_string()), Cell::from(indexer.clone()), - Cell::from(format!("{size:.1} GB")), + Cell::from(size), Cell::from(peers), Cell::from(language), Cell::from(quality), diff --git a/src/ui/sonarr_ui/library/series_details_ui.rs b/src/ui/sonarr_ui/library/series_details_ui.rs index 4170cf7d..36601f4c 100644 --- a/src/ui/sonarr_ui/library/series_details_ui.rs +++ b/src/ui/sonarr_ui/library/series_details_ui.rs @@ -26,7 +26,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::message::Message; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_popup, draw_tabs}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; #[cfg(test)] #[path = "series_details_ui_tests.rs"] @@ -200,10 +200,10 @@ fn draw_series_description(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { ]), ]; if let Some(stats) = current_selection.statistics.as_ref() { - let size = convert_to_gb(stats.size_on_disk); + let size = format_size(stats.size_on_disk, 2); series_description.extend(vec![Line::from(vec![ "Size on Disk: ".primary().bold(), - format!("{size:.2} GB").default_color(), + size.default_color(), ])]); } @@ -234,13 +234,10 @@ fn draw_seasons_table(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { || "N/A".to_owned(), |s| format!("{}/{}", s.episode_file_count, s.episode_count), ); - let size = season.statistics.as_ref().map_or_else( - || "N/A".to_owned(), - |s| { - let size = convert_to_gb(s.size_on_disk); - format!("{size:.2} GB") - }, - ); + let size = season + .statistics + .as_ref() + .map_or_else(|| "N/A".to_owned(), |s| format_size(s.size_on_disk, 2)); decorate_season_row_with_style( season, diff --git a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_AutomaticallySearchEpisodePrompt_3.snap b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_AutomaticallySearchEpisodePrompt_3.snap index 19969df8..34949968 100644 --- a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_AutomaticallySearchEpisodePrompt_3.snap +++ b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_AutomaticallySearchEpisodePrompt_3.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 English Bluray-1080p│ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB English Bluray-1080p│ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 English Bluray-1080p│ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB English Bluray-1080p│ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearchConfirmPrompt_3.snap b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearchConfirmPrompt_3.snap index 5822cba7..7660cf10 100644 --- a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearchConfirmPrompt_3.snap +++ b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearchConfirmPrompt_3.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 English Bluray-1080p│ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB English Bluray-1080p│ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 English Bluray-1080p│ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB English Bluray-1080p│ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearchSortPrompt_3.snap b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearchSortPrompt_3.snap index 2c176471..423dff02 100644 --- a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearchSortPrompt_3.snap +++ b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearchSortPrompt_3.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 English Bluray-1080p│ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB English Bluray-1080p│ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 English Bluray-1080p│ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB English Bluray-1080p│ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearch_3.snap b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearch_3.snap index cb7aac14..4914a70c 100644 --- a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearch_3.snap +++ b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__episode_details_ui__episode_details_ui_tests__tests__snapshot_tests__episode_details_ManualEpisodeSearch_3.snap @@ -12,8 +12,8 @@ expression: output │ Details │ History │ File │ Manual Search │ │──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 English Bluray-1080p│ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB English Bluray-1080p│ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 English Bluray-1080p│ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB English Bluray-1080p│ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_AutomaticallySearchSeasonPrompt_2.snap b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_AutomaticallySearchSeasonPrompt_2.snap index 4dcfb7ee..935783b9 100644 --- a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_AutomaticallySearchSeasonPrompt_2.snap +++ b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_AutomaticallySearchSeasonPrompt_2.snap @@ -10,8 +10,8 @@ expression: output │ Episodes │ History │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 English Bluray-1080p │ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB English Bluray-1080p │ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 English Bluray-1080p │ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB English Bluray-1080p │ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearchConfirmPrompt_2.snap b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearchConfirmPrompt_2.snap index b5d18146..ec4c5072 100644 --- a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearchConfirmPrompt_2.snap +++ b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearchConfirmPrompt_2.snap @@ -10,8 +10,8 @@ expression: output │ Episodes │ History │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 English Bluray-1080p │ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB English Bluray-1080p │ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 English Bluray-1080p │ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB English Bluray-1080p │ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearchSortPrompt_2.snap b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearchSortPrompt_2.snap index 58928493..e2c528fe 100644 --- a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearchSortPrompt_2.snap +++ b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearchSortPrompt_2.snap @@ -10,8 +10,8 @@ expression: output │ Episodes │ History │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 English Bluray-1080p │ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB English Bluray-1080p │ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 English Bluray-1080p │ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB English Bluray-1080p │ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearch_2.snap b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearch_2.snap index 8f62f051..10e836d4 100644 --- a/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearch_2.snap +++ b/src/ui/sonarr_ui/library/snapshots/managarr__ui__sonarr_ui__library__season_details_ui__season_details_ui_tests__tests__snapshot_tests__season_details_renders_ManualSeasonSearch_2.snap @@ -10,8 +10,8 @@ expression: output │ Episodes │ History │ Manual Search │ │───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ │ Source ▼ Age ⛔ Title Indexer Size Peers Language Quality │ - │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 GB 2 / 1 English Bluray-1080p │ - │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 GB English Bluray-1080p │ + │=> torrent 1 days ⛔ Test Release kickass torrents 0.0 MB 2 / 1 English Bluray-1080p │ + │ usenet 1 days ⛔ Test Release DrunkenSlug 0.0 MB English Bluray-1080p │ │ │ │ │ │ │ diff --git a/src/ui/sonarr_ui/mod.rs b/src/ui/sonarr_ui/mod.rs index bb5e45cb..c3242df1 100644 --- a/src/ui/sonarr_ui/mod.rs +++ b/src/ui/sonarr_ui/mod.rs @@ -37,7 +37,7 @@ use crate::{ servarr_models::{DiskSpace, RootFolder}, sonarr_models::DownloadRecord, }, - utils::convert_to_gb, + utils::format_size, }; mod blocklist; @@ -177,8 +177,8 @@ fn draw_stats_context(f: &mut Frame<'_>, app: &App<'_>, area: Rect) { let RootFolder { path, free_space, .. } = &monitored_root_folders[i]; - let space: f64 = convert_to_gb(*free_space); - let root_folder_space = Paragraph::new(format!("{path}: {space:.2} GB free")) + let space = format_size(*free_space, 2); + let root_folder_space = Paragraph::new(format!("{path}: {space} free")) .block(borderless_block()) .default_color(); diff --git a/src/ui/sonarr_ui/root_folders/mod.rs b/src/ui/sonarr_ui/root_folders/mod.rs index db98c247..c0029f29 100644 --- a/src/ui/sonarr_ui/root_folders/mod.rs +++ b/src/ui/sonarr_ui/root_folders/mod.rs @@ -12,7 +12,7 @@ use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt; use crate::ui::widgets::managarr_table::ManagarrTable; use crate::ui::widgets::popup::{Popup, Size}; use crate::ui::{DrawUi, draw_input_box_popup, draw_popup}; -use crate::utils::convert_to_gb; +use crate::utils::format_size; #[cfg(test)] #[path = "root_folders_ui_tests.rs"] @@ -67,11 +67,11 @@ fn draw_root_folders(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { .. } = root_folders; - let space: f64 = convert_to_gb(*free_space); + let space = format_size(*free_space, 2); Row::new(vec![ Cell::from(path.to_owned()), - Cell::from(format!("{space:.2} GB")), + Cell::from(space), Cell::from( unmapped_folders .as_ref() diff --git a/src/utils.rs b/src/utils.rs index 33a05929..4500292b 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -79,12 +79,14 @@ pub fn init_logging_config() -> log4rs::Config { .unwrap() } -pub fn convert_to_gb(bytes: i64) -> f64 { - bytes as f64 / 1024f64.powi(3) -} - -pub fn convert_f64_to_gb(bytes: f64) -> f64 { - bytes / 1024f64.powi(3) +pub fn format_size(bytes: i64, precision: usize) -> String { + if bytes >= 1024i64.pow(3) { + let gb = bytes as f64 / 1024f64.powi(3); + format!("{gb:.precision$} GB") + } else { + let mb = bytes as f64 / 1024f64.powi(2); + format!("{mb:.precision$} MB") + } } pub fn convert_runtime(runtime: i64) -> (i64, i64) { diff --git a/src/utils_tests.rs b/src/utils_tests.rs index 9434f80c..ab871ad9 100644 --- a/src/utils_tests.rs +++ b/src/utils_tests.rs @@ -3,20 +3,18 @@ mod tests { use std::fs::{self, File}; use std::io::{BufRead, BufReader, Seek, SeekFrom, Write}; - use pretty_assertions::assert_eq; + use pretty_assertions::{assert_eq, assert_str_eq}; - use crate::utils::{convert_f64_to_gb, convert_runtime, convert_to_gb, was_log_rotated}; + use crate::utils::{convert_runtime, format_size, was_log_rotated}; #[test] - fn test_convert_to_gb() { - assert_eq!(convert_to_gb(2147483648), 2f64); - assert_eq!(convert_to_gb(2662879723), 2.4799999995157123); - } - - #[test] - fn test_convert_f64_to_gb() { - assert_eq!(convert_f64_to_gb(2147483648f64), 2f64); - assert_eq!(convert_f64_to_gb(2662879723f64), 2.4799999995157123); + fn test_format_size() { + assert_str_eq!(format_size(2_457_600, 2), "2.34 MB"); + assert_str_eq!(format_size(2_469_606_195, 2), "2.30 GB"); + assert_str_eq!(format_size(1_073_741_824, 2), "1.00 GB"); + assert_str_eq!(format_size(1_073_741_823, 2), "1024.00 MB"); + assert_str_eq!(format_size(0, 2), "0.00 MB"); + assert_str_eq!(format_size(6_710_886, 1), "6.4 MB"); } #[test]