mirror of
https://github.com/navidrome/navidrome.git
synced 2026-08-31 07:30:32 +00:00
* refactor(artwork): move artworkItemName into core/artwork as ItemName * feat(external): add RefreshInfo to force an external info refresh RefreshInfo re-fetches and re-saves external info for one artist or album, bypassing the TTL check that UpdateArtistInfo/UpdateAlbumInfo use. It is synchronous; callers that must not block detach it themselves. Also makes MockArtistRepo/MockAlbumRepo.UpdateExternalInfo persist to Data (previously a no-op) and adds the new method to the e2e noopProvider, both required so the interface addition compiles and is observable in tests. * feat(external): broadcast RefreshResource after external info is saved populateArtistInfo and populateAlbumInfo now emit the same RefreshResource event the artwork worker uses, so the UI learns about both foreground and background metadata refreshes. * feat(nativeapi): replace artwork refresh endpoint with metadata refresh * feat(ui): add refreshMetadata to the data provider * feat(ui): add a Refresh Metadata item to the album and artist context menus * fix(ui): re-fetch artist info when the record is refreshed * test: fix mislabeled spec, add kind-gate negative case, guard nil mock maps - Rename the RefreshInfo spec that claimed to cover the save-failure/broadcast path: SetError(true) fails Get too, so it only proves RefreshInfo bails out early at getArtist. - Add a spec proving playlist refreshes skip the external-info step, since that asymmetry (al/ar only) was documented but unasserted. - Add lazy nil-map init to MockAlbumRepo/MockArtistRepo.UpdateExternalInfo so a composite-literal-constructed mock doesn't panic on first save. * test: relocate discArtworkName specs from cmd to core/artwork artworkItemName moved into core/artwork as ItemName in an earlier commit, but its disc-name specs stayed behind in cmd/artwork_test.go, reaching across packages. Move them to core/artwork/item_name_test.go where the code now lives. * fix(ui): shape refreshMetadata like a react-admin response react-admin validates custom dataProvider methods and rejects any response without a `data` key, so the raw httpClient promise made every click surface an error toast instead of the success message. The unit test mocked useDataProvider, which skips that validation. Also folds "which kinds have external info" into external.HasInfo so the handler stops restating it, drops the nil-broker guard that only existed for tests, and delegates the mocks' UpdateExternalInfo to Put. * refactor(external): unexport infoKinds Only HasInfo is used outside the package, so the slice itself does not need to be exported. * refactor(artwork): fold ItemName into housekeeping.go next to Refresh ItemName exists to guard Refresh from ids that would orphan a queue row, and both callers invoke them back to back. A separate file hid that pairing; it was only split out to keep the move out of cmd/ legible in review. * fix(nativeapi): return 500 when the refresh lookup fails for a non-ErrNotFound reason A transient repository error told the admin the id did not exist, and the error was dropped without a log line, so nothing pointed at the real cause. Also drops the inherited claim that clearing artwork state shows a placeholder. Reads fall back to local resolution, so that only holds when there is no local art. * fix(ui): move Refresh Metadata above Get Info in the context menu Menu order follows key insertion order in the options object, so the new spec pins the position rather than leaving it to be shuffled by the next addition.
388 lines
14 KiB
Go
388 lines
14 KiB
Go
package artwork
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"slices"
|
|
"time"
|
|
|
|
"github.com/navidrome/navidrome/conf"
|
|
"github.com/navidrome/navidrome/conf/configtest"
|
|
"github.com/navidrome/navidrome/consts"
|
|
"github.com/navidrome/navidrome/model"
|
|
"github.com/navidrome/navidrome/model/request"
|
|
"github.com/navidrome/navidrome/tests"
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
// visibilityPlaylistDS models playlist_repository's userFilter: a private playlist is only
|
|
// visible when the ctx carries an admin, so headless work must wrap ctx with one first.
|
|
type visibilityPlaylistDS struct {
|
|
*tests.MockDataStore
|
|
private model.Playlist
|
|
tracks model.PlaylistTrackRepository
|
|
}
|
|
|
|
func (v *visibilityPlaylistDS) Playlist(ctx context.Context) model.PlaylistRepository {
|
|
repo := tests.CreateMockPlaylistRepo()
|
|
repo.TracksRepo = v.tracks
|
|
if u, ok := request.UserFrom(ctx); ok && u.IsAdmin {
|
|
repo.SetData(model.Playlists{v.private})
|
|
}
|
|
return repo
|
|
}
|
|
|
|
func adminUserRepo() *tests.MockedUserRepo {
|
|
repo := tests.CreateMockUserRepo()
|
|
Expect(repo.Put(&model.User{ID: "admin", UserName: "admin", IsAdmin: true})).To(Succeed())
|
|
return repo
|
|
}
|
|
|
|
func noAgents() ImageAgentCount { return ImageAgentCount{} }
|
|
|
|
// orderTrackingQueueRepo records the item kind of each Enqueue call, so tests can
|
|
// assert phase ordering (artists-first) that same-priority timestamps can't guarantee.
|
|
type orderTrackingQueueRepo struct {
|
|
*tests.MockArtworkQueueRepo
|
|
callKinds []string
|
|
}
|
|
|
|
func (o *orderTrackingQueueRepo) Enqueue(items ...model.ArtworkQueueItem) error {
|
|
if len(items) > 0 {
|
|
o.callKinds = append(o.callKinds, items[0].ItemKind)
|
|
}
|
|
return o.MockArtworkQueueRepo.Enqueue(items...)
|
|
}
|
|
|
|
var _ = Describe("RefreshableKinds", func() {
|
|
// The two are meant to describe the same fact. Nothing but this test stops them from drifting,
|
|
// and a drift would have `artwork explain` report state for a kind that keeps none.
|
|
It("holds exactly the kinds that keep state", func() {
|
|
for _, k := range []model.Kind{
|
|
model.KindArtistArtwork, model.KindAlbumArtwork, model.KindPlaylistArtwork,
|
|
model.KindRadioArtwork, model.KindMediaFileArtwork, model.KindDiscArtwork,
|
|
} {
|
|
Expect(slices.Contains(RefreshableKinds, k)).To(Equal(KeepsState(k)), k.String())
|
|
}
|
|
})
|
|
})
|
|
|
|
var _ = Describe("Housekeeping", func() {
|
|
var (
|
|
ctx context.Context
|
|
ds *tests.MockDataStore
|
|
queueRepo *orderTrackingQueueRepo
|
|
propRepo *tests.MockedPropertyRepo
|
|
)
|
|
|
|
BeforeEach(func() {
|
|
DeferCleanup(configtest.SetupConfig())
|
|
ctx = context.Background()
|
|
conf.Server.CoverArtPriority = "embedded, folder"
|
|
conf.Server.ArtistArtPriority = "artist.jpg"
|
|
conf.Server.Agents = "spotify"
|
|
conf.Server.EnableExternalServices = true
|
|
|
|
queueRepo = &orderTrackingQueueRepo{MockArtworkQueueRepo: tests.CreateMockArtworkQueueRepo()}
|
|
propRepo = &tests.MockedPropertyRepo{}
|
|
ds = &tests.MockDataStore{MockedArtworkQueue: queueRepo, MockedProperty: propRepo}
|
|
})
|
|
|
|
seedEntities := func() {
|
|
artistRepo := tests.CreateMockArtistRepo()
|
|
artistRepo.SetData(model.Artists{{ID: "ar1"}, {ID: "ar2"}})
|
|
ds.MockedArtist = artistRepo
|
|
|
|
albumRepo := tests.CreateMockAlbumRepo()
|
|
albumRepo.SetData(model.Albums{{ID: "al1"}})
|
|
ds.MockedAlbum = albumRepo
|
|
|
|
playlistRepo := tests.CreateMockPlaylistRepo()
|
|
playlistRepo.SetData(model.Playlists{{ID: "pl1"}})
|
|
ds.MockedPlaylist = playlistRepo
|
|
|
|
radioRepo := tests.CreateMockedRadioRepo()
|
|
radioRepo.All = model.Radios{{ID: "ra1"}}
|
|
ds.MockedRadio = radioRepo
|
|
}
|
|
|
|
Describe("Fingerprint", func() {
|
|
It("changes when a fingerprint-affecting config value changes", func() {
|
|
f1 := ConfigFingerprint()
|
|
conf.Server.CoverArtPriority = "folder, embedded"
|
|
f2 := ConfigFingerprint()
|
|
Expect(f1).NotTo(Equal(f2))
|
|
})
|
|
|
|
It("changes when ArtistImageFolder changes", func() {
|
|
conf.Server.ArtistImageFolder = "/before"
|
|
f1 := ConfigFingerprint()
|
|
conf.Server.ArtistImageFolder = "/after"
|
|
Expect(ConfigFingerprint()).NotTo(Equal(f1))
|
|
})
|
|
|
|
It("changes when EnableM3UExternalAlbumArt is toggled", func() {
|
|
conf.Server.EnableM3UExternalAlbumArt = false
|
|
f1 := ConfigFingerprint()
|
|
conf.Server.EnableM3UExternalAlbumArt = true
|
|
Expect(ConfigFingerprint()).NotTo(Equal(f1))
|
|
})
|
|
|
|
// Pinned: a changed formula re-resolves every library on upgrade, flooding external providers.
|
|
It("hashes a given config to a stable value", func() {
|
|
conf.Server.CoverArtPriority = "cover.*, embedded"
|
|
conf.Server.ArtistArtPriority = "artist.*, external"
|
|
conf.Server.ArtistImageFolder = ""
|
|
conf.Server.Agents = "lastfm,spotify"
|
|
conf.Server.EnableExternalServices = true
|
|
conf.Server.EnableM3UExternalAlbumArt = false
|
|
|
|
Expect(ConfigFingerprint()).To(Equal("7b538a83a870c16d"))
|
|
})
|
|
|
|
It("reports the config inputs it hashes, so a change can be traced to a setting", func() {
|
|
conf.Server.Agents = "lastfm,spotify"
|
|
conf.Server.CoverArtPriority = "cover.*, embedded"
|
|
|
|
Expect(FingerprintInputs()).To(ContainElements(
|
|
FingerprintInput{Name: "Agents", Value: "lastfm,spotify"},
|
|
FingerprintInput{Name: "CoverArtPriority", Value: "cover.*, embedded"},
|
|
))
|
|
})
|
|
|
|
It("does not change when the server version changes", func() {
|
|
original := consts.Version
|
|
DeferCleanup(func() { consts.Version = original })
|
|
f1 := ConfigFingerprint()
|
|
consts.Version = original + "-next"
|
|
Expect(ConfigFingerprint()).To(Equal(f1),
|
|
"the version must not invalidate artwork state: it would re-resolve every entity on every build")
|
|
})
|
|
})
|
|
|
|
Describe("Backfill", func() {
|
|
It("enqueues nothing and returns false when the stored fingerprint matches", func() {
|
|
seedEntities()
|
|
Expect(propRepo.Put(consts.ArtConfFingerprintPropertyKey, ConfigFingerprint())).To(Succeed())
|
|
|
|
counted := false
|
|
s, err := backfill(ctx, ds, func() ImageAgentCount {
|
|
counted = true
|
|
return ImageAgentCount{Artist: 3, Album: 2}
|
|
})
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(s).To(Equal(backfillSummary{}))
|
|
Expect(counted).To(BeFalse(), "building the agent list constructs every agent; an unchanged fingerprint must not pay for it")
|
|
|
|
count, err := queueRepo.Count()
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(count).To(BeZero())
|
|
})
|
|
|
|
It("runs the backfill when no fingerprint was ever stored", func() {
|
|
seedEntities()
|
|
|
|
s, err := backfill(ctx, ds, noAgents)
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(s.Ran).To(BeTrue())
|
|
|
|
count, err := queueRepo.Count()
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(count).To(Equal(int64(5))) // 2 artists + 1 album + 1 playlist + 1 radio
|
|
|
|
stored, err := propRepo.Get(consts.ArtConfFingerprintPropertyKey)
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(stored).To(Equal(ConfigFingerprint()))
|
|
})
|
|
|
|
It("enqueues a private playlist by resolving it under an admin context", func() {
|
|
ds.MockedUser = adminUserRepo()
|
|
vds := &visibilityPlaylistDS{
|
|
MockDataStore: ds,
|
|
private: model.Playlist{ID: "plPrivate", OwnerID: "admin"},
|
|
tracks: &tests.MockPlaylistTrackRepo{},
|
|
}
|
|
|
|
s, err := backfill(ctx, vds, noAgents)
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(s.Ran).To(BeTrue())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "pl", "plPrivate")).ToNot(BeNil())
|
|
})
|
|
|
|
It("enqueues artists before albums/playlists/radios, all at Backfill priority", func() {
|
|
seedEntities()
|
|
Expect(propRepo.Put(consts.ArtConfFingerprintPropertyKey, "stale-fingerprint")).To(Succeed())
|
|
|
|
s, err := backfill(ctx, ds, noAgents)
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(s.Ran).To(BeTrue())
|
|
|
|
Expect(queueRepo.callKinds).ToNot(BeEmpty())
|
|
firstOther := slices.IndexFunc(queueRepo.callKinds, func(k string) bool { return k != "ar" })
|
|
Expect(firstOther).ToNot(Equal(0), "artists must be the first Enqueue call")
|
|
if firstOther >= 0 {
|
|
Expect(queueRepo.callKinds[firstOther:]).ToNot(ContainElement("ar"),
|
|
"no artist Enqueue may follow another kind")
|
|
}
|
|
|
|
for _, it := range queueRepo.Data {
|
|
Expect(it.Priority).To(Equal(model.ArtworkPriorityBackfill))
|
|
Expect(it.ItemKind).To(BeElementOf("ar", "al", "pl", "ra"))
|
|
}
|
|
})
|
|
|
|
It("reports what it enqueued, per kind and as an external-lookup ceiling", func() {
|
|
conf.Server.ArtistArtPriority = "artist.*, external"
|
|
conf.Server.CoverArtPriority = "cover.*, external"
|
|
conf.Server.EnableM3UExternalAlbumArt = false
|
|
seedEntities()
|
|
|
|
s, err := backfill(ctx, ds, func() ImageAgentCount { return ImageAgentCount{Artist: 3, Album: 2} })
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(s.Ran).To(BeTrue())
|
|
|
|
Expect(s.PerKind).To(Equal(map[string]int64{"ar": 2, "al": 1, "pl": 1, "ra": 1}))
|
|
Expect(s.Items).To(Equal(int64(5)))
|
|
// 2 artists x 3 agents, 1 album x 2, 1 playlist grid x 2, and radios never fetch.
|
|
Expect(s.MaxExternalLookups).To(Equal(int64(6 + 2 + PlaylistGridSamples*2)))
|
|
})
|
|
})
|
|
|
|
Describe("EnqueueStaleAbsentAll", func() {
|
|
var artRepo *tests.MockArtworkRepo
|
|
|
|
BeforeEach(func() {
|
|
artRepo = tests.CreateMockArtworkRepo()
|
|
ds.MockedArtwork = artRepo
|
|
queueRepo.ItemArtworkSource = artRepo
|
|
})
|
|
|
|
It("enqueues only absent entries older than the recheck window, across all kinds", func() {
|
|
old := time.Now().Add(-StaleAbsentAge - time.Hour)
|
|
recent := time.Now().Add(-StaleAbsentAge + time.Hour)
|
|
|
|
artRepo.ItemData["ar-stale"] = model.ItemArtwork{ItemKind: "ar", ItemID: "ar1", ImageType: model.ImageTypePrimary, Hash: "", AttemptedAt: old}
|
|
artRepo.ItemData["al-stale"] = model.ItemArtwork{ItemKind: "al", ItemID: "al1", ImageType: model.ImageTypePrimary, Hash: "", AttemptedAt: old}
|
|
artRepo.ItemData["pl-stale"] = model.ItemArtwork{ItemKind: "pl", ItemID: "pl1", ImageType: model.ImageTypePrimary, Hash: "", AttemptedAt: old}
|
|
artRepo.ItemData["ra-stale"] = model.ItemArtwork{ItemKind: "ra", ItemID: "ra1", ImageType: model.ImageTypePrimary, Hash: "", AttemptedAt: old}
|
|
artRepo.ItemData["ar-recent"] = model.ItemArtwork{ItemKind: "ar", ItemID: "ar2", ImageType: model.ImageTypePrimary, Hash: "", AttemptedAt: recent}
|
|
artRepo.ItemData["al-resolved"] = model.ItemArtwork{ItemKind: "al", ItemID: "al2", ImageType: model.ImageTypePrimary, Hash: "somehash", AttemptedAt: old}
|
|
|
|
err := enqueueStaleAbsentAll(ctx, ds)
|
|
Expect(err).ToNot(HaveOccurred())
|
|
|
|
Expect(queueRepo.Data).To(HaveLen(4))
|
|
for _, it := range queueRepo.Data {
|
|
Expect(it.Priority).To(Equal(model.ArtworkPriorityRecheck))
|
|
}
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "ar", "ar1")).ToNot(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "al", "al1")).ToNot(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "pl", "pl1")).ToNot(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "ra", "ra1")).ToNot(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "ar", "ar2")).To(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "al", "al2")).To(BeNil())
|
|
})
|
|
|
|
It("caps each tick at the recheck batch, oldest attempts first", func() {
|
|
for i := range StaleAbsentRecheckBatch + 1 {
|
|
id := fmt.Sprintf("ar%d", i)
|
|
artRepo.ItemData[id] = model.ItemArtwork{ItemKind: "ar", ItemID: id, ImageType: model.ImageTypePrimary,
|
|
Hash: "", AttemptedAt: time.Now().Add(-StaleAbsentAge - time.Duration(i+1)*time.Minute)}
|
|
}
|
|
|
|
Expect(enqueueStaleAbsentAll(ctx, ds)).To(Succeed())
|
|
|
|
Expect(queueRepo.Data).To(HaveLen(StaleAbsentRecheckBatch))
|
|
// ar0 has the newest attempted_at of the cohort, so it is the one left out.
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "ar", "ar0")).To(BeNil())
|
|
})
|
|
})
|
|
|
|
Describe("EnqueueMissingAll", func() {
|
|
var artRepo *tests.MockArtworkRepo
|
|
|
|
BeforeEach(func() {
|
|
artRepo = tests.CreateMockArtworkRepo()
|
|
ds.MockedArtwork = artRepo
|
|
queueRepo.ItemArtworkSource = artRepo
|
|
queueRepo.ExistingIDs = map[string]map[string]bool{
|
|
"al": {"al1": true, "al2": true},
|
|
"ar": {"ar1": true},
|
|
"pl": {"pl1": true},
|
|
"ra": {"ra1": true},
|
|
}
|
|
})
|
|
|
|
It("enqueues only entities that have no item_artwork row, across all kinds", func() {
|
|
artRepo.ItemData["al-resolved"] = model.ItemArtwork{ItemKind: "al", ItemID: "al1", ImageType: model.ImageTypePrimary, Hash: "somehash", AttemptedAt: time.Now()}
|
|
artRepo.ItemData["ar-absent"] = model.ItemArtwork{ItemKind: "ar", ItemID: "ar1", ImageType: model.ImageTypePrimary, Hash: "", AttemptedAt: time.Now()}
|
|
|
|
err := enqueueMissingAll(ctx, ds)
|
|
Expect(err).ToNot(HaveOccurred())
|
|
|
|
for _, it := range queueRepo.Data {
|
|
Expect(it.Priority).To(Equal(model.ArtworkPriorityRecheck))
|
|
}
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "al", "al2")).ToNot(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "pl", "pl1")).ToNot(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "ra", "ra1")).ToNot(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "al", "al1")).To(BeNil())
|
|
Expect(findQueued(queueRepo.MockArtworkQueueRepo, "ar", "ar1")).To(BeNil())
|
|
})
|
|
})
|
|
})
|
|
|
|
var _ = Describe("ItemName", func() {
|
|
var ds *tests.MockDataStore
|
|
var ctx context.Context
|
|
|
|
BeforeEach(func() {
|
|
ctx = context.Background()
|
|
albumRepo := tests.CreateMockAlbumRepo()
|
|
albumRepo.SetData(model.Albums{
|
|
{ID: "al-1", Name: "Kid A"},
|
|
{ID: "al-2", Name: "Sandinista!", Discs: model.Discs{2: "Side Three"}},
|
|
})
|
|
ds = &tests.MockDataStore{MockedAlbum: albumRepo}
|
|
Expect(ds.Artist(ctx).(*tests.MockArtistRepo).Put(&model.Artist{ID: "ar-1", Name: "Radiohead"})).To(Succeed())
|
|
})
|
|
|
|
It("returns the album name", func() {
|
|
Expect(ItemName(ctx, ds, model.KindAlbumArtwork, "al-1")).To(Equal("Kid A"))
|
|
})
|
|
|
|
It("returns the artist name", func() {
|
|
Expect(ItemName(ctx, ds, model.KindArtistArtwork, "ar-1")).To(Equal("Radiohead"))
|
|
})
|
|
|
|
It("errors for an unknown album", func() {
|
|
_, err := ItemName(ctx, ds, model.KindAlbumArtwork, "nope")
|
|
Expect(err).To(MatchError(model.ErrNotFound))
|
|
})
|
|
|
|
It("errors for an unsupported kind", func() {
|
|
// model.Kind is a struct with unexported fields, so the zero value is the only
|
|
// unsupported Kind constructible from outside package model.
|
|
_, err := ItemName(ctx, ds, model.Kind{}, "al-1")
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
|
|
Context("disc artwork", func() {
|
|
It("names the album, the disc and its subtitle", func() {
|
|
Expect(ItemName(ctx, ds, model.KindDiscArtwork, "al-2:2")).
|
|
To(Equal("Sandinista! (disc 2): Side Three"))
|
|
})
|
|
|
|
It("omits the subtitle when the disc has none", func() {
|
|
Expect(ItemName(ctx, ds, model.KindDiscArtwork, "al-2:1")).
|
|
To(Equal("Sandinista! (disc 1)"))
|
|
})
|
|
|
|
It("rejects an id that is not <albumID>:<disc>", func() {
|
|
_, err := ItemName(ctx, ds, model.KindDiscArtwork, "al-2")
|
|
Expect(err).To(HaveOccurred())
|
|
})
|
|
})
|
|
})
|