From f43b5088195094120a3f5a9f9c5f128dd86d9230 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Wed, 19 Jun 2024 18:19:35 +0900 Subject: [PATCH] update byte formatting --- src/storages/online_storage.rs | 2 +- src/storages/physical_drive_partition.rs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/storages/online_storage.rs b/src/storages/online_storage.rs index 150f440..4ce2459 100644 --- a/src/storages/online_storage.rs +++ b/src/storages/online_storage.rs @@ -94,7 +94,7 @@ impl fmt::Display for OnlineStorage { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!( f, - "O {name:<10} {size:<10} {provider:<10}", + "O {name:<10} {size:<10.2} {provider:<10}", name = self.name(), size = Byte::from_u64(self.capacity).get_appropriate_unit(UnitType::Binary), provider = self.provider, diff --git a/src/storages/physical_drive_partition.rs b/src/storages/physical_drive_partition.rs index e1f97a9..95dec3f 100644 --- a/src/storages/physical_drive_partition.rs +++ b/src/storages/physical_drive_partition.rs @@ -146,7 +146,7 @@ impl fmt::Display for PhysicalDrivePartition { let removable_indicator = if self.is_removable { "+" } else { "-" }; write!( f, - "P {name:<10} {size:<10} {removable:<1} {kind:<6} {fs:<5}", + "P {name:<10} {size:<10.2} {removable:<1} {kind:<6} {fs:<5}", name = self.name(), size = Byte::from_u64(self.capacity).get_appropriate_unit(UnitType::Binary), removable = removable_indicator, @@ -184,10 +184,9 @@ fn select_sysinfo_disk(disks: &sysinfo::Disks) -> Result<&Disk> { let kind = format!("{:?}", disk.kind()); let mount_path = disk.mount_point(); let total_space = byte_unit::Byte::from_u64(disk.total_space()) - .get_appropriate_unit(UnitType::Binary) - .to_string(); + .get_appropriate_unit(UnitType::Binary); format!( - "{}: {} {} ({}, {}) {}", + "{}: {} {:>+5.1} ({}, {}) {}", i, name, total_space,