From 10a8d81b1384b31a885f101b986726dfcd41a54a Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 12 Oct 2025 05:41:34 -0500 Subject: wasn't setting Filename after Load() --- load.go | 13 +++++++++---- save.go | 2 +- 2 files changed, 10 insertions(+), 5 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 { diff --git a/save.go b/save.go index 37a457e..78175bd 100644 --- a/save.go +++ b/save.go @@ -35,7 +35,7 @@ func SavePB(pb proto.Message, fullname string) error { if strings.HasSuffix(fullname, ".json") { return saveJSON(pb) } - return fmt.Errorf("unknown filetype %s", fullname) + return fmt.Errorf("unknown filetype '%s'", fullname) } func saveProto(pb proto.Message, fullname string) error { -- cgit v1.2.3