tyler.durden
/
bottom
mirror of https://github.com/ClementTsang/bottom.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: use cow for disk widget io read/write strings (#1664)

This commit is contained in:
Clement Tsang 2025-02-03 01:48:12 -05:00 committed by GitHub
parent 837e23560f
commit d6ad688ab8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/data/store.rs
View File

@ -230,7 +230,7 @@ impl StoredData {
} }
}; };
let (mut io_read, mut io_write) = ("N/A".to_string(), "N/A".to_string()); let (mut io_read, mut io_write) = ("N/A".into(), "N/A".into());
if let Some(Some(io_device)) = io_device { if let Some(Some(io_device)) = io_device {
if let Some(prev_io) = self.prev_io.get_mut(itx) { if let Some(prev_io) = self.prev_io.get_mut(itx) {
let r_rate = ((io_device.read_bytes.saturating_sub(prev_io.0)) as f64 let r_rate = ((io_device.read_bytes.saturating_sub(prev_io.0)) as f64
@ -243,8 +243,8 @@ impl StoredData {
*prev_io = (io_device.read_bytes, io_device.write_bytes); *prev_io = (io_device.read_bytes, io_device.write_bytes);
io_read = dec_bytes_per_second_string(r_rate); io_read = dec_bytes_per_second_string(r_rate).into();
io_write = dec_bytes_per_second_string(w_rate); io_write = dec_bytes_per_second_string(w_rate).into();
} }
} }

8
src/widgets/disk_table.rs
View File

@ -20,8 +20,8 @@ pub struct DiskWidgetData {
pub used_bytes: Option<u64>, pub used_bytes: Option<u64>,
pub total_bytes: Option<u64>, pub total_bytes: Option<u64>,
pub summed_total_bytes: Option<u64>, pub summed_total_bytes: Option<u64>,
pub io_read: String, pub io_read: Cow<'static, str>,
pub io_write: String, pub io_write: Cow<'static, str>,
} }
impl DiskWidgetData { impl DiskWidgetData {
@ -177,8 +177,8 @@ impl DataToCell<DiskColumn> for DiskWidgetData {
DiskColumn::UsedPercent => percent_string(self.used_percent()), DiskColumn::UsedPercent => percent_string(self.used_percent()),
DiskColumn::FreePercent => percent_string(self.free_percent()), DiskColumn::FreePercent => percent_string(self.free_percent()),
DiskColumn::Total => self.total_space(), DiskColumn::Total => self.total_space(),
DiskColumn::IoRead => self.io_read.clone().into(), DiskColumn::IoRead => self.io_read.clone(),
DiskColumn::IoWrite => self.io_write.clone().into(), DiskColumn::IoWrite => self.io_write.clone(),
}; };
Some(text) Some(text)