all repos — searchix @ 9015baf955c94a806c01b3dcd5648c8e68ad2685

Search engine for NixOS, nix-darwin, home-manager and NUR users

refactor: ensure errors have stack traces

Alan Pearce
commit

9015baf955c94a806c01b3dcd5648c8e68ad2685

parent

7bb77ff5729cc9434afee895a470fd3b4c12e6d1

1 file changed, 9 insertions(+), 9 deletions(-)

changed files
M internal/index/index_meta.gointernal/index/index_meta.go
@@ -8,7 +8,7 @@
"go.alanpearce.eu/searchix/internal/file" "go.alanpearce.eu/x/log" - "github.com/pkg/errors" + "gitlab.com/tozd/go/errors" ) const CurrentSchemaVersion = 3
@@ -31,7 +31,7 @@ log *log.Logger
data } -func createMeta(path string, log *log.Logger) (*Meta, error) { +func createMeta(path string, log *log.Logger) (*Meta, errors.E) { exists, err := file.Exists(path) if err != nil { return nil, errors.WithMessage(err, "could not check for existence of index metadata")
@@ -49,7 +49,7 @@ },
}, nil } -func openMeta(path string, log *log.Logger) (*Meta, error) { +func openMeta(path string, log *log.Logger) (*Meta, errors.E) { exists, err := file.Exists(path) if err != nil { return nil, errors.WithMessage(err, "could not check for existence of index metadata")
@@ -58,16 +58,16 @@ if !exists {
return createMeta(path, log) } - j, err := os.ReadFile(path) - if err != nil { - return nil, errors.WithMessage(err, "could not open index metadata file") + j, baseErr := os.ReadFile(path) + if baseErr != nil { + return nil, errors.WithMessage(baseErr, "could not open index metadata file") } meta := Meta{ path: path, log: log, } - err = json.Unmarshal(j, &meta.data) - if err != nil { + + if err := json.Unmarshal(j, &meta.data); err != nil { return nil, errors.WithMessage(err, "index metadata is corrupt, try replacing the index") }
@@ -88,7 +88,7 @@ )
} } -func (i *Meta) Save() error { +func (i *Meta) Save() errors.E { i.SchemaVersion = CurrentSchemaVersion j, err := json.Marshal(i.data) if err != nil {