gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clearer error message

Browse Source
This commit is contained in:
chrislusf
2016-04-10 01:50:58 -07:00
parent 62f9ce180d
commit 112e2c6922
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
go/storage/needle.go
View File

@@ -1,7 +1,6 @@
package storage package storage
import ( import (
"errors"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"mime" "mime"
@@ -189,7 +188,7 @@ func NewNeedle(r *http.Request, fixJpgOrientation bool) (n *Needle, e error) {
func (n *Needle) ParsePath(fid string) (err error) { func (n *Needle) ParsePath(fid string) (err error) {
length := len(fid) length := len(fid)
if length <= 8 { if length <= 8 {
return errors.New("Invalid fid:" + fid) return fmt.Errorf("Invalid fid: %s", fid)
} }
delta := "" delta := ""
deltaIndex := strings.LastIndex(fid, "_") deltaIndex := strings.LastIndex(fid, "_")
@@ -211,25 +210,20 @@ func (n *Needle) ParsePath(fid string) (err error) {
} }
func ParseKeyHash(key_hash_string string) (uint64, uint32, error) { func ParseKeyHash(key_hash_string string) (uint64, uint32, error) {
key, hash, ok := parseKeyHash(key_hash_string) if len(key_hash_string) <= 8 {
if !ok { return 0, 0, fmt.Errorf("KeyHash is too short.")
return 0, 0, errors.New("Invalid key and hash:" + key_hash_string)
} }
return key, hash, nil if len(key_hash_string) > 24 {
} return 0, 0, fmt.Errorf("KeyHash is too long.")
func parseKeyHash(keyhash string) (uint64, uint32, bool) {
if len(keyhash) <= 8 || len(keyhash) > 24 {
return 0, 0, false
} }
split := len(keyhash) - 8 split := len(key_hash_string) - 8
key, err := strconv.ParseUint(keyhash[:split], 16, 64) key, err := strconv.ParseUint(key_hash_string[:split], 16, 64)
if err != nil { if err != nil {
return 0, 0, false return 0, 0, fmt.Errorf("Parse key error: %v", err)
} }
hash, err := strconv.ParseUint(keyhash[split:], 16, 32) hash, err := strconv.ParseUint(key_hash_string[split:], 16, 32)
if err != nil { if err != nil {
return 0, 0, false return 0, 0, fmt.Errorf("Parse hash error: %v", err)
} }
return key, uint32(hash), true return key, uint32(hash), nil
} }