mirror of
https://github.com/navidrome/navidrome.git
synced 2026-11-06 18:28:39 +01:00
* feat(matcher): add Song.Artists (agents.Artist) and field-wise song dedup
* refactor(matcher): make song equality an agents.Song.Equals method via hashstructure
Move the sameSong free function from core/matcher into an Equals method on
agents.Song, following the model.MediaFile/Album.Equals convention. Uses strict
hashstructure hashing (nil opts, no IgnoreZeroValue) to preserve the original
whole-value equality contract. Tests moved to core/agents.
* feat(matcher): match by multiple artists with overlap ranking and artist-ID fast-path
* refactor(matcher): rank artist overlap and specificity above the preferred-track flag
Identity signals (specificityLevel, artistOverlap) now outrank the taste
signal (preferredMatch) in betterThan. A starred/4-star track that is a worse
identity match no longer beats a more specific or higher-overlap track.
PreferStarred still breaks ties when specificity and overlap are equal.
* fix(matcher): score artist-MBID specificity against all credited artists, not just the last
sanitizedTrack.artistMBID (string) replaced with artistMBIDs (map[string]struct{}) so
bucketTracks collects all credited owned MBIDs per query instead of last-write-wins.
computeSpecificityLevel tests set membership, letting each of a collaboration's
MBID-bearing artists reach the proper specificity level (4/5) independently.
* feat(plugins): carry multiple artists (with IDs) through SongRef conversions
* feat(plugins): regenerate schemas and PDK wrappers for multi-artist SongRef
* refactor(matcher): tidy bucketTracks accumulator and artist resolution
Replace bucketTracks' two parallel per-track maps (overlapByQuery/mbidsByQuery)
with a named queryAccum struct (F2). Collapse resolveArtists' four hand-mutated
parallel maps into a pendingArtist slice with derived nameToQueries/mbidToQueries
maps (F1). Replace the own() method on resolvedArtists with a package-level
addToSet helper that drops the method/receiver indirection (F3).
* docs(matcher): trim comments that restate the code
* fix(plugins): use Vec::is_empty for slice fields in generated Rust PDK
* fix(matcher): treat a resolved artist ID as an identity match for specificity
* docs(matcher): reflect artist-ID identity in the specificity ladder
148 lines
4.1 KiB
Go
148 lines
4.1 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
|
|
Artist string
|
|
ArtistMBID string
|
|
Artists []Artist // optional full artist list; ArtistList normalizes against Artist/ArtistMBID
|
|
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
|
|
}
|
|
|
|
// ArtistList normalizes the single/multi-artist representations so callers never branch on len(Artists).
|
|
func (s Song) ArtistList() []Artist {
|
|
if len(s.Artists) > 0 {
|
|
return s.Artists
|
|
}
|
|
if s.Artist != "" {
|
|
return []Artist{{Name: s.Artist, MBID: s.ArtistMBID}}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
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
|
|
}
|