Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
08397fef
Commit
08397fef
authored
Jul 17, 2014
by
astaxie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #700 from fuxiaohei/develop
code style simplify
parents
1858f307
84da1c92
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
46 deletions
+33
-46
ini.go
config/ini.go
+1
-1
json.go
config/json.go
+32
-45
No files found.
config/ini.go
View file @
08397fef
...
@@ -214,7 +214,7 @@ func (c *IniConfigContainer) getdata(key string) string {
...
@@ -214,7 +214,7 @@ func (c *IniConfigContainer) getdata(key string) string {
k
=
sectionKey
[
0
]
k
=
sectionKey
[
0
]
}
}
if
v
,
ok
:=
c
.
data
[
section
];
ok
{
if
v
,
ok
:=
c
.
data
[
section
];
ok
{
if
vv
,
ok
2
:=
v
[
k
];
ok2
{
if
vv
,
ok
:=
v
[
k
];
ok
{
return
vv
return
vv
}
}
}
}
...
...
config/json.go
View file @
08397fef
...
@@ -29,13 +29,13 @@ func (js *JsonConfig) Parse(filename string) (ConfigContainer, error) {
...
@@ -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
{}
...
@@ -57,72 +57,61 @@ type JsonConfigContainer struct {
...
@@ -57,72 +57,61 @@ type JsonConfigContainer struct {
// Bool returns the boolean value for a given key.
// Bool returns the boolean value for a given key.
func
(
c
*
JsonConfigContainer
)
Bool
(
key
string
)
(
bool
,
error
)
{
func
(
c
*
JsonConfigContainer
)
Bool
(
key
string
)
(
bool
,
error
)
{
val
:=
c
.
get
d
ata
(
key
)
val
:=
c
.
get
D
ata
(
key
)
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"
)
}
}
}
else
{
return
false
,
errors
.
New
(
"not bool value"
)
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
)
{
val
:=
c
.
get
d
ata
(
key
)
val
:=
c
.
get
D
ata
(
key
)
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"
)
}
}
}
else
{
return
0
,
errors
.
New
(
"not int value"
)
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
)
{
val
:=
c
.
get
d
ata
(
key
)
val
:=
c
.
get
D
ata
(
key
)
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"
)
}
}
}
else
{
return
0
,
errors
.
New
(
"not int64 value"
)
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
)
{
val
:=
c
.
get
d
ata
(
key
)
val
:=
c
.
get
D
ata
(
key
)
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"
)
}
}
}
else
{
return
0.0
,
errors
.
New
(
"not float64 value"
)
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
{
val
:=
c
.
get
d
ata
(
key
)
val
:=
c
.
get
D
ata
(
key
)
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.
...
@@ -140,39 +129,37 @@ func (c *JsonConfigContainer) Set(key, val string) error {
...
@@ -140,39 +129,37 @@ func (c *JsonConfigContainer) Set(key, val string) error {
// DIY returns the raw value by a given key.
// DIY returns the raw value by a given key.
func
(
c
*
JsonConfigContainer
)
DIY
(
key
string
)
(
v
interface
{},
err
error
)
{
func
(
c
*
JsonConfigContainer
)
DIY
(
key
string
)
(
v
interface
{},
err
error
)
{
val
:=
c
.
get
d
ata
(
key
)
val
:=
c
.
get
D
ata
(
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
func
(
c
*
JsonConfigContainer
)
get
d
ata
(
key
string
)
interface
{}
{
func
(
c
*
JsonConfigContainer
)
get
D
ata
(
key
string
)
interface
{}
{
c
.
RLock
()
c
.
RLock
()
defer
c
.
RUnlock
()
defer
c
.
RUnlock
()
if
len
(
key
)
==
0
{
if
len
(
key
)
==
0
{
return
nil
return
nil
}
}
section
k
ey
:=
strings
.
Split
(
key
,
"::"
)
section
K
ey
:=
strings
.
Split
(
key
,
"::"
)
if
len
(
section
k
ey
)
>=
2
{
if
len
(
section
K
ey
)
>=
2
{
c
ruval
,
ok
:=
c
.
data
[
sectionk
ey
[
0
]]
c
urValue
,
ok
:=
c
.
data
[
sectionK
ey
[
0
]]
if
!
ok
{
if
!
ok
{
return
nil
return
nil
}
}
for
_
,
key
:=
range
section
k
ey
[
1
:
]
{
for
_
,
key
:=
range
section
K
ey
[
1
:
]
{
if
v
,
ok
:=
c
ruval
.
(
map
[
string
]
interface
{});
!
ok
{
if
v
,
ok
:=
c
urValue
.
(
map
[
string
]
interface
{});
ok
{
return
nil
if
v2
,
ok
:=
v
[
key
];
ok
{
}
else
if
cruval
,
ok
=
v
[
key
];
!
ok
{
return
v2
return
nil
}
}
}
}
}
return
cruval
return
nil
}
else
{
}
if
v
,
ok
:=
c
.
data
[
key
];
ok
{
if
v
,
ok
:=
c
.
data
[
key
];
ok
{
return
v
return
v
}
}
}
return
nil
return
nil
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment