Add contect as first parameter for all config method
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
package xml
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/xml"
|
||||
"errors"
|
||||
"fmt"
|
||||
@@ -80,7 +81,7 @@ type ConfigContainer struct {
|
||||
}
|
||||
|
||||
// Bool returns the boolean value for a given key.
|
||||
func (c *ConfigContainer) Bool(key string) (bool, error) {
|
||||
func (c *ConfigContainer) Bool(ctx context.Context, key string) (bool, error) {
|
||||
if v := c.data[key]; v != nil {
|
||||
return config.ParseBool(v)
|
||||
}
|
||||
@@ -88,63 +89,63 @@ func (c *ConfigContainer) Bool(key string) (bool, error) {
|
||||
}
|
||||
|
||||
// DefaultBool return the bool value if has no error
|
||||
// otherwise return the defaultval
|
||||
func (c *ConfigContainer) DefaultBool(key string, defaultval bool) bool {
|
||||
v, err := c.Bool(key)
|
||||
// otherwise return the defaultVal
|
||||
func (c *ConfigContainer) DefaultBool(ctx context.Context, key string, defaultVal bool) bool {
|
||||
v, err := c.Bool(ctx, key)
|
||||
if err != nil {
|
||||
return defaultval
|
||||
return defaultVal
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
// Int returns the integer value for a given key.
|
||||
func (c *ConfigContainer) Int(key string) (int, error) {
|
||||
func (c *ConfigContainer) Int(ctx context.Context, key string) (int, error) {
|
||||
return strconv.Atoi(c.data[key].(string))
|
||||
}
|
||||
|
||||
// DefaultInt returns the integer value for a given key.
|
||||
// if err != nil return defaultval
|
||||
func (c *ConfigContainer) DefaultInt(key string, defaultval int) int {
|
||||
v, err := c.Int(key)
|
||||
// if err != nil return defaultVal
|
||||
func (c *ConfigContainer) DefaultInt(ctx context.Context, key string, defaultVal int) int {
|
||||
v, err := c.Int(ctx, key)
|
||||
if err != nil {
|
||||
return defaultval
|
||||
return defaultVal
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
// Int64 returns the int64 value for a given key.
|
||||
func (c *ConfigContainer) Int64(key string) (int64, error) {
|
||||
func (c *ConfigContainer) Int64(ctx context.Context, key string) (int64, error) {
|
||||
return strconv.ParseInt(c.data[key].(string), 10, 64)
|
||||
}
|
||||
|
||||
// DefaultInt64 returns the int64 value for a given key.
|
||||
// if err != nil return defaultval
|
||||
func (c *ConfigContainer) DefaultInt64(key string, defaultval int64) int64 {
|
||||
v, err := c.Int64(key)
|
||||
// if err != nil return defaultVal
|
||||
func (c *ConfigContainer) DefaultInt64(ctx context.Context, key string, defaultVal int64) int64 {
|
||||
v, err := c.Int64(ctx, key)
|
||||
if err != nil {
|
||||
return defaultval
|
||||
return defaultVal
|
||||
}
|
||||
return v
|
||||
|
||||
}
|
||||
|
||||
// Float returns the float value for a given key.
|
||||
func (c *ConfigContainer) Float(key string) (float64, error) {
|
||||
func (c *ConfigContainer) Float(ctx context.Context, key string) (float64, error) {
|
||||
return strconv.ParseFloat(c.data[key].(string), 64)
|
||||
}
|
||||
|
||||
// DefaultFloat returns the float64 value for a given key.
|
||||
// if err != nil return defaultval
|
||||
func (c *ConfigContainer) DefaultFloat(key string, defaultval float64) float64 {
|
||||
v, err := c.Float(key)
|
||||
// if err != nil return defaultVal
|
||||
func (c *ConfigContainer) DefaultFloat(ctx context.Context, key string, defaultVal float64) float64 {
|
||||
v, err := c.Float(ctx, key)
|
||||
if err != nil {
|
||||
return defaultval
|
||||
return defaultVal
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
// String returns the string value for a given key.
|
||||
func (c *ConfigContainer) String(key string) (string, error) {
|
||||
func (c *ConfigContainer) String(ctx context.Context, key string) (string, error) {
|
||||
if v, ok := c.data[key].(string); ok {
|
||||
return v, nil
|
||||
}
|
||||
@@ -152,18 +153,18 @@ func (c *ConfigContainer) String(key string) (string, error) {
|
||||
}
|
||||
|
||||
// DefaultString returns the string value for a given key.
|
||||
// if err != nil return defaultval
|
||||
func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
|
||||
v, err := c.String(key)
|
||||
// if err != nil return defaultVal
|
||||
func (c *ConfigContainer) DefaultString(ctx context.Context, key string, defaultVal string) string {
|
||||
v, err := c.String(nil, key)
|
||||
if v == "" || err != nil {
|
||||
return defaultval
|
||||
return defaultVal
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
// Strings returns the []string value for a given key.
|
||||
func (c *ConfigContainer) Strings(key string) ([]string, error) {
|
||||
v, err := c.String(key)
|
||||
func (c *ConfigContainer) Strings(ctx context.Context, key string) ([]string, error) {
|
||||
v, err := c.String(ctx, key)
|
||||
if v == "" || err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -171,17 +172,17 @@ func (c *ConfigContainer) Strings(key string) ([]string, error) {
|
||||
}
|
||||
|
||||
// DefaultStrings returns the []string value for a given key.
|
||||
// if err != nil return defaultval
|
||||
func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []string {
|
||||
v, err := c.Strings(key)
|
||||
// if err != nil return defaultVal
|
||||
func (c *ConfigContainer) DefaultStrings(ctx context.Context, key string, defaultVal []string) []string {
|
||||
v, err := c.Strings(ctx, key)
|
||||
if v == nil || err != nil {
|
||||
return defaultval
|
||||
return defaultVal
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
// GetSection returns map for the given section
|
||||
func (c *ConfigContainer) GetSection(section string) (map[string]string, error) {
|
||||
func (c *ConfigContainer) GetSection(ctx context.Context, section string) (map[string]string, error) {
|
||||
if v, ok := c.data[section].(map[string]interface{}); ok {
|
||||
mapstr := make(map[string]string)
|
||||
for k, val := range v {
|
||||
@@ -193,7 +194,7 @@ func (c *ConfigContainer) GetSection(section string) (map[string]string, error)
|
||||
}
|
||||
|
||||
// SaveConfigFile save the config into file
|
||||
func (c *ConfigContainer) SaveConfigFile(filename string) (err error) {
|
||||
func (c *ConfigContainer) SaveConfigFile(ctx context.Context, filename string) (err error) {
|
||||
// Write configuration file by filename.
|
||||
f, err := os.Create(filename)
|
||||
if err != nil {
|
||||
@@ -209,7 +210,7 @@ func (c *ConfigContainer) SaveConfigFile(filename string) (err error) {
|
||||
}
|
||||
|
||||
// Set writes a new value for key.
|
||||
func (c *ConfigContainer) Set(key, val string) error {
|
||||
func (c *ConfigContainer) Set(ctx context.Context, key, val string) error {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
c.data[key] = val
|
||||
@@ -217,7 +218,7 @@ func (c *ConfigContainer) Set(key, val string) error {
|
||||
}
|
||||
|
||||
// DIY returns the raw value by a given key.
|
||||
func (c *ConfigContainer) DIY(key string) (v interface{}, err error) {
|
||||
func (c *ConfigContainer) DIY(ctx context.Context, key string) (v interface{}, err error) {
|
||||
if v, ok := c.data[key]; ok {
|
||||
return v, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user