diff --git a/go.mod b/go.mod index 3a3615fa1..1dccd48cd 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/superseriousbusiness/gotosocial go 1.19 require ( - codeberg.org/gruf/go-bytesize v1.0.0 + codeberg.org/gruf/go-bytesize v1.0.2 codeberg.org/gruf/go-byteutil v1.0.2 codeberg.org/gruf/go-cache/v3 v3.2.0 codeberg.org/gruf/go-debug v1.2.0 diff --git a/go.sum b/go.sum index 5a97a1879..bbc0033bd 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ codeberg.org/gruf/go-bitutil v1.0.1/go.mod h1:3ezHnADoiRJs9jgn65AEZ3HY7dsabAYLmm codeberg.org/gruf/go-bytes v1.0.0/go.mod h1:1v/ibfaosfXSZtRdW2rWaVrDXMc9E3bsi/M9Ekx39cg= codeberg.org/gruf/go-bytes v1.0.2 h1:malqE42Ni+h1nnYWBUAJaDDtEzF4aeN4uPN8DfMNNvo= codeberg.org/gruf/go-bytes v1.0.2/go.mod h1:1v/ibfaosfXSZtRdW2rWaVrDXMc9E3bsi/M9Ekx39cg= -codeberg.org/gruf/go-bytesize v1.0.0 h1:/Mcv4prniJLkPEqZ+LZ5/D/e27rNrZZEMmty9jpIvlc= -codeberg.org/gruf/go-bytesize v1.0.0/go.mod h1:n/GU8HzL9f3UNp/mUKyr1qVmTlj7+xacpp0OHfkvLPs= +codeberg.org/gruf/go-bytesize v1.0.2 h1:Mo+ITi+0uZ4YNSZf2ed6Qw8acOI39W4mmgE1a8lslXw= +codeberg.org/gruf/go-bytesize v1.0.2/go.mod h1:n/GU8HzL9f3UNp/mUKyr1qVmTlj7+xacpp0OHfkvLPs= codeberg.org/gruf/go-byteutil v1.0.0/go.mod h1:cWM3tgMCroSzqoBXUXMhvxTxYJp+TbCr6ioISRY5vSU= codeberg.org/gruf/go-byteutil v1.0.2 h1:OesVyK5VKWeWdeDR00zRJ+Oy8hjXx1pBhn7WVvcZWVE= codeberg.org/gruf/go-byteutil v1.0.2/go.mod h1:cWM3tgMCroSzqoBXUXMhvxTxYJp+TbCr6ioISRY5vSU= diff --git a/vendor/codeberg.org/gruf/go-bytesize/README.md b/vendor/codeberg.org/gruf/go-bytesize/README.md index 46a0457ca..00ef52550 100644 --- a/vendor/codeberg.org/gruf/go-bytesize/README.md +++ b/vendor/codeberg.org/gruf/go-bytesize/README.md @@ -1,3 +1 @@ Byte size formatting and parsing. - -todo: more robust tests \ No newline at end of file diff --git a/vendor/codeberg.org/gruf/go-bytesize/bytesize.go b/vendor/codeberg.org/gruf/go-bytesize/bytesize.go index 4426107bd..939397939 100644 --- a/vendor/codeberg.org/gruf/go-bytesize/bytesize.go +++ b/vendor/codeberg.org/gruf/go-bytesize/bytesize.go @@ -3,6 +3,7 @@ import ( "errors" "math/bits" + _ "strconv" "unsafe" ) @@ -52,18 +53,18 @@ } // bvals is a precomputed table of IEC unit values. - iecvals = [...]Size{ - 'k': KiB, - 'K': KiB, - 'M': MiB, - 'G': GiB, - 'T': TiB, - 'P': PiB, - 'E': EiB, + iecvals = [...]float64{ + 'k': float64(KiB), + 'K': float64(KiB), + 'M': float64(MiB), + 'G': float64(GiB), + 'T': float64(TiB), + 'P': float64(PiB), + 'E': float64(EiB), } // sivals is a precomputed table of SI unit values. - sivals = [...]Size{ + sivals = [...]float64{ // ASCII numbers _aren't_ valid SI unit values, // BUT if the space containing a possible unit // char is checked with this table -- it is valid @@ -79,13 +80,13 @@ '8': 1, '9': 1, - 'k': KB, - 'K': KB, - 'M': MB, - 'G': GB, - 'T': TB, - 'P': PB, - 'E': EB, + 'k': float64(KB), + 'K': float64(KB), + 'M': float64(MB), + 'G': float64(GB), + 'T': float64(TB), + 'P': float64(PB), + 'E': float64(EB), } ) @@ -107,7 +108,7 @@ func ParseSize(s string) (Size, error) { return 0, ErrInvalidFormat } - return Size(f) * unit, nil + return Size(f * unit), nil } // Set implements flag.Value{}. @@ -204,7 +205,7 @@ func (sz Size) String() string { } // parseUnit will parse the byte size unit from string 's'. -func parseUnit(s string) (Size, int, error) { +func parseUnit(s string) (float64, int, error) { // Check for string if len(s) < 1 { return 0, 0, ErrInvalidFormat diff --git a/vendor/modules.txt b/vendor/modules.txt index 9763b2605..bbd33d6fa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -7,7 +7,7 @@ codeberg.org/gruf/go-bitutil # codeberg.org/gruf/go-bytes v1.0.2 ## explicit; go 1.14 codeberg.org/gruf/go-bytes -# codeberg.org/gruf/go-bytesize v1.0.0 +# codeberg.org/gruf/go-bytesize v1.0.2 ## explicit; go 1.17 codeberg.org/gruf/go-bytesize # codeberg.org/gruf/go-byteutil v1.0.2