Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jsonconfig: add OptionalList 

Change-Id: I51bd6a785e47ddeca7b2ddd23c4665f61ef1d099
This commit is contained in:
Brad Fitzpatrick 2011-06-19 13:09:05 -07:00
parent ba467698a3
commit d8f7bc9d98
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/go/camli/jsonconfig/jsonconfig.go
View File

@ -37,7 +37,7 @@ func (jc Obj) OptionalObject(key string) Obj {
func (jc Obj) obj(key string, optional bool) Obj {
jc.noteKnownKey(key)
ei, ok := jc[key]
ei, ok := jc[key]
if !ok {
if optional {
return make(Obj)
@ -64,7 +64,7 @@ func (jc Obj) OptionalString(key, def string) string {
func (jc Obj) string(key string, def *string) string {
jc.noteKnownKey(key)
ei, ok := jc[key]
if !ok {
if !ok {
if def != nil {
return *def
}
@ -89,7 +89,7 @@ func (jc Obj) OptionalStringOrObject(key string) interface{} {
func (jc Obj) stringOrObject(key string, required bool) interface{} {
jc.noteKnownKey(key)
ei, ok := jc[key]
ei, ok := jc[key]
if !ok {
if !required {
return nil
@ -104,7 +104,7 @@ func (jc Obj) stringOrObject(key string, required bool) interface{} {
return ei
}
jc.appendError(fmt.Errorf("Expected config key %q to be a string or object", key))
return ""
return ""
}
func (jc Obj) RequiredBool(key string) bool {
@ -160,10 +160,20 @@ func (jc Obj) int(key string, def *int) int {
}
func (jc Obj) RequiredList(key string) []string {
return jc.requiredList(key, true)
}
func (jc Obj) OptionalList(key string) []string {
return jc.requiredList(key, false)
}
func (jc Obj) requiredList(key string, required bool) []string {
jc.noteKnownKey(key)
ei, ok := jc[key]
ei, ok := jc[key]
if !ok {
jc.appendError(fmt.Errorf("Missing required config key %q (list of strings)", key))
if required {
jc.appendError(fmt.Errorf("Missing required config key %q (list of strings)", key))
}
return nil
}
eil, ok := ei.([]interface{})
@ -186,7 +196,7 @@ func (jc Obj) RequiredList(key string) []string {
func (jc Obj) noteKnownKey(key string) {
_, ok := jc["_knownkeys"]
if !ok {
jc["_knownkeys"] = make(map[string]bool)
jc["_knownkeys"] = make(map[string]bool)
}
jc["_knownkeys"].(map[string]bool)[key] = true
}