diff options
author | 2022-11-05 12:10:19 +0100 | |
---|---|---|
committer | 2022-11-05 11:10:19 +0000 | |
commit | bcb80d3ff4a669d52d63950c8830427646c05884 (patch) | |
tree | 4aa95a83545b3f87a80fe4b625cb6f2ad9c4427f /internal/storage | |
parent | [bugfix] Increase field size limits when registering apps (#958) (diff) | |
download | gotosocial-bcb80d3ff4a669d52d63950c8830427646c05884.tar.xz |
[chore] bump gruf/go-store to v2 (#953)
* [chore] bump gruf/go-store to v2
* no more boobs
Diffstat (limited to 'internal/storage')
-rw-r--r-- | internal/storage/local.go | 14 | ||||
-rw-r--r-- | internal/storage/storage.go | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/internal/storage/local.go b/internal/storage/local.go index 103233219..3fde7f0b9 100644 --- a/internal/storage/local.go +++ b/internal/storage/local.go @@ -23,8 +23,8 @@ import ( "io" "net/url" - "codeberg.org/gruf/go-store/kv" - "codeberg.org/gruf/go-store/storage" + "codeberg.org/gruf/go-store/v2/kv" + "codeberg.org/gruf/go-store/v2/storage" ) type Local struct { @@ -32,15 +32,15 @@ type Local struct { } func (l *Local) Get(ctx context.Context, key string) ([]byte, error) { - return l.KVStore.Get(key) + return l.KVStore.Get(ctx, key) } func (l *Local) GetStream(ctx context.Context, key string) (io.ReadCloser, error) { - return l.KVStore.GetStream(key) + return l.KVStore.GetStream(ctx, key) } func (l *Local) PutStream(ctx context.Context, key string, r io.Reader) error { - err := l.KVStore.PutStream(key, r) + err := l.KVStore.PutStream(ctx, key, r) if err == storage.ErrAlreadyExists { return ErrAlreadyExists } @@ -48,7 +48,7 @@ func (l *Local) PutStream(ctx context.Context, key string, r io.Reader) error { } func (l *Local) Put(ctx context.Context, key string, value []byte) error { - err := l.KVStore.Put(key, value) + err := l.KVStore.Put(ctx, key, value) if err == storage.ErrAlreadyExists { return ErrAlreadyExists } @@ -56,7 +56,7 @@ func (l *Local) Put(ctx context.Context, key string, value []byte) error { } func (l *Local) Delete(ctx context.Context, key string) error { - return l.KVStore.Delete(key) + return l.KVStore.Delete(ctx, key) } func (l *Local) URL(ctx context.Context, key string) *url.URL { diff --git a/internal/storage/storage.go b/internal/storage/storage.go index 7bd4c18aa..5d712bc3c 100644 --- a/internal/storage/storage.go +++ b/internal/storage/storage.go @@ -26,8 +26,8 @@ import ( "net/url" "path" - "codeberg.org/gruf/go-store/kv" - "codeberg.org/gruf/go-store/storage" + "codeberg.org/gruf/go-store/v2/kv" + "codeberg.org/gruf/go-store/v2/storage" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "github.com/superseriousbusiness/gotosocial/internal/config" @@ -60,7 +60,7 @@ func AutoConfig() (Driver, error) { return NewS3(mc, config.GetStorageS3BucketName()), nil case "local": storageBasePath := config.GetStorageLocalBasePath() - storage, err := kv.OpenFile(storageBasePath, &storage.DiskConfig{ + storage, err := kv.OpenDisk(storageBasePath, &storage.DiskConfig{ // Put the store lockfile in the storage dir itself. // Normally this would not be safe, since we could end up // overwriting the lockfile if we store a file called 'store.lock'. |