jcarr
/
pbconfig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasn't using Format()

This commit is contained in:
Jeff Carr 2025-09-10 22:35:37 -05:00
parent 2943d44b4a
commit fe4b47339a
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
load.go
View File

@ -34,9 +34,11 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error {
} }
fullname = filepath.Join(homeDir, ".config", argname, protoname+".text") fullname = filepath.Join(homeDir, ".config", argname, protoname+".text")
if data, err = loadFile(fullname); err != nil { if data, err = loadFile(fullname); err != nil {
log.Warn("config file failed to load", err) log.Warn("config file failed to load", err)
// something went wrong loading the file // set pb.Filename that was attempted
SetFilename(pb, fullname)
return err return err
} }
@ -50,9 +52,6 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error {
return err return err
} }
// set pb.Filename if it is there in the .proto file
SetFilename(pb, fullname)
log.Infof("ConfigLoad() arg=%s, proto=%s\n", argname, protoname) log.Infof("ConfigLoad() arg=%s, proto=%s\n", argname, protoname)
return nil return nil
} }

11
save.go
View File

@ -20,22 +20,19 @@ func ConfigSave(pb proto.Message) error {
} }
// Unmarshal() // Unmarshal()
data, err := prototext.Marshal(pb) s := prototext.Format(pb)
if err != nil {
return err
}
dir, name := filepath.Split(fullname) dir, name := filepath.Split(fullname)
if name == "" { if name == "" {
return fmt.Errorf("filename was blank") return fmt.Errorf("filename was blank")
} }
err = os.MkdirAll(dir, os.ModePerm) err := os.MkdirAll(dir, os.ModePerm)
if err != nil { if err != nil {
return err return err
} }
log.Infof("ConfigSave() filename=%s %d\n", fullname, len(data)) log.Infof("ConfigSave() filename=%s %d\n", fullname, len(s))
return configWrite(fullname, data) return configWrite(fullname, []byte(s))
} }
func configWrite(fullname string, data []byte) error { func configWrite(fullname string, data []byte) error {