mirror of
https://github.com/duke-git/lancet.git
synced 2026-02-14 17:52:28 +08:00
fix: remove scientific notation in DecimalBytes
This commit is contained in:
@@ -84,13 +84,26 @@ var (
|
|||||||
// The precision parameter specifies the number of digits after the decimal point, which defaults to 4.
|
// The precision parameter specifies the number of digits after the decimal point, which defaults to 4.
|
||||||
// Play: https://go.dev/play/p/FPXs1suwRcs
|
// Play: https://go.dev/play/p/FPXs1suwRcs
|
||||||
func DecimalBytes(size float64, precision ...int) string {
|
func DecimalBytes(size float64, precision ...int) string {
|
||||||
p := 5
|
pointPosition := 4
|
||||||
if len(precision) > 0 {
|
if len(precision) > 0 {
|
||||||
p = precision[0] + 1
|
pointPosition = precision[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
size, unit := calculateByteSize(size, 1000.0, decimalByteUnits)
|
size, unit := calculateByteSize(size, 1000.0, decimalByteUnits)
|
||||||
|
|
||||||
return fmt.Sprintf("%.*g%s", p, size, unit)
|
format := fmt.Sprintf("%%.%df", pointPosition)
|
||||||
|
result := fmt.Sprintf(format, size)
|
||||||
|
|
||||||
|
for i := len(result); i > 0; i-- {
|
||||||
|
s := result[i-1]
|
||||||
|
if s == '0' || s == '.' {
|
||||||
|
result = result[:i-1]
|
||||||
|
} else {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result + unit
|
||||||
}
|
}
|
||||||
|
|
||||||
// BinaryBytes returns a human-readable byte size under binary standard (base 1024)
|
// BinaryBytes returns a human-readable byte size under binary standard (base 1024)
|
||||||
|
|||||||
@@ -20,6 +20,12 @@ func TestDecimalBytes(t *testing.T) {
|
|||||||
assert.Equal("3.123PB", DecimalBytes(float64(3.123*UnitPB)))
|
assert.Equal("3.123PB", DecimalBytes(float64(3.123*UnitPB)))
|
||||||
assert.Equal("4.123EB", DecimalBytes(float64(4.123*UnitEB)))
|
assert.Equal("4.123EB", DecimalBytes(float64(4.123*UnitEB)))
|
||||||
assert.Equal("1EB", DecimalBytes(float64(1000*UnitPB)))
|
assert.Equal("1EB", DecimalBytes(float64(1000*UnitPB)))
|
||||||
|
|
||||||
|
assert.Equal("62MB", DecimalBytes(61812496, 0))
|
||||||
|
assert.Equal("61.8MB", DecimalBytes(61812496, 1))
|
||||||
|
assert.Equal("401MB", DecimalBytes(401000000))
|
||||||
|
assert.Equal("401MB", DecimalBytes(401000000, 0))
|
||||||
|
assert.Equal("4MB", DecimalBytes(4010000, 0))
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestBinaryBytes(t *testing.T) {
|
func TestBinaryBytes(t *testing.T) {
|
||||||
|
|||||||
Reference in New Issue
Block a user