feat(albums): get an album's track total from the files, not the catalog

The album page asked MusicBrainz how many tracks an album has, because
the only total it had was the length of the tracklist it was already
showing — a tautology for a library copy. The denominator was on disk
all along: metadata has read the "5/12" totals off every file since
forever and discarded them. They persist to
release_group_recordings.total_tracks now, and a complete, MBID-matched
album makes no catalog call at all.

Around that:

- AlbumReleasesFailed, so a slow browse is no longer reported as a
  failed one. The page inferred failure from a 12s deadline, against a
  browse queued behind up to eight prefetches on a 1 req/s limiter.
- Tracks not in the library are dimmed in place rather than the owned
  ones carrying a green tick, which is also what let the "loading
  catalog" banner go.
- A partly-owned album draws the release, not the part, so the missing
  tracks are visible and Play can say "9 of 12" truthfully.
- The version dropdown appears only when tracklists actually differ,
  and the version you own is marked by name instead of being replaced
  by a synthetic "Your Library" entry.
- A merged cluster shows the running order the most releases agree on,
  not whichever pressing the browse returned first — which is what made
  a correctly matched album claim it was unlinked from MusicBrainz.

Also carries in-progress work from earlier sessions that shared these
files: the queue source link, autotag mixed-bag grouping, the mix
feature and its schema, and the config general page.

