extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 07:55:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

standardize on how to get file size (#2992)

Browse Source 
* standardize on how to get file size

* forgot to remove comment

* make specified size lowercase

* fix the test due to precision

* added another test

* Update README.md

add contributors graphic

* clippy - test adjustment

* tweaked matching
This commit is contained in:
Darren Schroeder
2021-02-03 07:19:38 -06:00
committed by GitHub
parent da1e1295ea
commit fb1846120d
5 changed files with 65 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/nu-data/src/base/shape.rs
View File

@ -128,15 +128,21 @@ impl InlineShape {
}
}
pub fn format_bytes(bytesize: &BigInt) -> (DbgDocBldr, String) {
pub fn format_bytes(bytesize: &BigInt, forced_format: Option<&str>) -> (DbgDocBldr, String) {
use bigdecimal::ToPrimitive;
// get the config value, if it doesn't exist make it 'auto' so it works how it originally did
let filesize_format_var = crate::config::config(Tag::unknown())
.expect("unable to get the config.toml file")
.get("filesize_format")
.map(|val| val.convert_to_string().to_ascii_lowercase())
.unwrap_or_else(|| "auto".to_string());
let filesize_format_var;
if let Some(fmt) = forced_format {
filesize_format_var = fmt.to_ascii_lowercase();
} else {
filesize_format_var = crate::config::config(Tag::unknown())
.expect("unable to get the config.toml file")
.get("filesize_format")
.map(|val| val.convert_to_string().to_ascii_lowercase())
.unwrap_or_else(|| "auto".to_string());
}
// if there is a value, match it to one of the valid values for byte units
let filesize_format = match filesize_format_var.as_str() {
"b" => (byte_unit::ByteUnit::B, ""),
@ -233,7 +239,7 @@ impl PrettyDebug for FormatInlineShape {
+ right.clone().format().pretty()
}
InlineShape::Bytesize(bytesize) => {
let bytes = InlineShape::format_bytes(bytesize);
let bytes = InlineShape::format_bytes(bytesize, None);
bytes.0
}
InlineShape::String(string) => DbgDocBldr::primitive(string),