nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-08-31 07:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(artwork): address PR review bot feedback

Browse Source 
- don't record noResult for timed-out/cancelled computations (transient
  failures must not suppress retries for the same artwork version)
- bound the noResult negative cache at 25k entries
- use context.Background for the worker's root context
- add hash:"ignore" to Artist/Playlist blurhash fields for consistency
  with Album (inert today; neither struct is hashed)
This commit is contained in:
Deluan 2026-07-17 11:13:59 -04:00
parent 4d8b486dfd
commit 9ea4e22ea0
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/artwork/blurhash_updater.go
View File

@ -44,7 +44,7 @@ func (u *blurHashUpdater) Enqueue(artID model.ArtworkID, force bool) {
u.start.Do(func() { u.start.Do(func() {
// Playlist artwork readers require a user in the context. Like the cacheWarmer, the worker // Playlist artwork readers require a user in the context. Like the cacheWarmer, the worker
// lives for the rest of the process; lazy-starting keeps idle Artwork instances goroutine-free. // lives for the rest of the process; lazy-starting keeps idle Artwork instances goroutine-free.
go u.run(request.WithUser(context.TODO(), model.User{IsAdmin: true})) go u.run(request.WithUser(context.Background(), model.User{IsAdmin: true}))
}) })
u.mutex.Lock() u.mutex.Lock()
u.buffer[artID] = u.buffer[artID] || force u.buffer[artID] = u.buffer[artID] || force
@ -106,7 +106,10 @@ func (u *blurHashUpdater) process(ctx context.Context, artID model.ArtworkID, fo
hash, err := u.computeFromArtwork(ctx, artID) hash, err := u.computeFromArtwork(ctx, artID)
if err != nil || hash == "" { if err != nil || hash == "" {
log.Trace(ctx, "BlurHash: nothing to persist", "artID", artID, err) log.Trace(ctx, "BlurHash: nothing to persist", "artID", artID, err)
u.setNoResult(artID, version) // A timed-out/cancelled attempt is transient — don't suppress future retries for it.
if ctx.Err() == nil {
u.setNoResult(artID, version)
}
return return
} }
if err := u.persist(ctx, artID, hash, version); err != nil { if err := u.persist(ctx, artID, hash, version); err != nil {
@ -123,9 +126,16 @@ func (u *blurHashUpdater) lastNoResult(artID model.ArtworkID) (time.Time, bool)
return t, ok return t, ok
} }
// maxNoResultEntries bounds the negative cache; entries only accumulate for artwork-less entities,
// so a wholesale reset just costs those entities one extra verification pass each.
const maxNoResultEntries = 25_000
func (u *blurHashUpdater) setNoResult(artID model.ArtworkID, version time.Time) { func (u *blurHashUpdater) setNoResult(artID model.ArtworkID, version time.Time) {
u.mutex.Lock() u.mutex.Lock()
defer u.mutex.Unlock() defer u.mutex.Unlock()
if len(u.noResult) >= maxNoResultEntries {
clear(u.noResult)
}
u.noResult[artID] = version u.noResult[artID] = version
} }

4
model/artist.go
View File

@ -42,8 +42,8 @@ type Artist struct {
CreatedAt *time.Time `structs:"created_at" json:"createdAt,omitempty"` CreatedAt *time.Time `structs:"created_at" json:"createdAt,omitempty"`
UpdatedAt *time.Time `structs:"updated_at" json:"updatedAt,omitempty"` UpdatedAt *time.Time `structs:"updated_at" json:"updatedAt,omitempty"`
BlurHash string `structs:"blur_hash" json:"blurHash,omitempty"` BlurHash string `structs:"blur_hash" json:"blurHash,omitempty" hash:"ignore"`
BlurHashUpdatedAt *time.Time `structs:"blur_hash_updated_at" json:"-"` BlurHashUpdatedAt *time.Time `structs:"blur_hash_updated_at" json:"-" hash:"ignore"`
} }
type ArtistStats struct { type ArtistStats struct {

4
model/playlist.go
View File

@ -31,8 +31,8 @@ type Playlist struct {
CreatedAt time.Time `structs:"created_at" json:"createdAt"` CreatedAt time.Time `structs:"created_at" json:"createdAt"`
UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"` UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"`
BlurHash string `structs:"blur_hash" json:"blurHash,omitempty"` BlurHash string `structs:"blur_hash" json:"blurHash,omitempty" hash:"ignore"`
BlurHashUpdatedAt *time.Time `structs:"blur_hash_updated_at" json:"-"` BlurHashUpdatedAt *time.Time `structs:"blur_hash_updated_at" json:"-" hash:"ignore"`
// SmartPlaylist attributes // SmartPlaylist attributes
Rules *criteria.Criteria `structs:"rules" json:"rules"` Rules *criteria.Criteria `structs:"rules" json:"rules"`