Skip to content

Commit 3c6b5ac

Browse files
committed
configのロード箇所のリファクタリング
1 parent 1d5801d commit 3c6b5ac

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

main.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@ import (
1111
"time"
1212
)
1313

14-
func (c *Config) SetConfig(target string, serviceId string, apiKey string, endpoints []string) {
14+
func (c *Config) setConfig(target string, serviceId string, apiKey string, endpoints []string) {
1515
c.Target = target
1616
c.ServiceID = serviceId
1717
c.APIKey = apiKey
1818
c.Endpoints = endpoints
1919
}
2020

21-
func loadConfig() (*Config, error) {
21+
func (c *Config) loadConfig() error {
2222
f, err := os.Open("config.json")
2323
if err != nil {
24-
return nil, err
24+
return err
2525
}
2626
defer f.Close()
2727

28-
var cfg Config
2928
d := json.NewDecoder(f)
3029
d.DisallowUnknownFields()
31-
err = d.Decode(&cfg)
32-
return &cfg, err
30+
d.Decode(c)
31+
return nil
3332
}
3433

35-
func getOption(modeFlag string) (*Config, error) {
34+
func initOption(modeFlag string) (*Config, error) {
35+
option := &Config{}
36+
var err error
37+
3638
// コマンドライン引数で"-mode=auto"がセットされていたら、対話式のメッセージは表示しない
3739
if modeFlag == "auto" {
38-
option, err := loadConfig()
40+
err := option.loadConfig()
3941
return option, err
4042
}
4143

4244
// 対話式でオプションをセット
43-
option := &Config{}
44-
var err error
4545

4646
var target string
4747
var serviceId string
@@ -53,7 +53,7 @@ func getOption(modeFlag string) (*Config, error) {
5353
fmt.Println("> モードを選択してください(auto / manual)")
5454
for scanner.Scan() {
5555
if scanner.Text() == "auto" {
56-
option, err = loadConfig()
56+
err = option.loadConfig()
5757
break
5858
}
5959

@@ -101,7 +101,7 @@ func getOption(modeFlag string) (*Config, error) {
101101
}
102102
}
103103

104-
option.SetConfig(target, serviceId, apiKey, endpoints)
104+
option.setConfig(target, serviceId, apiKey, endpoints)
105105
break
106106
}
107107
}
@@ -113,7 +113,7 @@ func main() {
113113
modeFlag := flag.String("mode", "", "mode value")
114114
flag.Parse()
115115

116-
option, err := getOption(*modeFlag)
116+
option, err := initOption(*modeFlag)
117117
if err != nil {
118118
log.Fatal("正常にオプションをセットできませんでした")
119119
}

0 commit comments

Comments
 (0)