pacwrap/pacwrap
pacwrap/pacwrap
1
0
Fork 0
Code Issues Activity Actions

Net column now displays negative values, spacing adjusted for IEC units

Browse source
This commit is contained in:
Xavier Moffett 2024-02-16 16:33:37 -05:00
parent 96b589a55d
commit 62816ddef8
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pacwrap-core/src/exec/path.rs
View file

@ -86,7 +86,7 @@ fn obtain_path(path: &Path, exec: &str) -> Result<PathBuf> {
Ok(path) => Ok(path),
Err(err) => match err.kind() {
std::io::ErrorKind::NotFound => Ok(path.to_path_buf()),
_ => err!(ErrorKind::IOError(exec.into(), err.kind()))?,
_ => err!(ErrorKind::IOError(exec.into(), err.kind())),
},
}
}

15
pacwrap-core/src/sync/event/summary.rs
View file

@ -132,7 +132,7 @@ impl Summary {
pkg_this.name().into(),
match is_installed {
true => pkg_this.version().to_string(),
false => "".into(),
false => String::new(),
},
pkg_sync.version().to_string(),
match installed_old == installed_new && !is_installed {
@ -184,13 +184,10 @@ impl Summary {
};
for (name, old, new, net, dnl) in table_elements {
let net = match net > 0 {
true => format!("{}{}", net.to_byteunit(IEC), if net < 1000 { " " } else { "" }),
false => "".into(),
};
let dnl = match dnl > 0 {
true => format!("{}{}", dnl.to_byteunit(IEC), if dnl < 1000 { " " } else { "" }),
false => "".into(),
let net = format!("{}{}", net.to_byteunit(IEC), if net > -1024 && net < 1024 { " " } else { "" });
let dnl = match dnl == 0 {
false => format!("{}{}", dnl.to_byteunit(IEC), if dnl < 1024 { " " } else { "" }),
true => String::new(),
};
table.insert(match table_columns {
@ -287,7 +284,7 @@ impl TableColumns {
impl From<&Summary> for TableColumns {
fn from(sum: &Summary) -> Self {
match sum.columns() {
//Grr, don't try and figure out _how_ this works, just know that it does..
//Grr, don't try to figure out _how_ this works, just know that it does..
(false, false, false, false, false) => Self::OldNet,
(true, true, _, true, true) => Self::OldNewNetDownload,
(.., true, false, true) => Self::NewNetDownload,