mirror of
https://github.com/navidrome/navidrome.git
synced 2026-07-09 17:18:45 +00:00
Some checks are pending
Pipeline: Test, Lint, Build / Get version info (push) Waiting to run
Pipeline: Test, Lint, Build / Lint Go code (push) Waiting to run
Pipeline: Test, Lint, Build / Test Go code (push) Waiting to run
Pipeline: Test, Lint, Build / Test Go code (Windows) (push) Waiting to run
Pipeline: Test, Lint, Build / Test JS code (push) Waiting to run
Pipeline: Test, Lint, Build / Lint i18n files (push) Waiting to run
Pipeline: Test, Lint, Build / Check Docker configuration (push) Waiting to run
Pipeline: Test, Lint, Build / Build (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-1 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-2 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-3 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-4 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-5 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-6 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-7 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-8 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-9 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build-10 (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Push to GHCR (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Push to Docker Hub (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Cleanup digest artifacts (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Build Windows installers (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Package/Release (push) Blocked by required conditions
Pipeline: Test, Lint, Build / Upload Linux PKG (push) Blocked by required conditions
* refactor(agents): drop single Artist fields from Song, keep only Artists Song now represents credited artists solely via the Artists slice; the single Artist/ArtistMBID fields and the ArtistList passthrough are removed. Equals continues to hash the whole value. * refactor(lastfm,listenbrainz): build Song.Artists in built-in agents Last.fm and ListenBrainz now populate the Artists slice directly. For ListenBrainz top songs, all credited artist MBIDs are mapped (the combined display name on the first credit plus MBID-only collaborators) instead of keeping only the first MBID, feeding the matcher's per-MBID specificity. * refactor(external): set Song.Artists in top-songs enrichment getMatchingTopSongs now seeds an Artists entry from the known artist when a song carries none, replacing the single Artist/ArtistMBID writes. * refactor(plugins): fold single-artist SongRef into Song.Artists SongRef keeps its single Artist/ArtistMBID fields as part of the plugin wire contract; songRefToAgentSong now folds them into a one-element Artists list when a plugin sends no artists array. * refactor(matcher): read Song.Artists directly groupQueries consumes s.Artists now that ArtistList is gone; test inputs build the Artists slice. * fix(matcher): keep MBID-only artists as identity signals Review follow-up: an artist credited only by MBID (empty ID and name) was dropped before resolution in four places, defeating the multi-MBID matching path this PR adds. - matcher.groupQueries: treat a non-empty MBID as a usable artist signal - external.getMatchingTopSongs: backfill the primary credit's name/MBID when the agent left them empty - plugins.songRefToAgentSong: fold a single-artist SongRef when only ArtistMBID is set (not just when Artist name is set) - listenbrainz.topSongArtists: return nil instead of an empty-name placeholder when neither name nor MBIDs are present * fix(external): only backfill top-song artist onto an unnamed credit Review follow-up (codex P2): the previous backfill stamped the queried artist's MBID onto Artists[0] whenever it was empty, even when that credit already named a different (e.g. featured) artist — producing a mismatched name+MBID pair that could mis-rank matches. Now only an unnamed first credit is filled (it is, by construction, the queried artist); an already-named credit is left untouched. Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Deluan <deluan@navidrome.org>
135 lines
3.7 KiB
Go
135 lines
3.7 KiB
Go
package agents
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
|
|
"github.com/gohugoio/hashstructure"
|
|
"github.com/navidrome/navidrome/model"
|
|
)
|
|
|
|
type Constructor func(ds model.DataStore) Interface
|
|
|
|
type Interface interface {
|
|
AgentName() string
|
|
}
|
|
|
|
// AlbumInfo contains album metadata (no images)
|
|
type AlbumInfo struct {
|
|
Name string
|
|
MBID string
|
|
Description string
|
|
URL string
|
|
}
|
|
|
|
type Artist struct {
|
|
ID string
|
|
Name string
|
|
MBID string
|
|
}
|
|
|
|
type ExternalImage struct {
|
|
URL string
|
|
Size int
|
|
}
|
|
|
|
type Song struct {
|
|
ID string
|
|
Name string
|
|
MBID string
|
|
ISRC string
|
|
Artists []Artist
|
|
Album string
|
|
AlbumMBID string
|
|
Duration uint32 // Duration in milliseconds, 0 means unknown
|
|
}
|
|
|
|
// Equals reports strict whole-value equality, used to dedup identical input songs. It hashes
|
|
// rather than comparing with ==, which the Artists slice makes illegal.
|
|
func (s Song) Equals(other Song) bool {
|
|
h1, _ := hashstructure.Hash(s, nil)
|
|
h2, _ := hashstructure.Hash(other, nil)
|
|
return h1 == h2
|
|
}
|
|
|
|
var (
|
|
ErrNotFound = errors.New("not found")
|
|
)
|
|
|
|
// AlbumInfoRetriever provides album info (no images)
|
|
type AlbumInfoRetriever interface {
|
|
GetAlbumInfo(ctx context.Context, name, artist, mbid string) (*AlbumInfo, error)
|
|
}
|
|
|
|
// AlbumImageRetriever provides album images
|
|
type AlbumImageRetriever interface {
|
|
GetAlbumImages(ctx context.Context, name, artist, mbid string) ([]ExternalImage, error)
|
|
}
|
|
|
|
type ArtistMBIDRetriever interface {
|
|
GetArtistMBID(ctx context.Context, id string, name string) (string, error)
|
|
}
|
|
|
|
type ArtistURLRetriever interface {
|
|
GetArtistURL(ctx context.Context, id, name, mbid string) (string, error)
|
|
}
|
|
|
|
type ArtistBiographyRetriever interface {
|
|
GetArtistBiography(ctx context.Context, id, name, mbid string) (string, error)
|
|
}
|
|
|
|
type ArtistSimilarRetriever interface {
|
|
GetSimilarArtists(ctx context.Context, id, name, mbid string, limit int) ([]Artist, error)
|
|
}
|
|
|
|
type ArtistImageRetriever interface {
|
|
GetArtistImages(ctx context.Context, id, name, mbid string) ([]ExternalImage, error)
|
|
}
|
|
|
|
type ArtistTopSongsRetriever interface {
|
|
GetArtistTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]Song, error)
|
|
}
|
|
|
|
// SimilarSongsByTrackRetriever provides similar songs based on a specific track
|
|
type SimilarSongsByTrackRetriever interface {
|
|
// GetSimilarSongsByTrack returns songs similar to the given track.
|
|
// Parameters:
|
|
// - id: local mediafile ID
|
|
// - name: track title
|
|
// - artist: artist name
|
|
// - mbid: MusicBrainz recording ID (may be empty)
|
|
// - count: maximum number of results
|
|
GetSimilarSongsByTrack(ctx context.Context, id, name, artist, mbid string, count int) ([]Song, error)
|
|
}
|
|
|
|
// SimilarSongsByAlbumRetriever provides similar songs based on an album
|
|
type SimilarSongsByAlbumRetriever interface {
|
|
// GetSimilarSongsByAlbum returns songs similar to tracks on the given album.
|
|
// Parameters:
|
|
// - id: local album ID
|
|
// - name: album name
|
|
// - artist: album artist name
|
|
// - mbid: MusicBrainz release ID (may be empty)
|
|
// - count: maximum number of results
|
|
GetSimilarSongsByAlbum(ctx context.Context, id, name, artist, mbid string, count int) ([]Song, error)
|
|
}
|
|
|
|
// SimilarSongsByArtistRetriever provides similar songs based on an artist
|
|
type SimilarSongsByArtistRetriever interface {
|
|
// GetSimilarSongsByArtist returns songs similar to the artist's catalog.
|
|
// Parameters:
|
|
// - id: local artist ID
|
|
// - name: artist name
|
|
// - mbid: MusicBrainz artist ID (may be empty)
|
|
// - count: maximum number of results
|
|
GetSimilarSongsByArtist(ctx context.Context, id, name, mbid string, count int) ([]Song, error)
|
|
}
|
|
|
|
var Map map[string]Constructor
|
|
|
|
func Register(name string, init Constructor) {
|
|
if Map == nil {
|
|
Map = make(map[string]Constructor)
|
|
}
|
|
Map[name] = init
|
|
}
|