From 1322bb3bf3c6cfb4fa27879f4fa72087a150c6a5 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@deluan.com>
Date: Fri, 21 Feb 2020 09:36:29 -0500
Subject: [PATCH] refactor: move cache constructor

---
 engine/media_streamer.go | 13 +++++++++++++
 engine/wire_providers.go | 17 -----------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/engine/media_streamer.go b/engine/media_streamer.go
index ccfe255e7..ae0ad40b6 100644
--- a/engine/media_streamer.go
+++ b/engine/media_streamer.go
@@ -6,10 +6,12 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
 	"github.com/deluan/navidrome/conf"
+	"github.com/deluan/navidrome/consts"
 	"github.com/deluan/navidrome/engine/ffmpeg"
 	"github.com/deluan/navidrome/log"
 	"github.com/deluan/navidrome/model"
@@ -171,3 +173,14 @@ func (fi *streamHandlerFileInfo) Size() int64        { return fi.f.size }
 func (fi *streamHandlerFileInfo) Mode() os.FileMode  { return os.FileMode(0777) }
 func (fi *streamHandlerFileInfo) IsDir() bool        { return false }
 func (fi *streamHandlerFileInfo) Sys() interface{}   { return nil }
+
+func NewTranscodingCache() (fscache.Cache, error) {
+	lru := fscache.NewLRUHaunter(0, conf.Server.MaxTranscodingCacheSize, 10*time.Minute)
+	h := fscache.NewLRUHaunterStrategy(lru)
+	cacheFolder := filepath.Join(conf.Server.DataFolder, consts.CacheDir)
+	fs, err := fscache.NewFs(cacheFolder, 0755)
+	if err != nil {
+		return nil, err
+	}
+	return fscache.NewCacheWithHaunter(fs, h)
+}
diff --git a/engine/wire_providers.go b/engine/wire_providers.go
index 24220fc43..5bb1f5197 100644
--- a/engine/wire_providers.go
+++ b/engine/wire_providers.go
@@ -1,14 +1,8 @@
 package engine
 
 import (
-	"path/filepath"
-	"time"
-
-	"github.com/deluan/navidrome/conf"
-	"github.com/deluan/navidrome/consts"
 	"github.com/deluan/navidrome/engine/ffmpeg"
 	"github.com/google/wire"
-	"gopkg.in/djherbis/fscache.v0"
 )
 
 var Set = wire.NewSet(
@@ -25,14 +19,3 @@ var Set = wire.NewSet(
 	ffmpeg.New,
 	NewTranscodingCache,
 )
-
-func NewTranscodingCache() (fscache.Cache, error) {
-	lru := fscache.NewLRUHaunter(0, conf.Server.MaxTranscodingCacheSize, 10*time.Minute)
-	h := fscache.NewLRUHaunterStrategy(lru)
-	cacheFolder := filepath.Join(conf.Server.DataFolder, consts.CacheDir)
-	fs, err := fscache.NewFs(cacheFolder, 0755)
-	if err != nil {
-		return nil, err
-	}
-	return fscache.NewCacheWithHaunter(fs, h)
-}