Move utilitarian/generic packages to utils: lastfm, spotify, gravatar, cache, and pool

core/agents/lastfm.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/lastfm"
 	"github.com/navidrome/navidrome/log"
+	"github.com/navidrome/navidrome/utils/lastfm"
 )
 
 const lastFMAgentName = "lastfm"

core/agents/spotify.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/spotify"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
+	"github.com/navidrome/navidrome/utils/spotify"
 	"github.com/xrash/smetrics"
 )
 

core/artwork.go

@@ -20,11 +20,11 @@ import (
 	"github.com/disintegration/imaging"
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/cache"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/resources"
 	"github.com/navidrome/navidrome/utils"
+	"github.com/navidrome/navidrome/utils/cache"
 	_ "golang.org/x/image/webp"
 )
 

core/cache_warmer.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/navidrome/navidrome/conf"
-	"github.com/navidrome/navidrome/core/pool"
 	"github.com/navidrome/navidrome/log"
+	"github.com/navidrome/navidrome/utils/pool"
 )
 
 type CacheWarmer interface {

core/media_streamer.go

@@ -11,11 +11,11 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
-	"github.com/navidrome/navidrome/core/cache"
 	"github.com/navidrome/navidrome/core/transcoder"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
+	"github.com/navidrome/navidrome/utils/cache"
 )
 
 type MediaStreamer interface {

server/app/auth.go

@@ -17,10 +17,10 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core/auth"
-	"github.com/navidrome/navidrome/core/gravatar"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
+	"github.com/navidrome/navidrome/utils/gravatar"
 )
 
 var (

server/subsonic/media_retrieval.go

@@ -7,12 +7,12 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core"
-	"github.com/navidrome/navidrome/core/gravatar"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/resources"
 	"github.com/navidrome/navidrome/server/subsonic/responses"
 	"github.com/navidrome/navidrome/utils"
+	"github.com/navidrome/navidrome/utils/gravatar"
 )
 
 type MediaRetrievalController struct {

utils/gravatar/gravatar_test.go

@@ -3,9 +3,9 @@ package gravatar_test
 import (
 	"testing"
 
-	"github.com/navidrome/navidrome/core/gravatar"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
+	"github.com/navidrome/navidrome/utils/gravatar"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )