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

progress: avoid code-duplication in units.go #203

Merged
merged 1 commit into from Apr 21, 2022
Merged

progress: avoid code-duplication in units.go #203

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 34 additions & 23 deletions progress/units.go
View file
Open in desktop
Expand Up @@ -84,32 +84,43 @@ var (

// FormatBytes formats the given value as a "Byte".
func FormatBytes(value int64) string {
if value < 1000 {
return fmt.Sprintf("%dB", value)
} else if value < 1000000 {
return fmt.Sprintf("%.2fKB", float64(value)/1000.0)
} else if value < 1000000000 {
return fmt.Sprintf("%.2fMB", float64(value)/1000000.0)
} else if value < 1000000000000 {
return fmt.Sprintf("%.2fGB", float64(value)/1000000000.0)
} else if value < 1000000000000000 {
return fmt.Sprintf("%.2fTB", float64(value)/1000000000000.0)
}
return fmt.Sprintf("%.2fPB", float64(value)/1000000000000000.0)
return formatNumber(value, map[int64]string{
1000000000000000: "PB",
1000000000000: "TB",
1000000000: "GB",
1000000: "MB",
1000: "KB",
0: "B",
})
}

// FormatNumber formats the given value as a "regular number".
func FormatNumber(value int64) string {
if value < 1000 {
return fmt.Sprintf("%d", value)
} else if value < 1000000 {
return fmt.Sprintf("%.2fK", float64(value)/1000.0)
} else if value < 1000000000 {
return fmt.Sprintf("%.2fM", float64(value)/1000000.0)
} else if value < 1000000000000 {
return fmt.Sprintf("%.2fB", float64(value)/1000000000.0)
} else if value < 1000000000000000 {
return fmt.Sprintf("%.2fT", float64(value)/1000000000000.0)
return formatNumber(value, map[int64]string{
1000000000000000: "Q",
1000000000000: "T",
1000000000: "B",
1000000: "M",
1000: "K",
0: "",
})
}

var (
unitScales = []int64{
1000000000000000,
1000000000000,
1000000000,
1000000,
1000,
}
)

func formatNumber(value int64, notations map[int64]string) string {
for _, unitScale := range unitScales {
if value >= unitScale {
return fmt.Sprintf("%.2f%s", float64(value)/float64(unitScale), notations[unitScale])
}
}
return fmt.Sprintf("%.2fQ", float64(value)/1000000000000000.0)
return fmt.Sprintf("%d%s", value, notations[0])
}