Revendor go-units to f2145db703495b2e525c59662db69a7344b00bb8
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
parent
4e7e3919ce
commit
6866fda800
|
@ -63,7 +63,7 @@ clone git github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
|
||||||
# forked golang.org/x/net package includes a patch for lazy loading trace templates
|
# forked golang.org/x/net package includes a patch for lazy loading trace templates
|
||||||
clone git golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
|
clone git golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
|
||||||
clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git
|
clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git
|
||||||
clone git github.com/docker/go-units eb879ae3e2b84e2a142af415b679ddeda47ec71c
|
clone git github.com/docker/go-units f2145db703495b2e525c59662db69a7344b00bb8
|
||||||
clone git github.com/docker/go-connections 988efe982fdecb46f01d53465878ff1f2ff411ce
|
clone git github.com/docker/go-connections 988efe982fdecb46f01d53465878ff1f2ff411ce
|
||||||
|
|
||||||
clone git github.com/docker/engine-api f9cef590446e4e6073b49b652f47a337b897c1a3
|
clone git github.com/docker/engine-api f9cef590446e4e6073b49b652f47a337b897c1a3
|
||||||
|
|
|
@ -37,22 +37,34 @@ var (
|
||||||
var decimapAbbrs = []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
|
var decimapAbbrs = []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
|
||||||
var binaryAbbrs = []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}
|
var binaryAbbrs = []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}
|
||||||
|
|
||||||
// CustomSize returns a human-readable approximation of a size
|
func getSizeAndUnit(size float64, base float64, _map []string) (float64, string) {
|
||||||
// using custom format.
|
|
||||||
func CustomSize(format string, size float64, base float64, _map []string) string {
|
|
||||||
i := 0
|
i := 0
|
||||||
unitsLimit := len(_map) - 1
|
unitsLimit := len(_map) - 1
|
||||||
for size >= base && i < unitsLimit {
|
for size >= base && i < unitsLimit {
|
||||||
size = size / base
|
size = size / base
|
||||||
i++
|
i++
|
||||||
}
|
}
|
||||||
return fmt.Sprintf(format, size, _map[i])
|
return size, _map[i]
|
||||||
|
}
|
||||||
|
|
||||||
|
// CustomSize returns a human-readable approximation of a size
|
||||||
|
// using custom format.
|
||||||
|
func CustomSize(format string, size float64, base float64, _map []string) string {
|
||||||
|
size, unit := getSizeAndUnit(size, base, _map)
|
||||||
|
return fmt.Sprintf(format, size, unit)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HumanSizeWithPrecision allows the size to be in any precision,
|
||||||
|
// instead of 4 digit precision used in units.HumanSize.
|
||||||
|
func HumanSizeWithPrecision(size float64, precision int) string {
|
||||||
|
size, unit := getSizeAndUnit(size, 1000.0, decimapAbbrs)
|
||||||
|
return fmt.Sprintf("%.*g %s", precision, size, unit)
|
||||||
}
|
}
|
||||||
|
|
||||||
// HumanSize returns a human-readable approximation of a size
|
// HumanSize returns a human-readable approximation of a size
|
||||||
// capped at 4 valid numbers (eg. "2.746 MB", "796 KB").
|
// capped at 4 valid numbers (eg. "2.746 MB", "796 KB").
|
||||||
func HumanSize(size float64) string {
|
func HumanSize(size float64) string {
|
||||||
return CustomSize("%.4g %s", size, 1000.0, decimapAbbrs)
|
return HumanSizeWithPrecision(size, 4)
|
||||||
}
|
}
|
||||||
|
|
||||||
// BytesSize returns a human-readable size in bytes, kibibytes,
|
// BytesSize returns a human-readable size in bytes, kibibytes,
|
||||||
|
|
Loading…
Reference in New Issue