Fix artwork resolution when paths contains :. Fix #2137

core/artwork/artwork_internal_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/conf/configtest"
+	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
@@ -34,7 +35,7 @@ var _ = Describe("Artwork", func() {
 		alOnlyExternal = model.Album{ID: "444", Name: "Only external", ImageFiles: "tests/fixtures/front.png"}
 		alExternalNotFound = model.Album{ID: "555", Name: "External not found", ImageFiles: "tests/fixtures/NON_EXISTENT.png"}
 		alMultipleCovers = model.Album{ID: "666", Name: "All options", EmbedArtPath: "tests/fixtures/test.mp3",
-			ImageFiles: "tests/fixtures/cover.jpg:tests/fixtures/front.png",
+			ImageFiles: "tests/fixtures/cover.jpg" + consts.Zwsp + "tests/fixtures/front.png",
 		}
 		mfWithEmbed = model.MediaFile{ID: "22", Path: "tests/fixtures/test.mp3", HasCoverArt: true, AlbumID: "222"}
 		mfWithoutEmbed = model.MediaFile{ID: "44", Path: "tests/fixtures/test.ogg", AlbumID: "444"}

core/artwork/reader_artist.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/conf"
+	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/core"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
@@ -49,12 +50,12 @@ func newArtistReader(ctx context.Context, artwork *artwork, artID model.ArtworkI
 	var paths []string
 	for _, al := range als {
 		files = append(files, al.ImageFiles)
-		paths = append(paths, filepath.SplitList(al.Paths)...)
+		paths = append(paths, splitList(al.Paths)...)
 		if a.cacheKey.lastUpdate.Before(al.UpdatedAt) {
 			a.cacheKey.lastUpdate = al.UpdatedAt
 		}
 	}
-	a.files = strings.Join(files, string(filepath.ListSeparator))
+	a.files = strings.Join(files, consts.Zwsp)
 	a.artistFolder = utils.LongestCommonPrefix(paths)
 	if !strings.HasSuffix(a.artistFolder, string(filepath.Separator)) {
 		a.artistFolder, _ = filepath.Split(a.artistFolder)

core/artwork/sources.go

@@ -52,9 +52,13 @@ func (f sourceFunc) String() string {
 	return name
 }
 
+func splitList(s string) []string {
+	return strings.Split(s, consts.Zwsp)
+}
+
 func fromExternalFile(ctx context.Context, files string, pattern string) sourceFunc {
 	return func() (io.ReadCloser, string, error) {
-		for _, file := range filepath.SplitList(files) {
+		for _, file := range splitList(files) {
 			_, name := filepath.Split(file)
 			match, err := filepath.Match(pattern, strings.ToLower(name))
 			if err != nil {