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
+26
-102
@@ -42,6 +42,8 @@ type RemovalHooks struct {
|
||||
|
||||
// SetRemovalHooks provides optional hooks for cross-cutting
|
||||
// orchestration during RemoveLibrary.
|
||||
//
|
||||
//wails:ignore // internal wiring, not part of the app's IPC surface.
|
||||
func (l *Library) SetRemovalHooks(h RemovalHooks) {
|
||||
l.mu.Lock()
|
||||
defer l.mu.Unlock()
|
||||
@@ -168,9 +170,7 @@ func (l *Library) RenameLibrary(id int64, newName string) error {
|
||||
// GetRemovalImpact returns pre-removal counts for the confirmation
|
||||
// dialog. All queries are read-only.
|
||||
func (l *Library) GetRemovalImpact(libraryID int64) (*RemovalImpact, error) {
|
||||
// SAFETY: Hand-crafted SQL for track count. sqlc query CountAudioFilesByLibrary
|
||||
// exists but we inline the remaining two for consistency. Parameterized.
|
||||
trackCount, err := l.db.Queries.CountAudioFilesByLibrary(l.ctx, libraryID)
|
||||
trackCount, err := l.db.Queries.CountAudioFiles(l.ctx, libraryID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not count tracks: %w", err)
|
||||
}
|
||||
@@ -251,40 +251,17 @@ func (l *Library) RemoveLibrary(id int64) (*RemovalSummary, error) {
|
||||
if _, err := tx.ExecContext(l.ctx, `
|
||||
UPDATE playlist_tracks SET
|
||||
phantom_title = sub.title,
|
||||
phantom_artist = sub.artist,
|
||||
phantom_artist = sub.artist_name,
|
||||
phantom_album = sub.album,
|
||||
phantom_duration_ms = sub.duration,
|
||||
phantom_duration_ms = sub.length_milliseconds,
|
||||
phantom_genre = sub.genre,
|
||||
phantom_cover_art_path = sub.cover_art_path,
|
||||
phantom_file_path = sub.file_path
|
||||
FROM (
|
||||
SELECT
|
||||
pt.id AS pt_id,
|
||||
af.file_path AS file_path,
|
||||
COALESCE(r.name, '') AS title,
|
||||
COALESCE(ac.text, '') AS artist,
|
||||
COALESCE(rg.name, '') AS album,
|
||||
af.length_milliseconds AS duration,
|
||||
CAST(COALESCE(
|
||||
(SELECT GROUP_CONCAT(g.name, '||')
|
||||
FROM recording_genres rg_sub
|
||||
JOIN genres g ON rg_sub.genre_id = g.id
|
||||
WHERE rg_sub.recording_id = r.id),
|
||||
''
|
||||
) AS TEXT) AS genre,
|
||||
COALESCE(ca.file_path, '') AS cover_art_path
|
||||
SELECT pt.id AS pt_id, tm.*
|
||||
FROM playlist_tracks pt
|
||||
JOIN audio_files af ON pt.audio_file_id = af.id
|
||||
LEFT JOIN recordings r ON af.recording_id = r.id
|
||||
LEFT JOIN artist_credit ac ON r.artist_credit_id = ac.id
|
||||
LEFT JOIN (
|
||||
SELECT recording_id, MIN(release_group_id) AS release_group_id
|
||||
FROM release_group_recordings
|
||||
GROUP BY recording_id
|
||||
) rgr ON r.id = rgr.recording_id
|
||||
LEFT JOIN release_groups rg ON rgr.release_group_id = rg.id
|
||||
LEFT JOIN cover_art ca ON rg.cover_art_id = ca.id
|
||||
WHERE af.library_id = ?
|
||||
JOIN track_metadata tm ON tm.id = pt.audio_file_id
|
||||
WHERE tm.library_id = ?
|
||||
) sub
|
||||
WHERE playlist_tracks.id = sub.pt_id`, id); err != nil {
|
||||
return nil, fmt.Errorf("could not populate phantom metadata: %w", err)
|
||||
@@ -301,97 +278,44 @@ func (l *Library) RemoveLibrary(id int64) (*RemovalSummary, error) {
|
||||
|
||||
tracksDeleted, _ := result.RowsAffected()
|
||||
|
||||
// 7. Delete orphaned recording_genres (must run BEFORE recordings
|
||||
// because recording_genres.recording_id references recordings.id).
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Parameterless.
|
||||
if _, err := tx.ExecContext(l.ctx,
|
||||
`DELETE FROM recording_genres WHERE recording_id NOT IN (
|
||||
SELECT DISTINCT recording_id FROM audio_files
|
||||
)`); err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned recording_genres: %w", err)
|
||||
}
|
||||
|
||||
// 8. Delete orphaned release_group_recordings (must run BEFORE
|
||||
// recordings because release_group_recordings.recording_id
|
||||
// references recordings.id).
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Parameterless.
|
||||
if _, err := tx.ExecContext(l.ctx,
|
||||
`DELETE FROM release_group_recordings WHERE recording_id NOT IN (
|
||||
SELECT DISTINCT recording_id FROM audio_files
|
||||
)`); err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned release_group_recordings: %w", err)
|
||||
}
|
||||
|
||||
// 9. Delete orphaned recordings (safe now that child tables are cleaned).
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Reference-counting delete
|
||||
// with NOT IN subquery unsupported by sqlc. No user input.
|
||||
if _, err := tx.ExecContext(l.ctx,
|
||||
`DELETE FROM recordings WHERE id NOT IN (
|
||||
SELECT DISTINCT recording_id FROM audio_files
|
||||
)`); err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned recordings: %w", err)
|
||||
}
|
||||
|
||||
// 10. Delete orphaned release_groups.
|
||||
// 7. Sweep what the files left behind. This used to be eight
|
||||
// statements in dependency order, because deleting a file cascaded
|
||||
// to none of the five metadata tables it had created. file_genres
|
||||
// cascades now, so what is left is the two tables that genuinely
|
||||
// outlive a file and the genres nothing references.
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Parameterless.
|
||||
result, err = tx.ExecContext(l.ctx,
|
||||
`DELETE FROM release_groups WHERE id NOT IN (
|
||||
SELECT DISTINCT release_group_id FROM release_group_recordings
|
||||
`DELETE FROM albums WHERE id NOT IN (
|
||||
SELECT DISTINCT album_id FROM audio_files WHERE album_id IS NOT NULL
|
||||
)`)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned release_groups: %w", err)
|
||||
return nil, fmt.Errorf("could not delete empty albums: %w", err)
|
||||
}
|
||||
|
||||
albumsRemoved, _ := result.RowsAffected()
|
||||
|
||||
// 11. Delete orphaned artist_credit_artists (must run BEFORE
|
||||
// artist_credit because artist_credit_artist.credit_id references
|
||||
// artist_credit.id).
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Parameterless.
|
||||
if _, err := tx.ExecContext(l.ctx,
|
||||
`DELETE FROM artist_credit_artist WHERE credit_id NOT IN (
|
||||
SELECT DISTINCT artist_credit_id FROM recordings
|
||||
) AND credit_id NOT IN (
|
||||
SELECT DISTINCT album_artist_credit_id FROM release_groups
|
||||
WHERE album_artist_credit_id IS NOT NULL
|
||||
)`); err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned artist_credit_artists: %w", err)
|
||||
}
|
||||
|
||||
// 12. Delete orphaned artist_credits (safe now that child table is cleaned).
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Dual-FK reference counting
|
||||
// (recordings.artist_credit_id + release_groups.album_artist_credit_id)
|
||||
// unsupported by sqlc. Parameterless.
|
||||
if _, err := tx.ExecContext(l.ctx,
|
||||
`DELETE FROM artist_credit WHERE id NOT IN (
|
||||
SELECT DISTINCT artist_credit_id FROM recordings
|
||||
) AND id NOT IN (
|
||||
SELECT DISTINCT album_artist_credit_id FROM release_groups
|
||||
WHERE album_artist_credit_id IS NOT NULL
|
||||
)`); err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned artist_credits: %w", err)
|
||||
}
|
||||
|
||||
// 13. Delete orphaned artists.
|
||||
// Artists after albums: an artist is unreferenced only once the
|
||||
// albums pointing at it are gone.
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Parameterless.
|
||||
result, err = tx.ExecContext(l.ctx,
|
||||
`DELETE FROM artists WHERE id NOT IN (
|
||||
SELECT DISTINCT artist_id FROM artist_credit_artist
|
||||
SELECT DISTINCT artist_id FROM audio_files WHERE artist_id IS NOT NULL
|
||||
) AND id NOT IN (
|
||||
SELECT DISTINCT artist_id FROM albums WHERE artist_id IS NOT NULL
|
||||
)`)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned artists: %w", err)
|
||||
return nil, fmt.Errorf("could not delete unreferenced artists: %w", err)
|
||||
}
|
||||
|
||||
artistsRemoved, _ := result.RowsAffected()
|
||||
|
||||
// 14. Delete orphaned genres.
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Parameterless.
|
||||
result, err = tx.ExecContext(l.ctx,
|
||||
`DELETE FROM genres WHERE id NOT IN (
|
||||
SELECT DISTINCT genre_id FROM recording_genres
|
||||
SELECT DISTINCT genre_id FROM file_genres
|
||||
)`)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned genres: %w", err)
|
||||
return nil, fmt.Errorf("could not delete unused genres: %w", err)
|
||||
}
|
||||
|
||||
genresRemoved, _ := result.RowsAffected()
|
||||
@@ -401,7 +325,7 @@ func (l *Library) RemoveLibrary(id int64) (*RemovalSummary, error) {
|
||||
// Parameterless.
|
||||
rows, err := tx.QueryContext(l.ctx,
|
||||
`SELECT file_path FROM cover_art WHERE id NOT IN (
|
||||
SELECT DISTINCT cover_art_id FROM release_groups
|
||||
SELECT DISTINCT cover_art_id FROM albums
|
||||
WHERE cover_art_id IS NOT NULL
|
||||
)`)
|
||||
if err != nil {
|
||||
@@ -429,7 +353,7 @@ func (l *Library) RemoveLibrary(id int64) (*RemovalSummary, error) {
|
||||
// SAFETY: Hand-crafted orphan cleanup SQL. Parameterless.
|
||||
if _, err := tx.ExecContext(l.ctx,
|
||||
`DELETE FROM cover_art WHERE id NOT IN (
|
||||
SELECT DISTINCT cover_art_id FROM release_groups
|
||||
SELECT DISTINCT cover_art_id FROM albums
|
||||
WHERE cover_art_id IS NOT NULL
|
||||
)`); err != nil {
|
||||
return nil, fmt.Errorf("could not delete orphaned cover_art: %w", err)
|
||||
|
||||
Reference in New Issue
Block a user