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
213 lines
6.8 KiB
Go
213 lines
6.8 KiB
Go
package library
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// ScanMetrics holds timing and count data collected during a library scan.
|
|
// Worker-pool fields are protected by a mutex; DB-writer fields are
|
|
// single-threaded and use plain addition.
|
|
type ScanMetrics struct {
|
|
mu sync.Mutex
|
|
|
|
// Top-level phases (wall-clock).
|
|
Total time.Duration `json:"total"`
|
|
LoadExisting time.Duration `json:"loadExisting"`
|
|
WalkDuration time.Duration `json:"walkDuration"`
|
|
ExtractionWallClock time.Duration `json:"extractionWallClock"`
|
|
DBWritesWallClock time.Duration `json:"dbWritesWallClock"`
|
|
OrphanCleanup time.Duration `json:"orphanCleanup"`
|
|
|
|
// Per-format extraction (cumulative across workers).
|
|
FormatExtraction map[string]int64 `json:"formatExtraction"`
|
|
FormatCount map[string]int64 `json:"formatCount"`
|
|
|
|
// Sub-operation cumulative times (across workers).
|
|
TagExtraction time.Duration `json:"tagExtraction"`
|
|
DurationExtraction time.Duration `json:"durationExtraction"`
|
|
|
|
// DB sub-operations (cumulative, single-threaded DB writer).
|
|
BatchCommits time.Duration `json:"batchCommits"`
|
|
CoverArtSave time.Duration `json:"coverArtSave"`
|
|
|
|
// Thumbnail generation (async worker pool).
|
|
ThumbnailWallClock time.Duration `json:"thumbnailWallClock"`
|
|
ThumbnailGeneration time.Duration `json:"thumbnailGeneration"`
|
|
ThumbnailSmall time.Duration `json:"thumbnailSmall"`
|
|
ThumbnailMedium time.Duration `json:"thumbnailMedium"`
|
|
ThumbnailLarge time.Duration `json:"thumbnailLarge"`
|
|
|
|
// Full-rescan-specific phases.
|
|
ClearQueue time.Duration `json:"clearQueue"`
|
|
ClearDatabase time.Duration `json:"clearDatabase"`
|
|
ClearCoverFiles time.Duration `json:"clearCoverFiles"`
|
|
|
|
// File counts.
|
|
Added int64 `json:"added"`
|
|
Updated int64 `json:"updated"`
|
|
Skipped int64 `json:"skipped"`
|
|
Removed int64 `json:"removed"`
|
|
|
|
// Cancelled is true when the scan was stopped via CancelScan.
|
|
Cancelled bool `json:"cancelled"`
|
|
|
|
// Library identification.
|
|
LibraryID int64 `json:"libraryId"` // library that was scanned
|
|
LibraryName string `json:"libraryName"` // display name of scanned library
|
|
|
|
// Non-fatal issues encountered during scanning.
|
|
Warnings []ScanWarning `json:"warnings"`
|
|
|
|
// onWarning, when set, receives each warning as it is recorded so
|
|
// the scan's job log can show problems live instead of only in the
|
|
// completion payload. Invoked outside the metrics lock.
|
|
onWarning func(ScanWarning) `json:"-"`
|
|
}
|
|
|
|
// ScanProgress is the payload emitted periodically during a scan to
|
|
// report live progress to the frontend.
|
|
type ScanProgress struct {
|
|
Phase string `json:"phase"` // "counting", "scanning", "orphans", "thumbnails"
|
|
Total int64 `json:"total"` // total audio files from pre-walk count
|
|
Processed int64 `json:"processed"` // added + skipped + updated so far
|
|
Added int64 `json:"added"`
|
|
Skipped int64 `json:"skipped"`
|
|
Updated int64 `json:"updated"`
|
|
LibraryID int64 `json:"libraryId"` // library being scanned
|
|
LibraryName string `json:"libraryName"` // display name of library being scanned
|
|
QueuedCount int `json:"queuedCount"` // number of libraries still queued after this one
|
|
}
|
|
|
|
// ScanWarning represents a non-fatal issue encountered during scanning.
|
|
type ScanWarning struct {
|
|
FilePath string `json:"filePath"`
|
|
Phase string `json:"phase"`
|
|
Err string `json:"err"`
|
|
}
|
|
|
|
// timingBreakdown renders the full per-phase timing profile as plain
|
|
// text for the job log. This replaces the metrics table that used to
|
|
// live on the settings page: same numbers, but attached to the scan
|
|
// that produced them and copyable from the job's output pane.
|
|
func (m *ScanMetrics) timingBreakdown() string {
|
|
var b strings.Builder
|
|
|
|
line := func(label string, d time.Duration) {
|
|
b.WriteString(label)
|
|
b.WriteString(": ")
|
|
b.WriteString(d.Round(time.Millisecond).String())
|
|
b.WriteString("\n")
|
|
}
|
|
|
|
line("Total", m.Total)
|
|
|
|
// Full-rescan-only phases; zero on an incremental scan.
|
|
if m.ClearQueue > 0 || m.ClearDatabase > 0 || m.ClearCoverFiles > 0 {
|
|
line(" Clear queue", m.ClearQueue)
|
|
line(" Clear database", m.ClearDatabase)
|
|
line(" Clear cover files", m.ClearCoverFiles)
|
|
}
|
|
|
|
line(" Load existing files", m.LoadExisting)
|
|
line(" Directory walk", m.WalkDuration)
|
|
line(" Metadata extraction (wall clock)", m.ExtractionWallClock)
|
|
line(" Tag extraction (cumulative)", m.TagExtraction)
|
|
line(" Duration extraction (cumulative)", m.DurationExtraction)
|
|
|
|
for format, ms := range m.FormatExtraction {
|
|
b.WriteString(" ")
|
|
b.WriteString(format)
|
|
b.WriteString(" (")
|
|
b.WriteString(strconv.FormatInt(m.FormatCount[format], 10))
|
|
b.WriteString(" files): ")
|
|
b.WriteString((time.Duration(ms) * time.Millisecond).String())
|
|
b.WriteString("\n")
|
|
}
|
|
|
|
line(" DB writes (wall clock)", m.DBWritesWallClock)
|
|
line(" Batch commits", m.BatchCommits)
|
|
line(" Save cover originals", m.CoverArtSave)
|
|
line(" Thumbnails (wall clock)", m.ThumbnailWallClock)
|
|
line(" Cumulative CPU time", m.ThumbnailGeneration)
|
|
line(" Small", m.ThumbnailSmall)
|
|
line(" Medium", m.ThumbnailMedium)
|
|
line(" Large", m.ThumbnailLarge)
|
|
line(" Orphan cleanup", m.OrphanCleanup)
|
|
|
|
return b.String()
|
|
}
|
|
|
|
func newScanMetrics() *ScanMetrics {
|
|
return &ScanMetrics{
|
|
FormatExtraction: make(map[string]int64),
|
|
FormatCount: make(map[string]int64),
|
|
}
|
|
}
|
|
|
|
// addExtraction records per-file extraction timing from a worker
|
|
// goroutine. It is safe for concurrent use.
|
|
func (m *ScanMetrics) addExtraction(
|
|
fileType string,
|
|
tagTime, durationTime time.Duration,
|
|
) {
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
total := tagTime + durationTime
|
|
m.FormatExtraction[fileType] += total.Milliseconds()
|
|
m.FormatCount[fileType]++
|
|
m.TagExtraction += tagTime
|
|
m.DurationExtraction += durationTime
|
|
}
|
|
|
|
// addCoverArtSave records the time spent saving an original cover
|
|
// art file. Called from the single-threaded DB writer.
|
|
func (m *ScanMetrics) addCoverArtSave(d time.Duration) {
|
|
m.CoverArtSave += d
|
|
}
|
|
|
|
// addWarning records a non-fatal scan issue. Safe for concurrent use.
|
|
func (m *ScanMetrics) addWarning(filePath, phase string, err error) {
|
|
warning := ScanWarning{
|
|
FilePath: filePath,
|
|
Phase: phase,
|
|
Err: err.Error(),
|
|
}
|
|
|
|
m.mu.Lock()
|
|
m.Warnings = append(m.Warnings, warning)
|
|
notify := m.onWarning
|
|
m.mu.Unlock()
|
|
|
|
// Called outside the lock: the job registry takes its own locks and
|
|
// must never be able to deadlock against a scan worker.
|
|
if notify != nil {
|
|
notify(warning)
|
|
}
|
|
}
|
|
|
|
// addThumbnailTier records the time spent generating a single
|
|
// thumbnail tier. Safe for concurrent use from the thumbnail
|
|
// worker pool.
|
|
func (m *ScanMetrics) addThumbnailTier(
|
|
suffix string,
|
|
d time.Duration,
|
|
) {
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
m.ThumbnailGeneration += d
|
|
|
|
switch suffix {
|
|
case "_sm":
|
|
m.ThumbnailSmall += d
|
|
case "_md":
|
|
m.ThumbnailMedium += d
|
|
case "_lg":
|
|
m.ThumbnailLarge += d
|
|
}
|
|
}
|