mirror of
https://github.com/navidrome/navidrome.git
synced 2026-10-12 12:27:09 +02:00
* refactor(persistence): adopt generic deluan/rest repository API Pin deluan/rest to the refactor branch. REST-facing repository methods take a context and return typed values. Drop DataStore.Resource and ResourceRepository; the native API names typed repositories directly through a per-request adapter that later commits remove. * refactor(persistence): base repository helpers take a context * refactor(persistence): LibraryRepository takes a context per call * refactor(persistence): PropertyRepository takes a context per call * refactor(persistence): UserPropsRepository takes a context per call * refactor(persistence): TranscodingRepository takes a context per call * refactor(persistence): ShareRepository takes a context per call * refactor(persistence): PlayerRepository takes a context per call * refactor(persistence): RadioRepository takes a context per call * refactor(persistence): PlayQueueRepository takes a context per call * refactor(persistence): Tag and Genre repositories take a context per call * refactor(persistence): PluginRepository takes a context per call * refactor(persistence): Scrobble repositories take a context per call * refactor(persistence): FolderRepository takes a context per call * refactor(persistence): Artwork repositories take a context per call * refactor(persistence): UserRepository takes a context per call * refactor(persistence): ArtistRepository takes a context per call ReadAll no longer rewrites the shared sort mappings for the role filter; it works on a per-call copy. * test(persistence): assert artist role sort sanitization in ReadAll * refactor(persistence): AlbumRepository takes a context per call * test(persistence): pass the test context to album repository helpers * refactor(persistence): MediaFileRepository takes a context per call * refactor(persistence): Playlist repositories take a context per call * refactor(persistence): build all repositories once per store * refactor(core): REST repository wrappers are built once * refactor(persistence): repositories are stateless Remove the context field from the base repository and the per-request REST adapter. Enable the containedctx linter so no repository can hold a request context again. * chore(lint): skip containedctx in test files * refactor: share simplifications from the stateless repositories sweep Add deleteOwnedAll on sqlRepository and use it in player/share Delete to remove the duplicated bulk-delete loop; have Share.Repository() return model.ShareRepository so subsonic sharing.go drops its repeated type assertions. * chore(core): assert REST wrappers implement Persistable * chore: reformat imports * perf(persistence): build repositories on first use Each transaction store used to construct all 21 repositories up front, paying for filter and sort mapping setup the block never touched. Fields are now sync.OnceValue thunks, so a store only builds what it uses. * fix(persistence): clean plugin references per deleted user A bulk user delete that fails on a later id had already removed the earlier rows but skipped their plugin cleanup. Cleanup now runs right after each successful delete. * fix(core): unload disabled plugins even when a user delete fails A bulk delete can fail on a later id after earlier users were removed and their plugins auto-disabled. The wrapper returned before unloading, leaving those plugins running until the next successful delete or a restart. * chore(deps): pin deluan/rest to v1.0.1 Replaces the pseudo-version of the refactor branch with the tagged release. REST error messages now name the bare type (Artist, not model.Artist). * test: use the spec context instead of context.Background() Replace the context.Background()/context.TODO() calls this branch added to tests with the spec's ctx, GinkgoT().Context(), or t/b.Context(), so repository calls are bound to the running spec's lifetime. * test: declare the spec context once per Describe Set ctx from GinkgoT().Context() first in each top-level BeforeEach and reuse it, building user contexts on top of it instead of repeating inline calls.
173 lines
6.4 KiB
Go
173 lines
6.4 KiB
Go
package artwork
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"slices"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/navidrome/navidrome/conf"
|
|
"github.com/navidrome/navidrome/consts"
|
|
"github.com/navidrome/navidrome/log"
|
|
"github.com/navidrome/navidrome/model"
|
|
"github.com/navidrome/navidrome/utils/slice"
|
|
"github.com/zeebo/xxh3"
|
|
)
|
|
|
|
// ReprocessKinds omits media files: they resolve embedded-only, at scan or on view. Artists lead
|
|
// so bulk enqueues give the most external-dependent kind a queue headstart.
|
|
var ReprocessKinds = []model.Kind{
|
|
model.KindArtistArtwork, model.KindAlbumArtwork, model.KindPlaylistArtwork, model.KindRadioArtwork,
|
|
}
|
|
|
|
// KeepsState reports whether a kind is recorded in item_artwork and the artwork queue. Disc
|
|
// artwork is read through on every request and cached by content key, so it has neither.
|
|
func KeepsState(kind model.Kind) bool { return kind != model.KindDiscArtwork }
|
|
|
|
// RefreshableKinds is every kind Refresh can clear and re-queue, so it holds exactly the kinds
|
|
// KeepsState admits. Media files are absent from ReprocessKinds but belong here: the worker
|
|
// resolves them, it just never enumerates them in bulk.
|
|
var RefreshableKinds = append(slices.Clone(ReprocessKinds), model.KindMediaFileArtwork)
|
|
|
|
// settlesAbsentOnGiveUp reports whether an exhausted retry budget records an absent state. Media
|
|
// files are excluded because retrying one costs nothing: they resolve embedded-only, from a local
|
|
// read, and only a view ever enqueues them.
|
|
func settlesAbsentOnGiveUp(prefix string) bool {
|
|
kind, ok := model.ParseKind(prefix)
|
|
return ok && KeepsState(kind) && kind != model.KindMediaFileArtwork
|
|
}
|
|
|
|
// artworkEpoch invalidates all resolution state when bumped; bump it whenever resolution semantics change.
|
|
const artworkEpoch = 1
|
|
|
|
// FingerprintInput is one config value the fingerprint covers, named after the setting it came from.
|
|
type FingerprintInput struct {
|
|
Name string
|
|
Value string
|
|
}
|
|
|
|
// FingerprintInputs is the single listing of what ConfigFingerprint hashes.
|
|
func FingerprintInputs() []FingerprintInput {
|
|
return []FingerprintInput{
|
|
{"CoverArtPriority", conf.Server.CoverArtPriority},
|
|
{"ArtistArtPriority", conf.Server.ArtistArtPriority},
|
|
{"ArtistImageFolder", conf.Server.ArtistImageFolder},
|
|
{"Agents", conf.Server.Agents},
|
|
{"EnableExternalServices", strconv.FormatBool(conf.Server.EnableExternalServices)},
|
|
{"EnableM3UExternalAlbumArt", strconv.FormatBool(conf.Server.EnableM3UExternalAlbumArt)},
|
|
}
|
|
}
|
|
|
|
// ConfigFingerprint covers the inputs that affect resolution outcomes; a change invalidates stored state.
|
|
func ConfigFingerprint() string {
|
|
values := slice.Map(FingerprintInputs(), func(i FingerprintInput) string { return i.Value })
|
|
raw := fmt.Sprintf("%s|%d", strings.Join(values, "|"), artworkEpoch)
|
|
return fmt.Sprintf("%016x", xxh3.Hash([]byte(raw)))
|
|
}
|
|
|
|
// ReconcileConfigFingerprint warns when the artwork config changed since the library was last
|
|
// resolved under it. Nothing re-resolves on its own; applying a change is an explicit reprocess.
|
|
func ReconcileConfigFingerprint(ctx context.Context, ds model.DataStore) error {
|
|
current := ConfigFingerprint()
|
|
stored, err := ds.Property().DefaultGet(ctx, consts.ArtConfFingerprintPropertyKey, "")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
switch stored {
|
|
case current:
|
|
case "":
|
|
// An unset fingerprint counts as current; the alternative warns every upgrading install once.
|
|
return MarkConfigApplied(ctx, ds)
|
|
default:
|
|
log.Warn(ctx, "Artwork: Config changed since the last full reprocess. Stored artwork keeps "+
|
|
"the old resolution; run 'navidrome artwork reprocess --all' to apply the change",
|
|
"stored", stored, "current", current, "inputs", FingerprintInputs())
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// MarkConfigApplied records the current fingerprint as the one the library is resolved under.
|
|
func MarkConfigApplied(ctx context.Context, ds model.DataStore) error {
|
|
return ds.Property().Put(ctx, consts.ArtConfFingerprintPropertyKey, ConfigFingerprint())
|
|
}
|
|
|
|
// enqueueMissingAll is the safety net for entities a scan never enqueued (added between scans, or scanner off).
|
|
func enqueueMissingAll(ctx context.Context, ds model.DataStore) error {
|
|
queue := ds.ArtworkQueue()
|
|
for _, kind := range ReprocessKinds {
|
|
if _, err := queue.EnqueueAllMissing(ctx, kind, model.ArtworkPriorityRecheck); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ItemName resolves a kind+id to the entity's display name, and errors when the item
|
|
// does not exist. Callers use it to reject ids that would otherwise orphan a queue row.
|
|
func ItemName(ctx context.Context, ds model.DataStore, kind model.Kind, id string) (string, error) {
|
|
switch kind {
|
|
case model.KindArtistArtwork:
|
|
ar, err := ds.Artist().Get(ctx, id)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return ar.Name, nil
|
|
case model.KindAlbumArtwork:
|
|
al, err := ds.Album().Get(ctx, id)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return al.Name, nil
|
|
case model.KindPlaylistArtwork:
|
|
pls, err := ds.Playlist().Get(ctx, id)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return pls.Name, nil
|
|
case model.KindRadioArtwork:
|
|
rd, err := ds.Radio().Get(ctx, id)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return rd.Name, nil
|
|
case model.KindMediaFileArtwork:
|
|
mf, err := ds.MediaFile().Get(ctx, id)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return mf.Title, nil
|
|
case model.KindDiscArtwork:
|
|
return discArtworkName(ctx, ds, id)
|
|
}
|
|
return "", fmt.Errorf("unsupported kind %q", kind.Prefix())
|
|
}
|
|
|
|
func discArtworkName(ctx context.Context, ds model.DataStore, id string) (string, error) {
|
|
albumID, discNumber, err := model.ParseDiscArtworkID(id)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
al, err := ds.Album().Get(ctx, albumID)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
name := fmt.Sprintf("%s (disc %d)", al.Name, discNumber)
|
|
// The subtitle is itself a DiscArtPriority candidate, so name it where the chain can be read against it.
|
|
if subtitle := strings.TrimSpace(al.Discs[discNumber]); subtitle != "" {
|
|
name += ": " + subtitle
|
|
}
|
|
return name, nil
|
|
}
|
|
|
|
// Refresh drops an item's resolved artwork state and re-queues it at Bump priority.
|
|
func Refresh(ctx context.Context, ds model.DataStore, kind model.Kind, id string) error {
|
|
if err := ds.Artwork().DeleteForItems(ctx, kind, []string{id}); err != nil {
|
|
return fmt.Errorf("clearing artwork state: %w", err)
|
|
}
|
|
item := model.ArtworkQueueItem{ItemKind: kind.Prefix(), ItemID: id, ImageType: model.ImageTypePrimary, Priority: model.ArtworkPriorityBump}
|
|
if err := ds.ArtworkQueue().Enqueue(ctx, item); err != nil {
|
|
return fmt.Errorf("enqueuing artwork refresh: %w", err)
|
|
}
|
|
return nil
|
|
}
|