opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-10-25 02:16:56 +08:00
Code Issues Projects Releases Wiki Activity

refactor(commands/optionvalue) use

Browse Source 
@mappum this optionvalue is a really great abstraction. It makes
maintenance super simple!

@jbenet @whyrusleeping
This commit is contained in:
Brian Tiger Chow
2014-11-11 23:31:02 -08:00
committed by Juan Batiz-Benet
parent 71e92dace2
commit 69374b30be
2 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
commands/option.go
View File

@ -78,60 +78,59 @@ func (ov OptionValue) Found() bool {
}
// value accessor methods, gets the value as a certain type
func (ov OptionValue) Bool() (bool, error) {
func (ov OptionValue) Bool() (value bool, found bool, err error) {
if !ov.found {
return false, false, nil
}
val, ok := ov.value.(bool)
if !ok {
var err error
if ov.value != nil {
err = errors.New("error casting to bool")
}
return false, err
err = CastError
}
return val, nil
return val, ov.found, err
}
func (ov OptionValue) Int() (int, error) {
func (ov OptionValue) Int() (val int, found bool, err error) {
if !ov.found {
return 0, false, nil
}
val, ok := ov.value.(int)
if !ok {
var err error
if ov.value != nil {
err = errors.New("error casting to int")
}
return 0, err
err = CastError
}
return val, nil
return val, ov.found, err
}
func (ov OptionValue) Uint() (uint, error) {
func (ov OptionValue) Uint() (val uint, found bool, err error) {
if !ov.found {
return 0, false, nil
}
val, ok := ov.value.(uint)
if !ok {
var err error
if ov.value != nil {
err = errors.New("error casting to uint")
}
return 0, err
err = CastError
}
return val, nil
return val, ov.found, err
}
func (ov OptionValue) Float() (float64, error) {
func (ov OptionValue) Float() (val float64, found bool, err error) {
if !ov.found {
return 0, false, nil
}
val, ok := ov.value.(float64)
if !ok {
var err error
if ov.value != nil {
err = errors.New("error casting to float64")
}
return 0.0, err
err = CastError
}
return val, nil
return val, ov.found, err
}
func (ov OptionValue) String() (string, error) {
func (ov OptionValue) String() (val string, found bool, err error) {
if !ov.found {
return "", false, nil
}
val, ok := ov.value.(string)
if !ok {
var err error
if ov.value != nil {
err = errors.New("error casting to string")
}
return "", err
err = CastError
}
return val, nil
return val, ov.found, err
}
// Flag names

8
commands/response.go
View File

@ -108,13 +108,13 @@ func (r *response) Marshal() ([]byte, error) {
return []byte{}, nil
}
if !r.req.Option(EncShort).Found() {
return nil, fmt.Errorf("No encoding type was specified")
}
enc, err := r.req.Option(EncShort).String()
enc, found, err := r.req.Option(EncShort).String()
if err != nil {
return nil, err
}
if !found {
return nil, fmt.Errorf("No encoding type was specified")
}
encType := EncodingType(strings.ToLower(enc))
var marshaller Marshaller