Plans 013 and 014, the album page that prompted them, and the smaller fixes they turned up. Changelog, largest first. ## The local library is shaped like files, not like MusicBrainz `audio_files` carries its own tags and points at `albums` and `artists`; `file_genres` is the one real many-to-many. `recordings`, `release_group_recordings`, `artist_credit`, `artist_credit_artist`, `recording_genres`, `release_groups` and `release_to_rg` are gone from the local side, and with them a six-way join in every read, a `MIN(release_group_id)` subquery in eleven queries and a first-credited-artist subquery in nine. Measured on a real 25,966-file library, every many-to-many that model expressed was 1:1 in the data. - Ownership is a file. `GetFilePathsByRecordingMBIDs`, `LibraryMBIDIndex.CheckMBIDs`, `collectLibraryEntities` and `pruneStaleLocalCrossReferences` all join `audio_files`, so the 812 orphaned recordings, 216 release groups and 260 artists that library carried are now structurally impossible. - One projection: every track query selects from the `track_metadata` view, one row type, one mapper. Nine hand-rolled copies had drifted far enough to report different years on different screens. - `library_id = 0` means every library, so each list query exists once instead of scoped and unscoped with a branch at every call site. - No migration chain. `sql/schemas/` is the one description of the shape; `sql/migrations/`, `applyMigrations` and `schema_migrations` are squashed away, along with the drift between them that had sqlc generating against a stale schema. - `database.InsertTestTrack` is the one test seeder; twenty test files had been assembling the old FK chain each in its own order. ## The catalog stores its ids as bytes `explore_index`'s three 36-char MBID columns and its entity-type text are 16 raw bytes and a small integer. The table and its six indexes go 780 MB to 405 MB on a real 2,052,200-row catalog, which is why a fresh install is ~0.6 GB rather than ~1.0 GB. - `backend/explore/mbid.go` is the only place the encoding is known; everything above it speaks dashed strings. - `CHECK(length(mbid) = 16)` makes a stringly write fail at the insert rather than silently returning no rows, since SQLite does not coerce between TEXT and BLOB. - The importer asks the artifact what encoding it carries and converts on the way in, so the artifact already published keeps working and no format bump is needed. - `indexRowColumns`/`scanIndexRow` replace four copies of a 22-column list, and `TestStoredEncodingRoundTrips` sweeps every read path. ## An album page that says how much of the album is yours - One question, asked once: is there a file. `filePaths` is filled by a single batched lookup when the tracklist settles, and the badge, the Play count, the dimmed rows and every menu item read it — replacing four claims of decreasing confidence that could show a green tick on an album whose every action did nothing. - Play, Play 7 of 12, or no play button at all. - `total_tracks` on `explore_index` (~2 bytes over 400,677 release groups) and on `audio_files` from tags that have always carried it: a complete MBID-matched album now makes no catalog call at all, where it used to spend the most expensive request the app makes. - A merged cluster shows the running order the most releases agree on, and the version list marks the release you own rather than standing a synthetic entry in for it. - `AlbumReleasesFailed`: a slow fetch is no longer reported as a failed one by a 12-second timer. - Rows not in the library are dimmed in place (with `aria-disabled`) instead of the owned ones wearing a green tick and a legend. ## Caches and cover art get ceilings - Only the three tiers of a cover are stored; the full-resolution copy nothing rendered was 1,134 MB of a 1.4 GB covers directory. - One artist portrait is downloaded and the rest are remembered as URLs — 4.1 GB of a 5.3 GB cache was candidates no code path reads. - `browsedArtBudget` and `httpCacheBudget` bound what an age cannot: the same install held art for 5,770 artists in a 1,301-artist library. - `OrphanedArtistImagesJob` joined a bare MBID onto a sharded directory, so it deleted the rows that were the only record of the files it left behind. `explore.ArtistImageDir` is that layout's one definition now. ## The autotag queue asks whether there is work `tagging_items` was a row per album folder, not a queue, and no query read the `tag_status` column that held the answer. The four queue queries ask the files, which matters most where it is least visible: `startPrefetch` was scoring every album in a tagged library against MusicBrainz. ## Phantom playlist tracks resolve in place An M3U8 imported before its files leaves phantom rows; they now match by path and fall back to position, keep their place in the playlist when resolved, and pair best-first so two phantoms cannot claim the same file. ## Playing a track plays the list it is in Double-click, and Play on a single row's menu, queue the list as displayed with `startIndex` on that row — the album page and the track list used to queue one track and discard the album around it. A multi-row selection still plays exactly itself. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AfVYUVExXsx1nSWrXN8mAh
234 lines
6.6 KiB
Go
234 lines
6.6 KiB
Go
package library
|
|
|
|
import (
|
|
"io"
|
|
"log/slog"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"yellowjacket/backend/database/sql/sqlcgen"
|
|
"yellowjacket/backend/tagwriter"
|
|
"yellowjacket/internal/testfixtures"
|
|
)
|
|
|
|
// copyFile copies an untagged real MP3 fixture (decodable, so
|
|
// metadata extraction and duration decoding both work exactly as
|
|
// they would on a real library file) to path.
|
|
func copyFile(t *testing.T, src, dst string) {
|
|
t.Helper()
|
|
|
|
in, err := os.Open(src)
|
|
if err != nil {
|
|
t.Fatalf("open fixture %s: %v", src, err)
|
|
}
|
|
|
|
defer func() { _ = in.Close() }()
|
|
|
|
out, err := os.Create(dst)
|
|
if err != nil {
|
|
t.Fatalf("create %s: %v", dst, err)
|
|
}
|
|
|
|
defer func() { _ = out.Close() }()
|
|
|
|
if _, err := io.Copy(out, in); err != nil {
|
|
t.Fatalf("copy fixture to %s: %v", dst, err)
|
|
}
|
|
}
|
|
|
|
// writeTestTrack copies a real, untagged MP3 fixture to path and,
|
|
// when discNumber is non-zero, stamps a disc-number tag onto it via
|
|
// the same tagwriter path the app itself uses to write tags — a
|
|
// discNumber of 0 leaves the file untagged, exactly like a track
|
|
// whose disc frame was never set.
|
|
func writeTestTrack(t *testing.T, path string, discNumber int) {
|
|
t.Helper()
|
|
|
|
m := testfixtures.Load(t)
|
|
blank := m.Abs("unsorted/no-tags-at-all.mp3")
|
|
|
|
copyFile(t, blank, path)
|
|
|
|
if discNumber == 0 {
|
|
return
|
|
}
|
|
|
|
if err := tagwriter.WriteFileTags(
|
|
slog.Default(), path,
|
|
tagwriter.TagChanges{tagwriter.FieldDiscNumber: discNumber},
|
|
); err != nil {
|
|
t.Fatalf("write disc tag on %s: %v", path, err)
|
|
}
|
|
}
|
|
|
|
// scanTestGroupKeys creates a library row at root, runs a real
|
|
// synchronous scan of it, and returns the group_key each resulting
|
|
// audio_files row landed on, keyed by absolute file path.
|
|
func scanTestGroupKeys(t *testing.T, lib *Library, root string) map[string]string {
|
|
t.Helper()
|
|
|
|
library, err := lib.db.Queries.CreateLibrary(lib.ctx, sqlcgen.CreateLibraryParams{
|
|
Name: root,
|
|
Path: root,
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("create library: %v", err)
|
|
}
|
|
|
|
metrics := lib.scanInternal(library.ID, library.Name, library.Path)
|
|
if metrics == nil {
|
|
t.Fatal("scanInternal returned nil metrics")
|
|
}
|
|
|
|
rows, err := lib.db.Queries.GetAudioFilesInLibrary(lib.ctx, library.ID)
|
|
if err != nil {
|
|
t.Fatalf("list audio files: %v", err)
|
|
}
|
|
|
|
got := make(map[string]string, len(rows))
|
|
for _, r := range rows {
|
|
got[r.FilePath] = r.GroupKey
|
|
}
|
|
|
|
return got
|
|
}
|
|
|
|
// TestScan_PartialDiscTaggingWithinOneFolderDoesNotFragment guards the
|
|
// fix for a real-world bug: a folder where only some tracks carry an
|
|
// explicit disc tag (common when files were ripped or re-tagged at
|
|
// different times) must not split into two tagging groups for what is
|
|
// really one single-disc album. Before directory-batched disc
|
|
// resolution, each file resolved its own group_key from only its own
|
|
// tag, so an untagged track always folded to disc 1 regardless of
|
|
// what its siblings said — fragmenting a real disc 2 whenever even one
|
|
// of its tracks lacked the tag.
|
|
func TestScan_PartialDiscTaggingWithinOneFolderDoesNotFragment(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
lib, _ := setupTestLibrary(t)
|
|
|
|
root := t.TempDir()
|
|
dir := filepath.Join(root, "Artist", "Album")
|
|
|
|
if err := os.MkdirAll(dir, 0o750); err != nil {
|
|
t.Fatalf("mkdir: %v", err)
|
|
}
|
|
|
|
track1 := filepath.Join(dir, "01.mp3")
|
|
track2 := filepath.Join(dir, "02.mp3")
|
|
track3 := filepath.Join(dir, "03.mp3")
|
|
|
|
writeTestTrack(t, track1, 2) // explicit disc 2
|
|
writeTestTrack(t, track2, 0) // untagged
|
|
writeTestTrack(t, track3, 2) // explicit disc 2
|
|
|
|
keys := scanTestGroupKeys(t, lib, root)
|
|
|
|
if len(keys) != 3 { //nolint:mnd
|
|
t.Fatalf("expected 3 audio files, got %d: %+v", len(keys), keys)
|
|
}
|
|
|
|
if keys[track1] != keys[track2] || keys[track1] != keys[track3] {
|
|
t.Errorf(
|
|
"expected all three tracks to share one group_key, got %+v",
|
|
keys,
|
|
)
|
|
}
|
|
}
|
|
|
|
// TestScan_GenuineMultiDiscFolderStillSplits is the flip side of the
|
|
// partial-tagging fix: a folder with no per-disc subfolders where the
|
|
// explicit disc tags genuinely disagree (a real two-disc release
|
|
// dumped flat) must still separate into two groups — directory-wide
|
|
// consensus must not paper over an actual multi-disc release just
|
|
// because it shares one directory.
|
|
func TestScan_GenuineMultiDiscFolderStillSplits(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
lib, _ := setupTestLibrary(t)
|
|
|
|
root := t.TempDir()
|
|
dir := filepath.Join(root, "Artist", "Album")
|
|
|
|
if err := os.MkdirAll(dir, 0o750); err != nil {
|
|
t.Fatalf("mkdir: %v", err)
|
|
}
|
|
|
|
disc1TrackA := filepath.Join(dir, "1-01.mp3")
|
|
disc1TrackB := filepath.Join(dir, "1-02.mp3")
|
|
disc2TrackA := filepath.Join(dir, "2-01.mp3")
|
|
disc2TrackB := filepath.Join(dir, "2-02.mp3")
|
|
|
|
writeTestTrack(t, disc1TrackA, 1)
|
|
writeTestTrack(t, disc1TrackB, 1)
|
|
writeTestTrack(t, disc2TrackA, 2) //nolint:mnd
|
|
writeTestTrack(t, disc2TrackB, 2) //nolint:mnd
|
|
|
|
keys := scanTestGroupKeys(t, lib, root)
|
|
|
|
if len(keys) != 4 { //nolint:mnd
|
|
t.Fatalf("expected 4 audio files, got %d: %+v", len(keys), keys)
|
|
}
|
|
|
|
if keys[disc1TrackA] != keys[disc1TrackB] {
|
|
t.Errorf("disc 1 tracks should share a group_key, got %+v", keys)
|
|
}
|
|
|
|
if keys[disc2TrackA] != keys[disc2TrackB] {
|
|
t.Errorf("disc 2 tracks should share a group_key, got %+v", keys)
|
|
}
|
|
|
|
if keys[disc1TrackA] == keys[disc2TrackA] {
|
|
t.Errorf("disc 1 and disc 2 must not share a group_key, got %+v", keys)
|
|
}
|
|
}
|
|
|
|
// TestScan_MultipleDirectoriesDoNotCrossContaminate scans two
|
|
// unrelated folders — one partially disc-tagged, one fully untagged —
|
|
// in a single pass, guarding against the directory-batching buffer in
|
|
// the DB writer mixing up which files belong to which directory.
|
|
func TestScan_MultipleDirectoriesDoNotCrossContaminate(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
lib, _ := setupTestLibrary(t)
|
|
|
|
root := t.TempDir()
|
|
albumA := filepath.Join(root, "Artist", "Album A")
|
|
albumB := filepath.Join(root, "Artist", "Album B")
|
|
|
|
for _, d := range []string{albumA, albumB} {
|
|
if err := os.MkdirAll(d, 0o750); err != nil {
|
|
t.Fatalf("mkdir: %v", err)
|
|
}
|
|
}
|
|
|
|
aTrack1 := filepath.Join(albumA, "01.mp3")
|
|
aTrack2 := filepath.Join(albumA, "02.mp3")
|
|
bTrack1 := filepath.Join(albumB, "01.mp3")
|
|
bTrack2 := filepath.Join(albumB, "02.mp3")
|
|
|
|
writeTestTrack(t, aTrack1, 2) //nolint:mnd
|
|
writeTestTrack(t, aTrack2, 0)
|
|
writeTestTrack(t, bTrack1, 0)
|
|
writeTestTrack(t, bTrack2, 0)
|
|
|
|
keys := scanTestGroupKeys(t, lib, root)
|
|
|
|
if len(keys) != 4 { //nolint:mnd
|
|
t.Fatalf("expected 4 audio files, got %d: %+v", len(keys), keys)
|
|
}
|
|
|
|
if keys[aTrack1] != keys[aTrack2] {
|
|
t.Errorf("Album A's two tracks should share a group_key: %+v", keys)
|
|
}
|
|
|
|
if keys[bTrack1] != keys[bTrack2] {
|
|
t.Errorf("Album B's two tracks should share a group_key: %+v", keys)
|
|
}
|
|
|
|
if keys[aTrack1] == keys[bTrack1] {
|
|
t.Errorf("Album A and Album B must not share a group_key: %+v", keys)
|
|
}
|
|
}
|