astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-19 12:10:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adding more unit tests to strbyteconv. Fixes #69.

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2014-12-04 23:03:05 -08:00
parent c3fca84f25
commit 5abcaf4d58
2 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/strbyteconv/strbyteconv.go
+11 -3
View File
@@ -59,14 +59,20 @@ func BytesToString(bytes uint64) string {
func StringToBytes(s string) (uint64, error) {
var bytes uint64
var err error
StringPattern, err := regexp.Compile(`(?i)^(-?\d+)([KMGT])B?$`)
bytes, err = strconv.ParseUint(s, 10, 64)
if err == nil {
return bytes, nil
}
stringPattern, err := regexp.Compile(`(?i)^(-?\d+)([BKMGT])B?$`)
if err != nil {
return 0, err
}
parts := StringPattern.FindStringSubmatch(strings.TrimSpace(s))
if len(parts) < 3 {
parts := stringPattern.FindStringSubmatch(strings.TrimSpace(s))
if len(parts) < 2 {
return 0, errors.New("Incorrect string format must be K,KB,M,MB,G,GB")
}
@@ -87,6 +93,8 @@ func StringToBytes(s string) (uint64, error) {
bytes = value * UNIT_KILOBYTE
case "B":
bytes = value * UNIT_BYTE
default:
return 0, errors.New("Incorrect string format must be K,KB,M,MB,G,GB")
}
return bytes, nil