lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-06-18 12:24:14 +00:00
Code Issues Releases Activity

code style simplify

Browse Source
This commit is contained in:
fuxiaohei 2014-07-15 10:01:26 +08:00
parent 024817aacb
commit e52386b52d
1 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
config/json.go
View File

@ -29,13 +29,13 @@ func (js *JsonConfig) Parse(filename string) (ConfigContainer, error) {
return nil, err return nil, err
} }
defer file.Close() defer file.Close()
x := &JsonConfigContainer{
data: make(map[string]interface{}),
}
content, err := ioutil.ReadAll(file) content, err := ioutil.ReadAll(file)
if err != nil { if err != nil {
return nil, err return nil, err
} }
x := &JsonConfigContainer{
data: make(map[string]interface{}),
}
err = json.Unmarshal(content, &x.data) err = json.Unmarshal(content, &x.data)
if err != nil { if err != nil {
var wrappingArray []interface{} var wrappingArray []interface{}
@ -61,13 +61,11 @@ func (c *JsonConfigContainer) Bool(key string) (bool, error) {
if val != nil { if val != nil {
if v, ok := val.(bool); ok { if v, ok := val.(bool); ok {
return v, nil return v, nil
} else { }
return false, errors.New("not bool value") return false, errors.New("not bool value")
} }
} else {
return false, errors.New("not exist key:" + key) return false, errors.New("not exist key:" + key)
} }
}
// Int returns the integer value for a given key. // Int returns the integer value for a given key.
func (c *JsonConfigContainer) Int(key string) (int, error) { func (c *JsonConfigContainer) Int(key string) (int, error) {
@ -75,13 +73,11 @@ func (c *JsonConfigContainer) Int(key string) (int, error) {
if val != nil { if val != nil {
if v, ok := val.(float64); ok { if v, ok := val.(float64); ok {
return int(v), nil return int(v), nil
} else { }
return 0, errors.New("not int value") return 0, errors.New("not int value")
} }
} else {
return 0, errors.New("not exist key:" + key) return 0, errors.New("not exist key:" + key)
} }
}
// Int64 returns the int64 value for a given key. // Int64 returns the int64 value for a given key.
func (c *JsonConfigContainer) Int64(key string) (int64, error) { func (c *JsonConfigContainer) Int64(key string) (int64, error) {
@ -89,13 +85,11 @@ func (c *JsonConfigContainer) Int64(key string) (int64, error) {
if val != nil { if val != nil {
if v, ok := val.(float64); ok { if v, ok := val.(float64); ok {
return int64(v), nil return int64(v), nil
} else { }
return 0, errors.New("not int64 value") return 0, errors.New("not int64 value")
} }
} else {
return 0, errors.New("not exist key:" + key) return 0, errors.New("not exist key:" + key)
} }
}
// Float returns the float value for a given key. // Float returns the float value for a given key.
func (c *JsonConfigContainer) Float(key string) (float64, error) { func (c *JsonConfigContainer) Float(key string) (float64, error) {
@ -103,13 +97,11 @@ func (c *JsonConfigContainer) Float(key string) (float64, error) {
if val != nil { if val != nil {
if v, ok := val.(float64); ok { if v, ok := val.(float64); ok {
return v, nil return v, nil
} else { }
return 0.0, errors.New("not float64 value") return 0.0, errors.New("not float64 value")
} }
} else {
return 0.0, errors.New("not exist key:" + key) return 0.0, errors.New("not exist key:" + key)
} }
}
// String returns the string value for a given key. // String returns the string value for a given key.
func (c *JsonConfigContainer) String(key string) string { func (c *JsonConfigContainer) String(key string) string {
@ -117,12 +109,9 @@ func (c *JsonConfigContainer) String(key string) string {
if val != nil { if val != nil {
if v, ok := val.(string); ok { if v, ok := val.(string); ok {
return v return v
} else {
return ""
} }
} else {
return ""
} }
return ""
} }
// Strings returns the []string value for a given key. // Strings returns the []string value for a given key.
@ -143,9 +132,8 @@ func (c *JsonConfigContainer) DIY(key string) (v interface{}, err error) {
val := c.getdata(key) val := c.getdata(key)
if val != nil { if val != nil {
return val, nil return val, nil
} else {
return nil, errors.New("not exist key")
} }
return nil, errors.New("not exist key")
} }
// section.key or key // section.key or key
@ -155,25 +143,22 @@ func (c *JsonConfigContainer) getdata(key string) interface{} {
if len(key) == 0 { if len(key) == 0 {
return nil return nil
} }
sectionkey := strings.Split(key, "::") sectionKey := strings.Split(key, "::")
if len(sectionkey) >= 2 { if len(sectionKey) >= 2 {
cruval, ok := c.data[sectionkey[0]] if curValue, ok := c.data[sectionKey[0]]; ok {
if !ok { for _, key := range sectionKey[1:] {
return nil if v, ok := curValue.(map[string]interface{}); ok {
} if v2, ok := v[key]; ok {
for _, key := range sectionkey[1:] { return v2
if v, ok := cruval.(map[string]interface{}); !ok {
return nil
} else if cruval, ok = v[key]; !ok {
return nil
} }
} }
return cruval }
} else { }
return nil
}
if v, ok := c.data[key]; ok { if v, ok := c.data[key]; ok {
return v return v
} }
}
return nil return nil
} }