lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properties_view: Use glib::format_size() for file size

Browse source 
This handles appropriate localized unit names and rounding for us.
This commit is contained in:
Christopher Davis 2022-08-05 17:19:47 -04:00
parent 3395de4661
commit 36cf667cc8
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/widgets/properties_view.rs
View file

@ -35,8 +35,6 @@ use std::cell::RefCell;
use gtk_macros::spawn; use gtk_macros::spawn;
const MB: f64 = 1_000_000.0;
const KB: f64 = 1_000.0;
const FALLBACK: &str = "-"; const FALLBACK: &str = "-";
mod imp { mod imp {
@ -338,21 +336,8 @@ impl LpPropertiesView {
#[template_callback] #[template_callback]
fn file_size(&self, info: Option<gio::FileInfo>) -> String { fn file_size(&self, info: Option<gio::FileInfo>) -> String {
info.map(|info| { info.map(|info| {
let bytes = info.size() as f64; let size = info.size() as u64;
glib::format_size(size).to_string()
let (mut size, mut unit) = (bytes, "B");
let sizes = [(MB, "MB"), (KB, "kB")];
for (b, u) in sizes {
if bytes > b {
let res = bytes / b;
size = res;
unit = u;
break;
}
}
String::from(&format!("{size:.1} {unit}"))
}) })
.unwrap_or_else(|| FALLBACK.to_owned()) .unwrap_or_else(|| FALLBACK.to_owned())
} }