vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-01 18:19:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Has fn to config perspective

Browse source
This commit is contained in:
Daniel 2020-10-29 13:58:52 +01:00
parent 8a0c3a077c
commit dbbe556f3c
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/option.go
View file

@ -16,6 +16,7 @@ type OptionType uint8
// Various attribute options. Use ExternalOptType for extended types in the frontend. // Various attribute options. Use ExternalOptType for extended types in the frontend.
const ( const (
optTypeAny OptionType = 0
OptTypeString OptionType = 1 OptTypeString OptionType = 1
OptTypeStringArray OptionType = 2 OptTypeStringArray OptionType = 2
OptTypeInt OptionType = 3 OptTypeInt OptionType = 3
@ -24,6 +25,8 @@ const (
func getTypeName(t OptionType) string { func getTypeName(t OptionType) string {
switch t { switch t {
case optTypeAny:
return "any"
case OptTypeString: case OptTypeString:
return "string" return "string"
case OptTypeStringArray: case OptTypeStringArray:

8
config/perspective.go
View file

@ -75,7 +75,7 @@ func (p *Perspective) getPerspectiveValueCache(name string, requestedType Option
} }
// check type // check type
if requestedType != pOption.option.OptType { if requestedType != pOption.option.OptType && requestedType != optTypeAny {
log.Errorf("config: bad type: requested %s as %s, but is %s", name, getTypeName(requestedType), getTypeName(pOption.option.OptType)) log.Errorf("config: bad type: requested %s as %s, but is %s", name, getTypeName(requestedType), getTypeName(pOption.option.OptType))
return nil return nil
} }
@ -88,6 +88,12 @@ func (p *Perspective) getPerspectiveValueCache(name string, requestedType Option
return pOption.valueCache return pOption.valueCache
} }
// Has returns whether the given option is set in the perspective.
func (p *Perspective) Has(name string) bool {
valueCache := p.getPerspectiveValueCache(name, optTypeAny)
return valueCache != nil
}
// GetAsString returns a function that returns the wanted string with high performance. // GetAsString returns a function that returns the wanted string with high performance.
func (p *Perspective) GetAsString(name string) (value string, ok bool) { func (p *Perspective) GetAsString(name string) (value string, ok bool) {
valueCache := p.getPerspectiveValueCache(name, OptTypeString) valueCache := p.getPerspectiveValueCache(name, OptTypeString)