gofmt
Juan Batiz-Benet committed
Jul 5, 2014 at 01:52 UTC
381bfaa691ebf7a134ee9382b1f1138b4b7794be
3 files changed
+63
-64
config/config.go
+35
-36
@@ -1,26 +1,25 @@
1
package config
2
3
import (
4
- "strings"
5
- "os"
6
- "os/user"
4
+ "os"
5
+ "os/user"
6
+ "strings"
7
)
8
9
type Identity struct {
10
- PeerId string
10
+ PeerId string
11
}
12
13
type Datastore struct {
14
- Type string
15
- Path string
14
+ Type string
15
+ Path string
16
}
17
18
type Config struct {
19
- Identity Identity
20
- Datastore Datastore
19
+ Identity Identity
20
+ Datastore Datastore
21
}
22
23
-
23
var defaultConfigFilePath = "~/.go-ipfs/config"
24
var defaultConfigFile = `{
25
"identity": {},
@@ -32,31 +31,31 @@ var defaultConfigFile = `{
31
`
32
33
func LoadConfig(filename string) (*Config, error) {
35
- if len(filename) == 0 {
36
- filename = defaultConfigFilePath
37
- }
38
-
39
- // expand ~/
40
- if strings.HasPrefix(filename, "~/") {
41
- usr, err := user.Current()
42
- if err != nil {
43
- return nil, err
44
- }
45
-
46
- dir := usr.HomeDir + "/"
47
- filename = strings.Replace(filename, "~/", dir, 1)
48
- }
49
-
50
- // if nothing is there, write first conifg file.
51
- if _, err := os.Stat(filename); os.IsNotExist(err) {
52
- WriteFile(filename, []byte(defaultConfigFile))
53
- }
54
-
55
- var cfg Config
56
- err := ReadConfigFile(filename, &cfg)
57
- if err != nil {
58
- return nil, err
59
- }
60
-
61
- return &cfg, err
34
+ if len(filename) == 0 {
35
+ filename = defaultConfigFilePath
36
+ }
37
+
38
+ // expand ~/
39
+ if strings.HasPrefix(filename, "~/") {
40
+ usr, err := user.Current()
41
+ if err != nil {
42
+ return nil, err
43
+ }
44
+
45
+ dir := usr.HomeDir + "/"
46
+ filename = strings.Replace(filename, "~/", dir, 1)
47
+ }
48
+
49
+ // if nothing is there, write first conifg file.
50
+ if _, err := os.Stat(filename); os.IsNotExist(err) {
51
+ WriteFile(filename, []byte(defaultConfigFile))
52
+ }
53
+
54
+ var cfg Config
55
+ err := ReadConfigFile(filename, &cfg)
56
+ if err != nil {
57
+ return nil, err
58
+ }
59
+
60
+ return &cfg, err
61
}
config/config_test.go
+8
-8
@@ -1,17 +1,17 @@
1
package config
2
3
import (
4
- "fmt"
5
- "testing"
4
+ "fmt"
5
+ "testing"
6
)
7
8
func TestConfig(t *testing.T) {
9
10
- cfg, err := LoadConfig("")
11
- if err != nil {
12
- t.Error(err)
13
- return
14
- }
10
+ cfg, err := LoadConfig("")
11
+ if err != nil {
12
+ t.Error(err)
13
+ return
14
+ }
15
16
- fmt.Printf(cfg.Datastore.Path)
16
+ fmt.Printf(cfg.Datastore.Path)
17
}
config/serialize.go
+20
-20
@@ -1,39 +1,39 @@
1
package config
2
3
import (
4
- "os"
5
- "path"
6
- "io/ioutil"
7
- "encoding/json"
4
+ "encoding/json"
5
+ "io/ioutil"
6
+ "os"
7
+ "path"
8
)
9
10
func ReadFile(filename string) ([]byte, error) {
11
- return ioutil.ReadFile(filename)
11
+ return ioutil.ReadFile(filename)
12
}
13
14
func WriteFile(filename string, buf []byte) error {
15
- err := os.MkdirAll(path.Dir(filename), 0777)
16
- if err != nil {
17
- return err
18
- }
15
+ err := os.MkdirAll(path.Dir(filename), 0777)
16
+ if err != nil {
17
+ return err
18
+ }
19
20
- return ioutil.WriteFile(filename, buf, 0666)
20
+ return ioutil.WriteFile(filename, buf, 0666)
21
}
22
23
func ReadConfigFile(filename string, cfg *Config) error {
24
- buf, err := ReadFile(filename)
25
- if err != nil {
26
- return err
27
- }
24
+ buf, err := ReadFile(filename)
25
+ if err != nil {
26
+ return err
27
+ }
28
29
- return json.Unmarshal(buf, cfg)
29
+ return json.Unmarshal(buf, cfg)
30
}
31
32
func WriteConfigFile(filename string, cfg *Config) error {
33
- buf, err := json.MarshalIndent(cfg, "", " ")
34
- if err != nil {
35
- return err
36
- }
33
+ buf, err := json.MarshalIndent(cfg, "", " ")
34
+ if err != nil {
35
+ return err
36
+ }
37
38
- return WriteFile(filename, buf)
38
+ return WriteFile(filename, buf)
39
}