wasn't setting Filename after Load()

1 files changed, 9 insertions, 4 deletions

diff --git a/load.go b/load.go
index 00dda3d..f0357a3 100644
--- a/load.go
+++ b/load.go
@@ -72,10 +72,11 @@ func LoadCache(pb proto.Message, argname string, protoname string) error {
 	fullpath := filepath.Join(cacheDir, argname)
 	os.MkdirAll(fullpath, os.ModePerm)
 	fullname := filepath.Join(fullpath, protoname+".pb")
-	SetFilename(pb, fullname)
-	return Load(pb)
+	_, err := SetFilename(pb, fullname)
+	return errors.Join(err, Load(pb))
 }
 
+// this logic isn't great yet
 func Load(pb proto.Message) error {
 	fullname, err := GetFilename(pb)
 	if err != nil {
@@ -112,10 +113,14 @@ func Load(pb proto.Message) error {
 			err = errors.Join(err, errors.New("pb uuid    is:"+pbuuid))
 			return err
 		}
+		_, err := SetFilename(pb, fullname)
+		if err != nil {
+			return err
+		}
 		worked = true
 	}
 	if !worked {
-		return fmt.Errorf("unknown filetype %s", fullname)
+		return fmt.Errorf("unknown filetype '%s'", fullname)
 	}
 	newver, _ := GetString(pb, "version")
 	if ver != newver {
@@ -139,7 +144,7 @@ func LoadFile(pb proto.Message, fullname string) error {
 		return loadPB(pb, fullname)
 	}
 
-	return fmt.Errorf("unknown filetype %s", fullname)
+	return fmt.Errorf("unknown filetype '%s'", fullname)
 }
 
 func loadPB(pb proto.Message, fullname string) error {