Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add decimals to output #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add decimals to output #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions pkg/df-pv/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"os"
"path"
"strings"

// "github.com/fatih/color"
// "github.com/gookit/color"
Expand Down Expand Up @@ -149,7 +150,7 @@ func GetColorFromPercentageUsed(percentageUsed float64) text.Color {
// ConvertQuantityValueToHumanReadableIECString converts value to human readable IEC format
// https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
func ConvertQuantityValueToHumanReadableIECString(quantity *resource.Quantity) string {
var val = quantity.Value()
var val = float64(quantity.Value())
var suffix string

// https://en.wikipedia.org/wiki/Tebibyte
Expand All @@ -167,19 +168,20 @@ func ConvertQuantityValueToHumanReadableIECString(quantity *resource.Quantity) s

if 1 < TiConvertedVal {
suffix = "Ti"
return fmt.Sprintf("%d%s", TiConvertedVal, suffix)
val = TiConvertedVal
} else if 1 < GiConvertedVal {
suffix = "Gi"
return fmt.Sprintf("%d%s", GiConvertedVal, suffix)
val = GiConvertedVal
} else if 1 < MiConvertedVal {
suffix = "Mi"
return fmt.Sprintf("%d%s", MiConvertedVal, suffix)
val = MiConvertedVal
} else if 1 < KiConvertedVal {
suffix = "Ki"
return fmt.Sprintf("%d%s", KiConvertedVal, suffix)
} else {
return fmt.Sprintf("%d", val)
val = KiConvertedVal
}
// strip trailing zeroes, then strip decimal if not >= 0.01
strVal := strings.TrimRight(strings.TrimRight(fmt.Sprintf("%.2f", val), "0"), ".")
return fmt.Sprintf("%s%s", strVal, suffix)
}

// ConvertQuantityValueToHumanReadableDecimalString converts value to human readable decimal format
Expand Down