feat(database): shape the library like files, and shrink the catalog
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
This commit is contained in:
Claude Opus 5
+30
-157
@@ -51,116 +51,16 @@ func seedSmartTestTracks(t *testing.T, db *database.DB) {
|
||||
},
|
||||
}
|
||||
|
||||
// Build unique sets for artist_credit and release_groups.
|
||||
artistMap := map[string]int64{}
|
||||
albumMap := map[string]int64{}
|
||||
|
||||
var artistID, albumID int64
|
||||
|
||||
for _, tr := range tracks {
|
||||
if _, ok := artistMap[tr.artist]; !ok {
|
||||
artistID++
|
||||
artistMap[tr.artist] = artistID
|
||||
}
|
||||
|
||||
if _, ok := albumMap[tr.album]; !ok {
|
||||
albumID++
|
||||
albumMap[tr.album] = albumID
|
||||
}
|
||||
}
|
||||
|
||||
// Insert artist_credit rows.
|
||||
for text, id := range artistMap {
|
||||
_, err := db.ExecContext(
|
||||
"INSERT INTO artist_credit (id, text) VALUES (?, ?)",
|
||||
id, text,
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("insert artist_credit %q: %v", text, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Insert release_groups.
|
||||
for name, id := range albumMap {
|
||||
_, err := db.ExecContext(
|
||||
"INSERT INTO release_groups (id, name) VALUES (?, ?)",
|
||||
id, name,
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("insert release_group %q: %v", name, err)
|
||||
}
|
||||
}
|
||||
|
||||
// Insert genres.
|
||||
genreMap := map[string]int64{}
|
||||
|
||||
var genreID int64
|
||||
|
||||
for _, tr := range tracks {
|
||||
if _, ok := genreMap[tr.genre]; !ok {
|
||||
genreID++
|
||||
genreMap[tr.genre] = genreID
|
||||
|
||||
_, err := db.ExecContext(
|
||||
"INSERT INTO genres (id, name) VALUES (?, ?)",
|
||||
genreID, tr.genre,
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("insert genre %q: %v", tr.genre, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Insert tracks with full FK chain.
|
||||
for _, tr := range tracks {
|
||||
acID := artistMap[tr.artist]
|
||||
rgID := albumMap[tr.album]
|
||||
|
||||
// Insert recording.
|
||||
_, err := db.ExecContext(
|
||||
"INSERT INTO recordings (id, name, artist_credit_id, year) "+
|
||||
"VALUES (?, ?, ?, ?)",
|
||||
tr.id, tr.title, acID, tr.year,
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("insert recording %d %q: %v", tr.id, tr.title, err)
|
||||
}
|
||||
|
||||
// Insert audio_file.
|
||||
_, err = db.ExecContext(
|
||||
"INSERT INTO audio_files (id, file_path, "+
|
||||
"length_milliseconds, file_type_id, recording_id, "+
|
||||
"sample_rate, bit_depth, channels, bitrate, file_size) "+
|
||||
"VALUES (?, ?, ?, 0, ?, 44100, 16, 2, 320000, 5000000)",
|
||||
tr.id, tr.filePath, tr.lenMs, tr.id,
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("insert audio_file %d: %v", tr.id, err)
|
||||
}
|
||||
|
||||
// Link recording to release_group.
|
||||
_, err = db.ExecContext(
|
||||
"INSERT INTO release_group_recordings "+
|
||||
"(release_group_id, recording_id) VALUES (?, ?)",
|
||||
rgID, tr.id,
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("insert release_group_recordings %d→%d: %v",
|
||||
rgID, tr.id, err)
|
||||
}
|
||||
|
||||
// Insert recording_genres link.
|
||||
gID := genreMap[tr.genre]
|
||||
|
||||
_, err = db.ExecContext(
|
||||
"INSERT INTO recording_genres "+
|
||||
"(recording_id, genre_id) VALUES (?, ?)",
|
||||
tr.id, gID,
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("insert recording_genres %d→%d: %v",
|
||||
tr.id, gID, err)
|
||||
}
|
||||
database.InsertTestTrack(t, db, database.TestTrack{
|
||||
FilePath: tr.filePath,
|
||||
Title: tr.title,
|
||||
Artist: tr.artist,
|
||||
Album: tr.album,
|
||||
Genres: []string{tr.genre},
|
||||
Year: tr.year,
|
||||
LengthMs: tr.lenMs,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -467,27 +367,18 @@ func TestSmartPlaylistEvaluateNonSmartPlaylist(t *testing.T) {
|
||||
svc := newTestService(t, db)
|
||||
|
||||
// Create a regular playlist via direct SQL.
|
||||
// SAFETY: Test-only insert for regular playlist.
|
||||
rows, err := db.QueryContext(
|
||||
`INSERT INTO playlists (name) VALUES (?)
|
||||
RETURNING id`,
|
||||
// An INSERT ... RETURNING is a write, so it needs the writer:
|
||||
// QueryContext routes to the query-only read pool.
|
||||
var regularID int64
|
||||
if err := db.QueryRowWriter(
|
||||
`INSERT INTO playlists (name) VALUES (?) RETURNING id`,
|
||||
"Regular PL",
|
||||
)
|
||||
if err != nil {
|
||||
).Scan(®ularID); err != nil {
|
||||
t.Fatalf("insert regular playlist: %v", err)
|
||||
}
|
||||
|
||||
var regularID int64
|
||||
if rows.Next() {
|
||||
if err := rows.Scan(®ularID); err != nil {
|
||||
t.Fatalf("scan regular playlist id: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
_ = rows.Close()
|
||||
|
||||
// Evaluate should fail — not a smart playlist.
|
||||
_, err = svc.EvaluateSmartPlaylist(regularID)
|
||||
_, err := svc.EvaluateSmartPlaylist(regularID)
|
||||
if err == nil {
|
||||
t.Fatal("expected error evaluating non-smart playlist, got nil")
|
||||
}
|
||||
@@ -512,25 +403,16 @@ func TestSmartPlaylistUpdateNonSmartPlaylist(t *testing.T) {
|
||||
db := database.NewTestDB(t)
|
||||
svc := newTestService(t, db)
|
||||
|
||||
// Create a regular playlist.
|
||||
rows, err := db.QueryContext(
|
||||
`INSERT INTO playlists (name) VALUES (?)
|
||||
RETURNING id`,
|
||||
// Create a regular playlist. An INSERT ... RETURNING is a write,
|
||||
// so it needs the writer: QueryContext routes to the read pool.
|
||||
var regularID int64
|
||||
if err := db.QueryRowWriter(
|
||||
`INSERT INTO playlists (name) VALUES (?) RETURNING id`,
|
||||
"Regular PL",
|
||||
)
|
||||
if err != nil {
|
||||
).Scan(®ularID); err != nil {
|
||||
t.Fatalf("insert regular playlist: %v", err)
|
||||
}
|
||||
|
||||
var regularID int64
|
||||
if rows.Next() {
|
||||
if err := rows.Scan(®ularID); err != nil {
|
||||
t.Fatalf("scan regular playlist id: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
_ = rows.Close()
|
||||
|
||||
rulesJSON := makeRulesJSON(t, smartplaylist.RuleSet{
|
||||
Rules: []smartplaylist.Rule{
|
||||
{Field: "title", Operator: "contains", Value: "test"},
|
||||
@@ -538,7 +420,7 @@ func TestSmartPlaylistUpdateNonSmartPlaylist(t *testing.T) {
|
||||
})
|
||||
|
||||
// Update should fail — not a smart playlist.
|
||||
err = svc.UpdateSmartPlaylistRules(regularID, rulesJSON)
|
||||
err := svc.UpdateSmartPlaylistRules(regularID, rulesJSON)
|
||||
if err == nil {
|
||||
t.Fatal("expected error updating non-smart playlist, got nil")
|
||||
}
|
||||
@@ -765,27 +647,18 @@ func TestSmartPlaylistGetRulesRegularPlaylist(t *testing.T) {
|
||||
svc := newTestService(t, db)
|
||||
|
||||
// Create a regular playlist via direct SQL.
|
||||
// SAFETY: Test-only insert for regular playlist.
|
||||
rows, err := db.QueryContext(
|
||||
`INSERT INTO playlists (name) VALUES (?)
|
||||
RETURNING id`,
|
||||
// An INSERT ... RETURNING is a write, so it needs the writer:
|
||||
// QueryContext routes to the query-only read pool.
|
||||
var regularID int64
|
||||
if err := db.QueryRowWriter(
|
||||
`INSERT INTO playlists (name) VALUES (?) RETURNING id`,
|
||||
"Regular PL For GetRules",
|
||||
)
|
||||
if err != nil {
|
||||
).Scan(®ularID); err != nil {
|
||||
t.Fatalf("insert regular playlist: %v", err)
|
||||
}
|
||||
|
||||
var regularID int64
|
||||
if rows.Next() {
|
||||
if err := rows.Scan(®ularID); err != nil {
|
||||
t.Fatalf("scan regular playlist id: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
_ = rows.Close()
|
||||
|
||||
// GetSmartPlaylistRules should fail — not a smart playlist.
|
||||
_, err = svc.GetSmartPlaylistRules(regularID)
|
||||
_, err := svc.GetSmartPlaylistRules(regularID)
|
||||
if err == nil {
|
||||
t.Fatal(
|
||||
"expected error for regular playlist, got nil",
|
||||
|
||||
Reference in New Issue
Block a user