GOMODULES
/
fiber
mirror of https://github.com/gofiber/fiber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

utils: ConvertToBytes: empty string (#1877)

pull/1880/head
Vano Devium 2022-04-24 20:15:59 +03:00 committed by GitHub
parent 941ada9f05
commit 901492a784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/README.md
View File

@ -85,6 +85,6 @@ Benchmark_Trim/default-16 18177328 65.9 ns
Benchmark_Trim/default.trimspace-16 188933770 6.33 ns/op 0 B/op 0 allocs/op
Benchmark_Trim/default.trimspace-16 184007649 6.42 ns/op 0 B/op 0 allocs/op
Benchmark_ConvertToBytes/fiber-12 32883782 33.76 ns/op 0 B/op 0 allocs/op
Benchmark_ConvertToBytes/fiber-12 36084900 33.47 ns/op 0 B/op 0 allocs/op
Benchmark_ConvertToBytes/fiber-8 43773547 24.43 ns/op 0 B/op 0 allocs/op
Benchmark_ConvertToBytes/fiber-8 45849477 25.33 ns/op 0 B/op 0 allocs/op
```

23
utils/common.go
View File

@ -5,9 +5,11 @@
package utils
import (
"bytes"
"crypto/rand"
"encoding/binary"
"encoding/hex"
"math"
"net"
"os"
"reflect"
@ -23,11 +25,6 @@ import (
const (
toLowerTable = "\x00\x01\x02\x03\x04\x05\x06\a\b\t\n\v\f\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u007f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
toUpperTable = "\x00\x01\x02\x03\x04\x05\x06\a\b\t\n\v\f\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~\u007f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
kb = 1000
mb = 1000 * kb
gb = 1000 * mb
tb = 1000 * gb
pb = 1000 * tb
)
// Copyright © 2014, Roger Peppe
@ -38,7 +35,7 @@ var (
uuidSeed [24]byte
uuidCounter uint64
uuidSetup sync.Once
unitsMap = map[byte]int64{'k': kb, 'm': mb, 'g': gb, 't': tb, 'p': pb}
unitsSlice = []byte("kmgtp")
)
// UUID generates an universally unique identifier (UUID)
@ -120,8 +117,11 @@ func IncrementIPRange(ip net.IP) {
// ConvertToBytes returns integer size of bytes from human-readable string, ex. 42kb, 42M
// Returns 0 if string is unrecognized
func ConvertToBytes(humanReadableString string) int {
var unitPrefixPos, lastNumberPos int
strLen := len(humanReadableString)
if strLen == 0 {
return 0
}
var unitPrefixPos, lastNumberPos int
// loop the string
for i := strLen - 1; i >= 0; i-- {
// check if the char is a number
@ -142,11 +142,12 @@ func ConvertToBytes(humanReadableString string) int {
return 0
}
// check the muliplicator from the string and use it
// check the multiplier from the string and use it
if unitPrefixPos > 0 {
// convert multiplication char to lowercase and check the table
if mul, ok := unitsMap[toLowerTable[humanReadableString[unitPrefixPos]]]; ok {
size *= float64(mul)
// convert multiplier char to lowercase and check if exists in units slice
index := bytes.IndexByte(unitsSlice, toLowerTable[humanReadableString[unitPrefixPos]])
if index != -1 {
size *= math.Pow(1000, float64(index+1))
}
}

1
utils/common_test.go
View File

@ -92,6 +92,7 @@ func Benchmark_UUID(b *testing.B) {
func Test_ConvertToBytes(t *testing.T) {
t.Parallel()
AssertEqual(t, 0, ConvertToBytes(""))
AssertEqual(t, 42, ConvertToBytes("42"))
AssertEqual(t, 42, ConvertToBytes("42b"))
AssertEqual(t, 42, ConvertToBytes("42B"))