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
200 lines
5.9 KiB
Go
200 lines
5.9 KiB
Go
package library
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
|
|
"yellowjacket/backend/events"
|
|
)
|
|
|
|
// errNoPathsToRemove is returned when RemoveFromLibrary is called with
|
|
// nothing to remove. A static error because err113 forbids a dynamic
|
|
// one, and a sentinel because the frontend distinguishes it.
|
|
var errNoPathsToRemove = errors.New("no file paths given to remove")
|
|
|
|
// RemovalResult reports what one RemoveFromLibrary call did.
|
|
type RemovalResult struct {
|
|
// TracksRemoved is how many audio_files rows were deleted. It can
|
|
// be lower than len(filePaths) if a path was already gone.
|
|
TracksRemoved int64 `json:"tracksRemoved"`
|
|
// PathsExcluded is how many paths the scanner will now skip.
|
|
PathsExcluded int64 `json:"pathsExcluded"`
|
|
}
|
|
|
|
// RemoveFromLibrary deletes the database rows for the given file paths
|
|
// and records each path as excluded, so the next scan does not import
|
|
// it again. **It does not touch the files on disk** — that is the
|
|
// promise the confirmation dialog makes, and the reason this operation
|
|
// is safe to put one keystroke from a focused row.
|
|
//
|
|
// The exclusion is not an enhancement. Without it the next scan finds
|
|
// the file, sees no row, and imports it again — a button that undoes
|
|
// itself, which is worse than no button.
|
|
func (l *Library) RemoveFromLibrary(filePaths []string) (*RemovalResult, error) {
|
|
if len(filePaths) == 0 {
|
|
return nil, errNoPathsToRemove
|
|
}
|
|
|
|
rows, err := l.db.Queries.GetAudioFilesByPaths(l.ctx, filePaths)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not resolve paths to remove: %w", err)
|
|
}
|
|
|
|
tx, err := l.db.BeginTx()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not begin removal transaction: %w", err)
|
|
}
|
|
|
|
committed := false
|
|
|
|
defer func() {
|
|
if !committed {
|
|
_ = tx.Rollback()
|
|
}
|
|
}()
|
|
|
|
txq := l.db.Queries.WithTx(tx)
|
|
|
|
var result RemovalResult
|
|
|
|
// Exclude every path the caller named, including one whose row has
|
|
// already gone: the user asked for that file to stay out, and a row
|
|
// that disappeared between the click and the commit is not a reason
|
|
// to let the next scan bring it back. A path with no row at all is
|
|
// attributed to the library that contains it, resolved below.
|
|
rowByPath := make(map[string]int64, len(rows))
|
|
|
|
for _, row := range rows {
|
|
rowByPath[row.FilePath] = row.LibraryID
|
|
|
|
if err := txq.DeleteAudioFile(l.ctx, row.ID); err != nil {
|
|
return nil, fmt.Errorf("could not delete audio file row: %w", err)
|
|
}
|
|
|
|
result.TracksRemoved++
|
|
|
|
// Keep the file's tagging group in sync, exactly as the scan's
|
|
// orphan cleanup does: drop the count and clear the group once
|
|
// it is empty, or the autotag queue keeps a row counting files
|
|
// that no longer exist.
|
|
if row.GroupKey != "" {
|
|
if err := txq.DecrementTaggingItemTrackCount(l.ctx, row.GroupKey); err != nil {
|
|
return nil, fmt.Errorf("could not decrement tagging group: %w", err)
|
|
}
|
|
|
|
if err := txq.DeleteTaggingItemIfEmpty(l.ctx, row.GroupKey); err != nil {
|
|
return nil, fmt.Errorf("could not clear emptied tagging group: %w", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
libraryIDs, err := l.libraryIDsForPaths(filePaths, rowByPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
for _, path := range filePaths {
|
|
libraryID, known := libraryIDs[path]
|
|
if !known {
|
|
// Outside every configured library: no scan will ever
|
|
// visit it, so there is nothing to exclude it from.
|
|
l.logger.Debug("removal: path belongs to no library, not excluding",
|
|
"path", path)
|
|
|
|
continue
|
|
}
|
|
|
|
if err := txq.ExcludePath(l.ctx, excludeParams(libraryID, path)); err != nil {
|
|
return nil, fmt.Errorf("could not exclude path: %w", err)
|
|
}
|
|
|
|
result.PathsExcluded++
|
|
}
|
|
|
|
if err := tx.Commit(); err != nil {
|
|
return nil, fmt.Errorf("could not commit removal: %w", err)
|
|
}
|
|
|
|
committed = true
|
|
|
|
// Post-commit, and best-effort: the rows are gone either way, and a
|
|
// failure here leaves stale index entries rather than a wrong
|
|
// library. The FTS5 index is contentless, so a stale entry is
|
|
// harmless — searches join track_metadata, which no longer has the
|
|
// row — but removing it keeps the index from growing forever.
|
|
for _, row := range rows {
|
|
if err := l.db.DeleteSearchIndex(row.ID); err != nil {
|
|
l.logger.Warn("could not delete FTS entry for removed track",
|
|
"path", row.FilePath, "id", row.ID, "err", err)
|
|
}
|
|
}
|
|
|
|
// Deleting an audio_files row cascades to queue_tracks, so the
|
|
// queue's in-memory copy now holds tracks the database does not —
|
|
// including, possibly, the one playing. This is the same reload
|
|
// RemoveLibrary does, and it unloads the player if the current
|
|
// track was among them.
|
|
if l.removalHooks.CompactQueue != nil {
|
|
l.removalHooks.CompactQueue()
|
|
}
|
|
|
|
// An album, artist or genre whose last track just went is now a row
|
|
// with nothing behind it, and the album list selects from
|
|
// release_groups rather than from audio_files — so it would keep
|
|
// rendering an album the user has no tracks of.
|
|
l.pruneEmptyEntities()
|
|
|
|
l.emit(events.TracksRemovedFromLibrary, map[string]any{
|
|
"filePaths": filePaths,
|
|
"count": result.TracksRemoved,
|
|
})
|
|
|
|
l.logger.Info("removed tracks from library",
|
|
"requested", len(filePaths),
|
|
"rowsDeleted", result.TracksRemoved,
|
|
"pathsExcluded", result.PathsExcluded,
|
|
)
|
|
|
|
return &result, nil
|
|
}
|
|
|
|
// libraryIDsForPaths maps each path to the library it belongs to. A
|
|
// path that still had a row takes that row's library_id; one that did
|
|
// not is matched against the configured library roots by prefix, which
|
|
// is what the scan walk would do with it.
|
|
func (l *Library) libraryIDsForPaths(
|
|
filePaths []string,
|
|
rowByPath map[string]int64,
|
|
) (map[string]int64, error) {
|
|
out := make(map[string]int64, len(filePaths))
|
|
|
|
var libs []libraryRoot
|
|
|
|
for _, path := range filePaths {
|
|
if libraryID, ok := rowByPath[path]; ok {
|
|
out[path] = libraryID
|
|
|
|
continue
|
|
}
|
|
|
|
if libs == nil {
|
|
var err error
|
|
|
|
libs, err = l.libraryRoots()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
for _, lib := range libs {
|
|
if pathWithin(lib.path, path) {
|
|
out[path] = lib.id
|
|
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
return out, nil
|
|
}
|