mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-06 14:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add dedicated Item interface for cache items

Browse source
This commit is contained in:
Deluan 2020-10-24 15:10:27 -04:00
parent 7eaa42797a
commit 197d4024f7
5 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/cache/file_caches.go vendored
View file

@ -15,10 +15,14 @@ import (
"github.com/dustin/go-humanize"
)
type ReadFunc func(ctx context.Context, arg fmt.Stringer) (io.Reader, error)
type Item interface {
Key() string
}
type ReadFunc func(ctx context.Context, item Item) (io.Reader, error)
type FileCache interface {
Get(ctx context.Context, arg fmt.Stringer) (*CachedStream, error)
Get(ctx context.Context, item Item) (*CachedStream, error)
Ready() bool
}
@ -78,7 +82,7 @@ func (fc *fileCache) available(ctx context.Context) bool {
return fc.ready && !fc.disabled
}
func (fc *fileCache) Get(ctx context.Context, arg fmt.Stringer) (*CachedStream, error) {
func (fc *fileCache) Get(ctx context.Context, arg Item) (*CachedStream, error) {
if !fc.available(ctx) {
reader, err := fc.getReader(ctx, arg)
if err != nil {
@ -87,7 +91,7 @@ func (fc *fileCache) Get(ctx context.Context, arg fmt.Stringer) (*CachedStream,
return &CachedStream{Reader: reader}, nil
}
key := arg.String()
key := arg.Key()
r, w, err := fc.cache.Get(key)
if err != nil {
return nil, err

11
core/cache/file_caches_test.go vendored
View file

@ -2,7 +2,6 @@ package cache
import (
"context"
"fmt"
"io"
"io/ioutil"
"os"
@ -53,9 +52,9 @@ var _ = Describe("File Caches", func() {
Describe("FileCache", func() {
It("caches data if cache is enabled", func() {
called := false
fc := callNewFileCache("test", "1KB", "test", 0, func(ctx context.Context, arg fmt.Stringer) (io.Reader, error) {
fc := callNewFileCache("test", "1KB", "test", 0, func(ctx context.Context, arg Item) (io.Reader, error) {
called = true
return strings.NewReader(arg.String()), nil
return strings.NewReader(arg.Key()), nil
})
// First call is a MISS
s, err := fc.Get(context.TODO(), &testArg{"test"})
@ -74,9 +73,9 @@ var _ = Describe("File Caches", func() {
It("does not cache data if cache is disabled", func() {
called := false
fc := callNewFileCache("test", "0", "test", 0, func(ctx context.Context, arg fmt.Stringer) (io.Reader, error) {
fc := callNewFileCache("test", "0", "test", 0, func(ctx context.Context, arg Item) (io.Reader, error) {
called = true
return strings.NewReader(arg.String()), nil
return strings.NewReader(arg.Key()), nil
})
// First call is a MISS
s, err := fc.Get(context.TODO(), &testArg{"test"})
@ -97,4 +96,4 @@ var _ = Describe("File Caches", func() {
type testArg struct{ s string }
func (t *testArg) String() string { return t.s }
func (t *testArg) Key() string { return t.s }