From 38148978cff18a38c3d1880f290859afa454f8e9 Mon Sep 17 00:00:00 2001 From: dudaodong Date: Mon, 26 Aug 2024 16:25:57 +0800 Subject: [PATCH] refactoring: change unit variable to package internal --- formatter/byte.go | 84 +++++++++++++++++++++--------------------- formatter/byte_test.go | 10 ++--- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/formatter/byte.go b/formatter/byte.go index 10ac341..2f02ccb 100644 --- a/formatter/byte.go +++ b/formatter/byte.go @@ -18,63 +18,63 @@ import ( // http://en.wikipedia.org/wiki/Binary_prefix const ( // Decimal - UnitB = 1 - UnitKB = 1000 - UnitMB = 1000 * UnitKB - UnitGB = 1000 * UnitMB - UnitTB = 1000 * UnitGB - UnitPB = 1000 * UnitTB - UnitEB = 1000 * UnitPB + unitB = 1 + unitKB = 1000 + unitMB = 1000 * unitKB + unitGB = 1000 * unitMB + unitTB = 1000 * unitGB + unitPB = 1000 * unitTB + unitEB = 1000 * unitPB // Binary - UnitBiB = 1 - UnitKiB = 1024 - UnitMiB = 1024 * UnitKiB - UnitGiB = 1024 * UnitMiB - UnitTiB = 1024 * UnitGiB - UnitPiB = 1024 * UnitTiB - UnitEiB = 1024 * UnitPiB + unitBiB = 1 + unitKiB = 1024 + unitMiB = 1024 * unitKiB + unitGiB = 1024 * unitMiB + unitTiB = 1024 * unitGiB + unitPiB = 1024 * unitTiB + unitEiB = 1024 * unitPiB ) // type byteUnitMap map[byte]int64 var ( decimalByteMap = map[string]uint64{ - "b": UnitB, - "kb": UnitKB, - "mb": UnitMB, - "gb": UnitGB, - "tb": UnitTB, - "pb": UnitPB, - "eb": UnitEB, + "b": unitB, + "kb": unitKB, + "mb": unitMB, + "gb": unitGB, + "tb": unitTB, + "pb": unitPB, + "eb": unitEB, // Without suffix - "": UnitB, - "k": UnitKB, - "m": UnitMB, - "g": UnitGB, - "t": UnitTB, - "p": UnitPB, - "e": UnitEB, + "": unitB, + "k": unitKB, + "m": unitMB, + "g": unitGB, + "t": unitTB, + "p": unitPB, + "e": unitEB, } binaryByteMap = map[string]uint64{ - "bi": UnitBiB, - "kib": UnitKiB, - "mib": UnitMiB, - "gib": UnitGiB, - "tib": UnitTiB, - "pib": UnitPiB, - "eib": UnitEiB, + "bi": unitBiB, + "kib": unitKiB, + "mib": unitMiB, + "gib": unitGiB, + "tib": unitTiB, + "pib": unitPiB, + "eib": unitEiB, // Without suffix - "": UnitBiB, - "ki": UnitKiB, - "mi": UnitMiB, - "gi": UnitGiB, - "ti": UnitTiB, - "pi": UnitPiB, - "ei": UnitEiB, + "": unitBiB, + "ki": unitKiB, + "mi": unitMiB, + "gi": unitGiB, + "ti": unitTiB, + "pi": unitPiB, + "ei": unitEiB, } ) diff --git a/formatter/byte_test.go b/formatter/byte_test.go index 6bc50d4..897dec2 100644 --- a/formatter/byte_test.go +++ b/formatter/byte_test.go @@ -15,11 +15,11 @@ func TestDecimalBytes(t *testing.T) { assert.Equal("1.024KB", DecimalBytes(1024)) assert.Equal("1.2346MB", DecimalBytes(1234567)) assert.Equal("1.235MB", DecimalBytes(1234567, 3)) - assert.Equal("1.123GB", DecimalBytes(float64(1.123*UnitGB))) - assert.Equal("2.123TB", DecimalBytes(float64(2.123*UnitTB))) - assert.Equal("3.123PB", DecimalBytes(float64(3.123*UnitPB))) - assert.Equal("4.123EB", DecimalBytes(float64(4.123*UnitEB))) - assert.Equal("1EB", DecimalBytes(float64(1000*UnitPB))) + assert.Equal("1.123GB", DecimalBytes(float64(1.123*unitGB))) + assert.Equal("2.123TB", DecimalBytes(float64(2.123*unitTB))) + assert.Equal("3.123PB", DecimalBytes(float64(3.123*unitPB))) + assert.Equal("4.123EB", DecimalBytes(float64(4.123*unitEB))) + 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))