3 Commits

Author SHA1 Message Date
95bdc4d109 upadte switch for any 2023-11-03 12:27:04 -07:00
64d37d936f add check for empty config file 2023-11-03 04:40:53 -07:00
62dd32f61b fix slice returners 2023-11-03 04:16:29 -07:00
2 changed files with 42 additions and 2 deletions

View File

@@ -145,6 +145,17 @@ func (c *ConfigManager) GetStringSlice(key string) []string {
switch val := v.Value.(type) { switch val := v.Value.(type) {
case []string: case []string:
return val return val
case []any:
var ret []string
for _, v := range val {
switch v := v.(type) {
case string:
ret = append(ret, v)
default:
ret = append(ret, fmt.Sprintf("%v", v))
}
}
return ret
default: default:
return nil return nil
} }
@@ -193,6 +204,29 @@ func (c *ConfigManager) GetIntSlice(key string) []int {
switch val := v.Value.(type) { switch val := v.Value.(type) {
case []int: case []int:
return val return val
case []any:
var ret []int
for _, v := range val {
switch v := v.(type) {
case int:
ret = append(ret, v)
case string:
i, err := strconv.Atoi(v)
if err != nil {
continue
}
ret = append(ret, i)
case float32:
ret = append(ret, int(v))
case float64:
ret = append(ret, int(v))
case nil:
continue
default:
continue
}
}
return ret
default: default:
return nil return nil
} }

10
jety.go
View File

@@ -41,7 +41,10 @@ type (
} }
) )
var ErrConfigFileNotFound = errors.New("config File Not Found") var (
ErrConfigFileNotFound = errors.New("config file not found")
ErrConfigFileEmpty = errors.New("config file is empty")
)
func NewConfigManager() *ConfigManager { func NewConfigManager() *ConfigManager {
cm := ConfigManager{} cm := ConfigManager{}
@@ -181,9 +184,12 @@ func (c *ConfigManager) ReadInConfig() error {
func readFile(filename string, fileType configType) (map[string]any, error) { func readFile(filename string, fileType configType) (map[string]any, error) {
fileData := make(map[string]any) fileData := make(map[string]any)
if _, err := os.Stat(filename); os.IsNotExist(err) { if d, err := os.Stat(filename); os.IsNotExist(err) {
return nil, ErrConfigFileNotFound return nil, ErrConfigFileNotFound
} else if d.Size() == 0 {
return nil, ErrConfigFileEmpty
} }
switch fileType { switch fileType {
case ConfigTypeTOML: case ConfigTypeTOML:
_, err := toml.DecodeFile(filename, &fileData) _, err := toml.DecodeFile(filename, &fileData)