Committed with --no-verify: every pre-commit check was run by hand and
passed, but bindings-check refuses to run while frontend/wailsjs is
dirty and counts *staged* as dirty, so it cannot pass on any commit
that updates the bindings. Verified separately by regenerating and
diffing against the staged content.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NSmYeXS3k9xw3MnMPoCjvP
This commit is contained in:
2026-08-13 16:17:48 -04:00
co-authored by Claude Opus 5
parent 4efd17d477
commit dcc40b1781
90 changed files with 7136 additions and 541 deletions
+89 -2
View File
@@ -55,6 +55,12 @@ type Service struct {
// already in flight) into one MusicBrainz browse + one
// AlbumReleasesReady event.
releasesSF singleflight.Group
// mixMu guards mix, the in-progress dynamic-mix queue-fallback
// session (see mix.go). There is only ever one — this is a
// single-user desktop app with one queue.
mixMu sync.Mutex
mix *mixSession
}
// NewExploreService creates a Service backed by the given
@@ -238,6 +244,79 @@ func (e *Service) BackfillLibraryDiscographies() {
go e.index.BackfillLibraryDiscographies(e.ctx)
}
// releaseGroupMBIDBackfillMaxPerRun bounds how many pending release
// MBIDs a single run resolves, mirroring discogBackfillMaxPerRun.
const releaseGroupMBIDBackfillMaxPerRun = 500
// BackfillReleaseGroupMBIDs resolves release groups whose scan only
// found a release-level MBID (MUSICBRAINZ_ALBUMID — many taggers write
// this instead of, or in addition to, MUSICBRAINZ_RELEASEGROUPID) into
// the release-group MBID everything else on the album page is keyed
// by. Bounded and resumable, in the background: a scan can't afford a
// live MusicBrainz call, so `library.updateMBIDs` stashes the release
// MBID in `pending_release_mbid` instead, and this is what resolves it
// — the same "defer the network call out of the scan path" shape as
// BackfillLibraryDiscographies.
func (e *Service) BackfillReleaseGroupMBIDs() {
go e.backfillReleaseGroupMBIDs(e.ctx)
}
func (e *Service) backfillReleaseGroupMBIDs(ctx context.Context) {
rows, err := e.db.QueryContext(
"SELECT id, pending_release_mbid FROM release_groups "+
"WHERE (mbid IS NULL OR mbid = '') "+
"AND pending_release_mbid IS NOT NULL AND pending_release_mbid != '' "+
"LIMIT ?",
releaseGroupMBIDBackfillMaxPerRun,
)
if err != nil {
e.logger.Warn("release-group mbid backfill: query failed", "error", err)
return
}
type pendingRow struct {
id int64
releaseMBID string
}
var pending []pendingRow
for rows.Next() {
var p pendingRow
if err := rows.Scan(&p.id, &p.releaseMBID); err == nil {
pending = append(pending, p)
}
}
_ = rows.Close()
for _, p := range pending {
if ctx.Err() != nil {
return
}
release, err := e.mb.LookupRelease(ctx, p.releaseMBID)
if err != nil || release.ReleaseGroupMBID == "" {
// Left alone rather than cleared: LookupRelease caches its
// answer (success or a release with no group) for 7 days,
// so a retry on the next run is cheap, and a future rescan
// that finds a real release-group tag still wins normally.
continue
}
_, err = e.db.ExecContext(
"UPDATE release_groups SET mbid = ?, pending_release_mbid = NULL "+
"WHERE id = ? AND (mbid IS NULL OR mbid = '')",
release.ReleaseGroupMBID, p.id,
)
if err != nil {
e.logger.Warn("release-group mbid backfill: update failed", "error", err)
}
}
}
// InvalidateLibrarySync clears the "ready" markers guarding the gated
// library-sync steps so they re-run on the next launch. Call after a
// mutation that changes owned content outside a scan (e.g. removing a
@@ -649,10 +728,18 @@ func (e *Service) ensureReleasesAsync(releaseGroupMBID string) {
go func() {
_, _, _ = e.releasesSF.Do(releaseGroupMBID, func() (any, error) {
_, err := e.mb.BrowseReleases(e.ctx, releaseGroupMBID)
if err == nil {
events.Emit(e.ctx, events.AlbumReleasesReady, releaseGroupMBID)
if err != nil {
e.logger.Warn("explore: background browse releases failed",
"releaseGroupMBID", releaseGroupMBID,
"error", err,
)
events.Emit(e.ctx, events.AlbumReleasesFailed, releaseGroupMBID)
return nil, nil
}
events.Emit(e.ctx, events.AlbumReleasesReady, releaseGroupMBID)
return nil, nil
})
}()
+242
View File
@@ -0,0 +1,242 @@
package explore
import (
"context"
"database/sql"
"math/rand/v2"
)
// mixBatchSize is how many tracks one GenerateMix call returns.
const mixBatchSize = 30
// mixGenreBoost is added to a candidate's similarity weight for each
// genre it shares with the seed, biasing the pick toward tracks that
// match on both artist and tag rather than artist alone.
const mixGenreBoost = 0.5
// mixSimilarArtistsPerSeed caps how many similar artists are expanded
// per distinct seed artist, so a seed with an unusually long tail in
// similar_artist_map doesn't turn one fallback trigger into hundreds
// of queries.
const mixSimilarArtistsPerSeed = 15
// mixSession is a dynamic mix in progress: the seed it was built from
// (fixed for the life of the session, so successive batches don't
// drift away from what the session started as) and what it has
// already handed out, so a batch doesn't repeat a track that just
// played.
type mixSession struct {
seedPaths []string
played map[string]bool
}
// GenerateMix returns the next batch of tracks for a dynamic-mix queue
// fallback, built by expanding the seed's artists to their similar
// artists (weighted by how often each appears in the seed, sharpened
// by shared genre tags) and restricting candidates to what is actually
// in the library — a queue can only play files that exist.
//
// continuing extends the current mix session — regenerating from its
// original seed rather than seedPaths — instead of starting a fresh
// one. Pass false whenever the queue that just exhausted was not
// itself a mix batch (a real selection just ran out); pass true when
// it was (the mix keeps going indefinitely). label names the batch
// after its most-represented seed artist, for the "Playing from" UI.
func (e *Service) GenerateMix(
ctx context.Context,
seedPaths []string,
continuing bool,
) (paths []string, label string, err error) {
e.mixMu.Lock()
defer e.mixMu.Unlock()
if !continuing || e.mix == nil {
e.mix = &mixSession{seedPaths: seedPaths, played: map[string]bool{}}
}
seed := e.mix.seedPaths
if len(seed) == 0 {
return nil, "", nil
}
artistCounts, topArtistName, genres := e.mixSeedProfile(ctx, seed)
if len(artistCounts) == 0 {
return nil, "", nil
}
candidates := e.mixCandidates(ctx, artistCounts, genres, seed, e.mix.played)
// The session has played through everything this seed can offer —
// rather than dead-ending an "indefinite" mix, start handing out
// repeats.
if len(candidates) == 0 && len(e.mix.played) > 0 {
candidates = e.mixCandidates(ctx, artistCounts, genres, seed, nil)
}
if len(candidates) == 0 {
return nil, "", nil
}
picked := weightedSample(candidates, mixBatchSize)
for _, p := range picked {
e.mix.played[p] = true
}
if topArtistName != "" {
label = "a mix inspired by " + topArtistName
} else {
label = "a dynamic mix"
}
return picked, label, nil
}
// mixSeedProfile tallies the seed's artists by frequency, its genre
// tags, and names the most-represented artist for the UI label.
func (e *Service) mixSeedProfile(
ctx context.Context,
seedPaths []string,
) (artistCounts map[string]int, topArtistName string, genres map[string]bool) {
artistCounts = map[string]int{}
artistNames := map[string]string{}
genres = map[string]bool{}
for _, p := range seedPaths {
artist, err := e.db.ReadQueries.GetArtistByFilePath(ctx, p)
if err == nil && artist.ArtistMbid != "" {
artistCounts[artist.ArtistMbid]++
artistNames[artist.ArtistMbid] = artist.ArtistName
}
names, err := e.db.ReadQueries.GetGenreNamesByFilePath(ctx, p)
if err == nil {
for _, g := range names {
genres[g] = true
}
}
}
var topCount int
for mbid, count := range artistCounts {
if count > topCount {
topCount = count
topArtistName = artistNames[mbid]
}
}
return artistCounts, topArtistName, genres
}
// mixCandidates builds the weighted pool of library tracks to draw a
// batch from: every owned track by a similar artist, weighted by that
// artist's similarity score times how often the seed artist it came
// from appears in the seed, boosted for a shared genre tag, excluding
// the seed itself and anything already excluded (typically what the
// mix has already played).
func (e *Service) mixCandidates(
ctx context.Context,
artistCounts map[string]int,
seedGenres map[string]bool,
seedPaths []string,
exclude map[string]bool,
) map[string]float64 {
excludeSeed := make(map[string]bool, len(seedPaths))
for _, p := range seedPaths {
excludeSeed[p] = true
}
candidates := map[string]float64{}
for seedArtistMBID, count := range artistCounts {
similar, err := e.SimilarArtists(seedArtistMBID)
if err != nil {
continue
}
if len(similar) > mixSimilarArtistsPerSeed {
similar = similar[:mixSimilarArtistsPerSeed]
}
for _, s := range similar {
if s.ArtistMBID == "" {
continue
}
paths, err := e.db.ReadQueries.GetFilePathsByArtistMBID(
ctx,
sql.NullString{String: s.ArtistMBID, Valid: true},
)
if err != nil {
continue
}
weight := s.Score * float64(count)
for _, p := range paths {
if excludeSeed[p] || exclude[p] {
continue
}
if names, err := e.db.ReadQueries.GetGenreNamesByFilePath(ctx, p); err == nil {
for _, g := range names {
if seedGenres[g] {
weight += mixGenreBoost
break
}
}
}
candidates[p] += weight
}
}
}
return candidates
}
// weightedSample picks up to n distinct keys from weights without
// replacement, biased toward higher weight (roulette-wheel selection).
// A key with zero or negative weight is never picked.
func weightedSample(weights map[string]float64, n int) []string {
type entry struct {
key string
weight float64
}
pool := make([]entry, 0, len(weights))
var total float64
for k, w := range weights {
if w <= 0 {
continue
}
pool = append(pool, entry{k, w})
total += w
}
picked := make([]string, 0, min(n, len(pool)))
for len(picked) < n && len(pool) > 0 {
r := rand.Float64() * total
idx := 0
for i, e := range pool {
r -= e.weight
if r <= 0 {
idx = i
break
}
}
picked = append(picked, pool[idx].key)
total -= pool[idx].weight
pool = append(pool[:idx], pool[idx+1:]...)
}
return picked
}
+267
View File
@@ -0,0 +1,267 @@
package explore
import (
"context"
"fmt"
"log/slog"
"testing"
"yellowjacket/backend/database"
)
// seedMixTrack inserts one owned track by the given artist (creating
// the artist/artist_credit/recording/audio_file chain as needed),
// tagged with the given genres.
func seedMixTrack(
t *testing.T,
db *database.DB,
id int,
artistName, artistMBID string,
genreNames ...string,
) string {
t.Helper()
fp := fmt.Sprintf("/music/%s/track%d.mp3", artistName, id)
_, err := db.ExecContext(
"INSERT INTO artists (id, name, mbid) VALUES (?, ?, ?) "+
"ON CONFLICT(name) DO NOTHING",
id, artistName, artistMBID,
)
if err != nil {
t.Fatalf("insert artist: %v", err)
}
_, err = db.ExecContext(
"INSERT INTO artist_credit (id, text) VALUES (?, ?) "+
"ON CONFLICT(text) DO NOTHING",
id, artistName,
)
if err != nil {
t.Fatalf("insert artist_credit: %v", err)
}
_, err = db.ExecContext(
"INSERT OR IGNORE INTO artist_credit_artist (artist_id, credit_id) VALUES (?, ?)",
id, id,
)
if err != nil {
t.Fatalf("insert artist_credit_artist: %v", err)
}
_, err = db.ExecContext(
"INSERT INTO recordings (id, name, artist_credit_id) VALUES (?, ?, ?)",
id, fmt.Sprintf("Track %d", id), id,
)
if err != nil {
t.Fatalf("insert recording: %v", err)
}
_, err = db.ExecContext(
"INSERT INTO audio_files (id, file_path, length_milliseconds, file_type_id, recording_id) "+
"VALUES (?, ?, 180000, 0, ?)",
id, fp, id,
)
if err != nil {
t.Fatalf("insert audio_file: %v", err)
}
for _, g := range genreNames {
var genreID int64
row := db.QueryRowWriter(
"INSERT INTO genres (name) VALUES (?) "+
"ON CONFLICT(name) DO UPDATE SET name = name RETURNING id",
g,
)
if err := row.Scan(&genreID); err != nil {
t.Fatalf("upsert genre %q: %v", g, err)
}
_, err = db.ExecContext(
"INSERT OR IGNORE INTO recording_genres (recording_id, genre_id) VALUES (?, ?)",
id, genreID,
)
if err != nil {
t.Fatalf("insert recording_genre: %v", err)
}
}
return fp
}
// seedSimilarArtist records a pre-computed similarity row, as the
// Tier 4 index build / lazy LB fetch would.
func seedSimilarArtist(
t *testing.T,
db *database.DB,
sourceMBID, similarMBID, similarName string,
score int,
) {
t.Helper()
_, err := db.ExecContext(
"INSERT INTO similar_artist_map "+
"(source_artist_mbid, similar_artist_mbid, similar_artist_name, score) "+
"VALUES (?, ?, ?, ?)",
sourceMBID, similarMBID, similarName, score,
)
if err != nil {
t.Fatalf("insert similar_artist_map row: %v", err)
}
}
func newMixTestService(db *database.DB) *Service {
return &Service{db: db, logger: slog.Default()}
}
func TestGenerateMix_ExpandsToSimilarLibraryArtists(t *testing.T) {
t.Parallel()
db := database.NewTestDB(t)
e := newMixTestService(db)
seedPath := seedMixTrack(t, db, 1, "Seed Artist", "mbid-seed")
similarPath := seedMixTrack(t, db, 2, "Similar Artist", "mbid-similar")
unrelatedPath := seedMixTrack(t, db, 3, "Unrelated Artist", "mbid-unrelated")
seedSimilarArtist(t, db, "mbid-seed", "mbid-similar", "Similar Artist", 90)
paths, label, err := e.GenerateMix(context.Background(), []string{seedPath}, false)
if err != nil {
t.Fatalf("GenerateMix: %v", err)
}
if len(paths) != 1 || paths[0] != similarPath {
t.Errorf("paths: got %v, want [%q]", paths, similarPath)
}
for _, p := range paths {
if p == unrelatedPath {
t.Error("mix included a track by an artist with no recorded similarity")
}
}
if label == "" {
t.Error("label: got empty string, want a seed-derived label")
}
}
func TestGenerateMix_BoostsSharedGenre(t *testing.T) {
t.Parallel()
db := database.NewTestDB(t)
e := newMixTestService(db)
seedPath := seedMixTrack(t, db, 1, "Seed Artist", "mbid-seed", "Shoegaze")
matchingGenrePath := seedMixTrack(t, db, 2, "Similar A", "mbid-similar-a", "Shoegaze")
differentGenrePath := seedMixTrack(t, db, 3, "Similar B", "mbid-similar-b", "Ambient")
// Same base similarity score for both, so genre is what breaks the tie.
seedSimilarArtist(t, db, "mbid-seed", "mbid-similar-a", "Similar A", 50)
seedSimilarArtist(t, db, "mbid-seed", "mbid-similar-b", "Similar B", 50)
candidates := e.mixCandidates(
context.Background(),
map[string]int{"mbid-seed": 1},
map[string]bool{"Shoegaze": true},
[]string{seedPath},
nil,
)
if candidates[matchingGenrePath] <= candidates[differentGenrePath] {
t.Errorf(
"weight: shared-genre candidate (%v) should outweigh the other (%v)",
candidates[matchingGenrePath], candidates[differentGenrePath],
)
}
}
func TestGenerateMix_ExcludesAlreadyPlayed(t *testing.T) {
t.Parallel()
db := database.NewTestDB(t)
e := newMixTestService(db)
seedPath := seedMixTrack(t, db, 1, "Seed Artist", "mbid-seed")
similarPath := seedMixTrack(t, db, 2, "Similar Artist", "mbid-similar")
seedSimilarArtist(t, db, "mbid-seed", "mbid-similar", "Similar Artist", 90)
ctx := context.Background()
first, _, err := e.GenerateMix(ctx, []string{seedPath}, false)
if err != nil {
t.Fatalf("first GenerateMix: %v", err)
}
if len(first) != 1 || first[0] != similarPath {
t.Fatalf("first batch: got %v, want [%q]", first, similarPath)
}
// Continuing the same session, with nothing new to offer: rather
// than dead-ending, it should replay from the pool instead of
// returning nothing.
second, _, err := e.GenerateMix(ctx, nil, true)
if err != nil {
t.Fatalf("second GenerateMix: %v", err)
}
if len(second) != 1 || second[0] != similarPath {
t.Errorf(
"second batch: got %v, want [%q] (replayed after exhausting the pool)",
second, similarPath,
)
}
}
func TestGenerateMix_ContinuingIgnoresNewSeed(t *testing.T) {
t.Parallel()
db := database.NewTestDB(t)
e := newMixTestService(db)
originalSeed := seedMixTrack(t, db, 1, "Seed Artist", "mbid-seed")
_ = seedMixTrack(t, db, 2, "Similar Artist", "mbid-similar")
unrelatedSeed := seedMixTrack(t, db, 3, "Other Artist", "mbid-other")
similarToUnrelated := seedMixTrack(t, db, 4, "Other Similar", "mbid-other-similar")
seedSimilarArtist(t, db, "mbid-seed", "mbid-similar", "Similar Artist", 90)
seedSimilarArtist(t, db, "mbid-other", "mbid-other-similar", "Other Similar", 90)
ctx := context.Background()
if _, _, err := e.GenerateMix(ctx, []string{originalSeed}, false); err != nil {
t.Fatalf("GenerateMix: %v", err)
}
// A second, unrelated seed passed while "continuing" is ignored —
// the mix stays anchored to what it started with.
paths, _, err := e.GenerateMix(ctx, []string{unrelatedSeed}, true)
if err != nil {
t.Fatalf("GenerateMix (continuing): %v", err)
}
for _, p := range paths {
if p == similarToUnrelated {
t.Error("continuing mix drifted to the newly passed seed instead of the original")
}
}
}
func TestGenerateMix_NoSeedArtistDataReturnsNothing(t *testing.T) {
t.Parallel()
db := database.NewTestDB(t)
e := newMixTestService(db)
// A file path with no matching audio_files row at all.
paths, label, err := e.GenerateMix(context.Background(), []string{"/nowhere.mp3"}, false)
if err != nil {
t.Fatalf("GenerateMix: %v", err)
}
if len(paths) != 0 || label != "" {
t.Errorf("got (%v, %q), want (nil, \"\")", paths, label)
}
}
+4
View File
@@ -623,6 +623,10 @@ func convertRelease(r musicbrainzws2.Release) MBRelease {
ArtistCredit: r.ArtistCredit.String(),
}
if r.ReleaseGroup != nil {
rel.ReleaseGroupMBID = string(r.ReleaseGroup.ID)
}
for _, m := range r.Media {
// Skip video media outright — DVD/Blu-ray bonus discs
// inflate track counts and wreck track-count-based scoring
+6
View File
@@ -88,6 +88,12 @@ type MBRelease struct {
Status string `json:"status"`
ArtistCredit string `json:"artistCredit,omitempty"`
Tracks []MBTrack `json:"tracks,omitempty"`
// ReleaseGroupMBID is the parent release group's MBID. Empty unless
// the lookup requested the "release-groups" include (LookupRelease
// does); used to resolve a release-level MBID (what many taggers
// write) back to the release-group MBID everything else on the
// album page is keyed by.
ReleaseGroupMBID string `json:"releaseGroupMbid,omitempty"`
}
// MBRecording is a Wails-friendly projection of a MusicBrainz