switch to this func

1 files changed, 38 insertions, 1 deletions

diff --git a/loadByAppname.go b/loadByAppname.go
index 5ee640e..cfa22cf 100644
--- a/loadByAppname.go
+++ b/loadByAppname.go
@@ -7,7 +7,44 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-// loads foo.proto from ~/.cache/<appname>/foo.text
+// loads foo.proto from ~/.cache/<appname>/foo.pb
+func LoadAppnameCache(pb proto.Message, appname string) error {
+	protoname, err := GetProtobufName(pb) // defined in the foo.proto file
+	if err != nil {
+		return err
+	}
+
+	// Get ~/.cache/appname/protoname.text
+	fullname := makeCacheFilename(appname, protoname)
+
+	// get the current filename in the protobuf file
+	curfilename, err := GetFilename(pb)
+	if err != nil {
+		return err
+	}
+	if curfilename == "" {
+		log.Printf("ConfigLoad() reading in %s\n", fullname)
+	}
+
+	err = loadPB(pb, fullname)
+	if err != nil {
+		return ErrMarshal
+	}
+
+	// If the cache file is new or has moved, this updates it to correct filename
+	// (the filename is what is used by pb.Save()
+	if curfilename != fullname {
+		_, err := SetFilename(pb, fullname)
+		if err != nil {
+			log.Info("FILENAME COULD NOT BE SET old=", curfilename)
+			log.Info("FILENAME COULD NOT BE SET new=", fullname)
+			return errors.Join(err, errors.New("something is wrong in lib/config"))
+		}
+	}
+	return nil
+}
+
+// deprecate
 func LoadByAppname(pb proto.Message, appname string) error {
 	protoname, err := GetProtobufName(pb) // defined in the foo.proto file
 	if err != nil {