jcarr
/
cloud-control-panel
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correctly saving settinsg in the config file again 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-25 00:02:50 -07:00
parent 817b424eee
commit 18ee965fee
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
config.go
View File

@ -57,7 +57,7 @@ func loadConfigFile() {
filename = user.HomeDir + "/cloud-control-panel.json" filename = user.HomeDir + "/cloud-control-panel.json"
} }
tmp := loadDefaultConfig() tmp := loadConfigFromFilename(filename)
config = &tmp config = &tmp
// os.Exit(1) // os.Exit(1)
@ -191,8 +191,6 @@ func saveConfig() {
stuff, _ := marshaler.MarshalToString(config) stuff, _ := marshaler.MarshalToString(config)
log.Println(stuff) log.Println(stuff)
// TODO: Fix this
log.Println("FIXME: NOT SAVING CONFIG FILE AS:", filename)
writeToFile(filename, stuff) writeToFile(filename, stuff)
/* /*
f, err := os.Create(filename + ".yaml") f, err := os.Create(filename + ".yaml")
@ -209,18 +207,9 @@ func saveConfig() {
} }
// will load the default config from within the go binary // will load the default config from within the go binary
func loadDefaultConfig() pb.Config { func loadConfigFromFilename(filename string) pb.Config {
log.Println("TRY TO LOAD DEFAULT CONFIG")
// defaultConfig, _ := packrBox.FindString("protobuf-config.json")
defaultConfig, err := packrBox.FindString("protobuf-small.json")
log.Println("defaultConfig =", defaultConfig)
log.Println("err =", err)
log.Println("NEED TO UNMARSHAL THIS HERE")
log.Println("NEED TO UNMARSHAL THIS HERE")
log.Println("NEED TO UNMARSHAL THIS HERE")
// var newpb *pb.Config
sets := pb.Config{} sets := pb.Config{}
b, err := ioutil.ReadFile("resources/protobuf-config.json") b, err := ioutil.ReadFile(filename)
if err != nil { if err != nil {
log.Println("ioutil.ReadFile() ERROR =", err) log.Println("ioutil.ReadFile() ERROR =", err)
} }
@ -231,19 +220,24 @@ func loadDefaultConfig() pb.Config {
log.Println("jsonpb.Unmarshal() ERROR =", err) log.Println("jsonpb.Unmarshal() ERROR =", err)
} }
spew.Dump(sets) spew.Dump(sets)
// os.Exit(0)
return sets return sets
} }
/* // will load the default config from within the go binary
log.Println("ATTEMTED TO UNMARSHAL err =", err) func loadDefaultConfig() pb.Config {
spew.Dump(newpb) log.Println("TRY TO LOAD DEFAULT CONFIG")
if (err == nil) { // defaultConfig, _ := packrBox.FindString("protobuf-config.json")
log.Println("SETTING config to the default config", err) b, err := packrBox.FindString("protobuf-small.json")
// TODO: save the protobuf somewhere as the user could loose the tokens log.Println("b =", b)
log.Println("THIS IS PROBABLY REALLY BAD", err) log.Println("err =", err)
log.Println("THIS IS PROBABLY REALLY BAD", err) // var newpb *pb.Config
log.Println("THIS IS PROBABLY REALLY BAD", err) sets := pb.Config{}
// config = newpb
err = jsonpb.Unmarshal(strings.NewReader(string(b)), &sets)
if err != nil {
log.Println("jsonpb.Unmarshal() ERROR =", err)
} }
*/ spew.Dump(sets)
// os.Exit(0)
return sets
}