From de26924a4a47fa6b48971cf51f51a5b732745e59 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 19 Sep 2022 13:59:11 +0200 Subject: don't error out if storage key already exists (#840) --- internal/storage/local.go | 13 +++++++++++-- internal/storage/storage.go | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'internal/storage') diff --git a/internal/storage/local.go b/internal/storage/local.go index 8ed3ca8d8..103233219 100644 --- a/internal/storage/local.go +++ b/internal/storage/local.go @@ -24,6 +24,7 @@ import ( "net/url" "codeberg.org/gruf/go-store/kv" + "codeberg.org/gruf/go-store/storage" ) type Local struct { @@ -39,11 +40,19 @@ func (l *Local) GetStream(ctx context.Context, key string) (io.ReadCloser, error } func (l *Local) PutStream(ctx context.Context, key string, r io.Reader) error { - return l.KVStore.PutStream(key, r) + err := l.KVStore.PutStream(key, r) + if err == storage.ErrAlreadyExists { + return ErrAlreadyExists + } + return err } func (l *Local) Put(ctx context.Context, key string, value []byte) error { - return l.KVStore.Put(key, value) + err := l.KVStore.Put(key, value) + if err == storage.ErrAlreadyExists { + return ErrAlreadyExists + } + return err } func (l *Local) Delete(ctx context.Context, key string) error { diff --git a/internal/storage/storage.go b/internal/storage/storage.go index 7a4ebc6c3..7bd4c18aa 100644 --- a/internal/storage/storage.go +++ b/internal/storage/storage.go @@ -34,6 +34,7 @@ import ( ) var ErrNotSupported = errors.New("driver does not suppport functionality") +var ErrAlreadyExists = errors.New("storage key already exists") // Driver implements the functionality to store and retrieve blobs // (images,video,audio) -- cgit v1.3