changed.go

@@ -1,26 +0,0 @@
-package config
-
-import "sync"
-
-// this package can provide a trivial way to track which
-// protobufs have been modified and need to be written to disk
-// todo: autogenpb could generate code to work with this
-
-var saveMap map[string]bool
-var saveLock sync.Mutex
-
-func init() {
-	// init() should be avoided, but this package and for making
-	// this small string map, it seems a sensible exception
-	saveMap = make(map[string]bool)
-}
-
-func SetChanged(name string, b bool) {
-	saveLock.Lock()
-	defer saveLock.Unlock()
-	saveMap[name] = b
-}
-
-func HasChanged(name string) bool {
-	return saveMap[name]
-}

load.go

@@ -42,6 +42,7 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error {
 	}
 
 	if strings.HasSuffix(fullname, ".text") {
+		fullname = strings.TrimSuffix(fullname, ".text")
 		fullname += ".json"
 		if err := loadJSON(pb, fullname); err != nil {
 			return err
@@ -53,44 +54,13 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error {
 	return log.Errorf("could not load config file")
 }
 
-func LoadPB(pb proto.Message, argname string, protoname string) (string, error) {
-	var fullname string
-	if strings.HasPrefix(argname, "/") {
-		fullname = filepath.Join(argname, protoname+".pb")
-	} else {
-		homeDir, err := os.UserHomeDir()
-		if err != nil {
-			log.Warn("ConfigLoad() UserHomeDir() err", err)
-			return "", err
-		}
-
-		fullname = filepath.Join(homeDir, ".config", argname, protoname+".pb")
-	}
-
-	data, err := loadFile(fullname)
-	if err != nil {
-		log.Warn("LoadPB()", fullname, err)
-		// set pb.Filename that was attempted
-		return fullname, err
-	}
-
-	// Unmarshal()
-	if err = proto.Unmarshal(data, pb); err != nil {
-		log.Warn("LoadPB() file", fullname)
-		log.Warn("LoadPB() Unmarshal() err", err)
-		return fullname, err
-	}
-
-	return fullname, nil
-}
-
 func loadTEXT(pb proto.Message, fullname string) error {
 	var data []byte
 	var err error
-	SetFilename(pb, fullname)
 	if data, err = loadFile(fullname); err != nil {
 		log.Warn("config file failed to load", err)
 		// set pb.Filename that was attempted
+		SetFilename(pb, fullname)
 		return err
 	}
 
@@ -120,13 +90,13 @@ func loadTEXT(pb proto.Message, fullname string) error {
 	return nil
 }
 
-// json files are backup Marshal() data in case .text Unmarshal() fails
-// they always should have the ".text" filename in them
 func loadJSON(pb proto.Message, fullname string) error {
 	var data []byte
 	var err error
 	if data, err = loadFile(fullname); err != nil {
 		log.Warn("config file failed to load", err)
+		// set pb.Filename that was attempted
+		SetFilename(pb, fullname)
 		return err
 	}
 

save.go

@@ -15,63 +15,32 @@ import (
 var ErrProtoFilename error = log.Errorf("proto does not have Filename")
 
 func ConfigSave(pb proto.Message) error {
-	// log.Infof("ConfigSave() filename=%s %d\n", fullname, len(s))
-	return saveTEXT(pb, "")
-}
-
-func SavePB(pb proto.Message, fullname string) error {
-	if !strings.HasSuffix(fullname, ".pb") {
-		// todo: append .text here?
-		return log.Errorf("%s needs to end in '.pb'", fullname)
-	}
-
-	dir, name := filepath.Split(fullname)
-	if name == "" {
-		return fmt.Errorf("filename was blank")
-	}
-	if err := os.MkdirAll(dir, os.ModePerm); err != nil {
-		return err
-	}
-
-	data, err := proto.Marshal(pb)
-	if err != nil {
-		return err
-	}
-
-	log.Infof("ConfigSave() filename=%s %d\n", fullname, len(data))
-	return configWrite(fullname, data)
-}
-
-func ConfigSaveWithHeader(pb proto.Message, header string) error {
-	var final error
-	if err := saveTEXT(pb, header); err != nil {
-		final = err
-	}
-	if err := saveJSON(pb); err != nil {
-		final = err
-	}
-
-	/*
-		if strings.HasSuffix(fullname, ".text") {
-			fullname = strings.TrimSuffix(fullname, ".text")
-			fullname += ".json"
-			if err := configJSON(fullname, pb); err != nil {
-				final = err
-			}
-		}
-	*/
-	return final
-}
-
-func saveTEXT(pb proto.Message, header string) error {
 	// get pb.Filename if it is there in the .proto file
 	fullname, ok := GetFilename(pb)
 	if !ok {
 		return ErrProtoFilename
 	}
-	if !strings.HasSuffix(fullname, ".text") {
-		// todo: append .text here?
-		return log.Errorf("not .text file: %s", fullname)
+
+	s := prototext.Format(pb)
+
+	dir, name := filepath.Split(fullname)
+	if name == "" {
+		return fmt.Errorf("filename was blank")
+	}
+	err := os.MkdirAll(dir, os.ModePerm)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("ConfigSave() filename=%s %d\n", fullname, len(s))
+	return configWrite(fullname, []byte(s))
+}
+
+func ConfigSaveWithHeader(pb proto.Message, header string) error {
+	// get pb.Filename if it is there in the .proto file
+	fullname, ok := GetFilename(pb)
+	if !ok {
+		return ErrProtoFilename
 	}
 
 	dir, name := filepath.Split(fullname)
@@ -82,40 +51,37 @@ func saveTEXT(pb proto.Message, header string) error {
 		return err
 	}
 
+	var final error
+	if err := configTEXT(fullname, pb, header); err != nil {
+		final = err
+	}
+
+	if strings.HasSuffix(fullname, ".text") {
+		fullname = strings.TrimSuffix(fullname, ".text")
+		fullname += ".json"
+		if err := configJSON(fullname, pb); err != nil {
+			final = err
+		}
+	}
+	return final
+}
+
+func configTEXT(fullname string, pb proto.Message, header string) error {
 	s := prototext.Format(pb)
 
 	log.Infof("ConfigSave() filename=%s %d\n", fullname, len(s))
 	return configWrite(fullname, []byte(header+s))
 }
 
-func saveJSON(pb proto.Message) error {
-	// get pb.Filename if it is there in the .proto file
-	fullname, ok := GetFilename(pb)
-	if !ok {
-		return ErrProtoFilename
-	}
-	if !strings.HasSuffix(fullname, ".text") {
-		// todo: append .text here?
-		return log.Errorf("not .text file: %s", fullname)
-	}
-
-	dir, name := filepath.Split(fullname)
-	if name == "" {
-		return fmt.Errorf("filename was blank")
-	}
-	if err := os.MkdirAll(dir, os.ModePerm); err != nil {
-		return err
-	}
-
+func configJSON(fullname string, pb proto.Message) error {
 	data := protojson.Format(pb)
 
-	fullname += ".json"
-
 	log.Infof("ConfigSave() filename=%s %d\n", fullname, len(data))
 	return configWrite(fullname, []byte(data))
 }
 
 func configWrite(fullname string, data []byte) error {
+
 	cfgfile, err := os.OpenFile(fullname, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
 	defer cfgfile.Close()
 	if err != nil {