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
+35
-312
@@ -10,7 +10,6 @@ import (
|
||||
_ "image/png" // Register PNG decoder.
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"golang.org/x/image/draw"
|
||||
@@ -44,24 +43,22 @@ var thumbnailTiers = []thumbnailTier{
|
||||
{Suffix: "_lg", MaxSize: 400, Quality: 85},
|
||||
}
|
||||
|
||||
// legacyThumbSuffix is the old single-thumbnail suffix used before the
|
||||
// multi-tier system. Kept for migration purposes only.
|
||||
const legacyThumbSuffix = "_thumb"
|
||||
// largestTier is the tier stored as the cover's canonical file.
|
||||
func largestTier() thumbnailTier {
|
||||
return thumbnailTiers[len(thumbnailTiers)-1]
|
||||
}
|
||||
|
||||
// CoverArtFileSet returns every file on disk belonging to one cover art
|
||||
// entry: the original plus each generated size variant, plus the legacy
|
||||
// _thumb file for databases that predate the multi-tier thumbnails.
|
||||
// entry: each generated size variant.
|
||||
//
|
||||
// Only the original is recorded in cover_art.file_path — the variants
|
||||
// are derived filenames — so any code deleting cover art has to expand
|
||||
// the set or the thumbnails are orphaned.
|
||||
func CoverArtFileSet(originalPath string) []string {
|
||||
dir := filepath.Dir(originalPath)
|
||||
base := filepath.Base(originalPath)
|
||||
// Only one of them is recorded in cover_art.file_path — the others are
|
||||
// derived filenames — so any code deleting cover art has to expand the
|
||||
// set or the rest are orphaned.
|
||||
func CoverArtFileSet(coverPath string) []string {
|
||||
dir := filepath.Dir(coverPath)
|
||||
base := filepath.Base(coverPath)
|
||||
|
||||
paths := make([]string, 0, len(thumbnailTiers)+2) //nolint:mnd
|
||||
|
||||
paths = append(paths, originalPath)
|
||||
paths := make([]string, 0, len(thumbnailTiers))
|
||||
|
||||
for _, tier := range thumbnailTiers {
|
||||
paths = append(paths, filepath.Join(
|
||||
@@ -69,25 +66,7 @@ func CoverArtFileSet(originalPath string) []string {
|
||||
))
|
||||
}
|
||||
|
||||
return append(paths, filepath.Join(
|
||||
dir, coverart.SizedFilename(base, legacyThumbSuffix),
|
||||
))
|
||||
}
|
||||
|
||||
// isSizedVariant reports whether a filename contains any known size suffix
|
||||
// (current tiers or legacy).
|
||||
func isSizedVariant(name string) bool {
|
||||
if strings.Contains(name, legacyThumbSuffix) {
|
||||
return true
|
||||
}
|
||||
|
||||
for _, tier := range thumbnailTiers {
|
||||
if strings.Contains(name, tier.Suffix) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
return paths
|
||||
}
|
||||
|
||||
// saveCoverArt saves embedded cover art to the cache directory.
|
||||
@@ -121,47 +100,30 @@ func (l *Library) saveCoverArt(
|
||||
)
|
||||
}
|
||||
|
||||
// Generate filename from content hash (deduplication).
|
||||
// The content hash identifies the cover and dedupes it; the largest
|
||||
// tier is what gets stored under that name.
|
||||
//
|
||||
// The full-resolution image used to be written here too, and it was
|
||||
// 1,134 MB of a 1.4 GB covers directory on a real library - against
|
||||
// 110 MB for all three tiers together - with nothing rendering it.
|
||||
// The bytes are still in the audio file if a bigger one is ever
|
||||
// needed, which is where these came from.
|
||||
hash := sha256.Sum256(pic.Data)
|
||||
hashStr := hex.EncodeToString(hash[:8]) // First 8 bytes = 16 hex chars.
|
||||
|
||||
ext := pic.Ext
|
||||
if ext == "" {
|
||||
ext = extensionFromMIME(pic.MIMEType)
|
||||
}
|
||||
filePath := filepath.Join(
|
||||
coverDir, coverart.SizedFilename(hashStr, largestTier().Suffix),
|
||||
)
|
||||
|
||||
filename := fmt.Sprintf("%s.%s", hashStr, ext)
|
||||
filePath := filepath.Join(coverDir, filename)
|
||||
|
||||
// Skip if already exists (same content hash).
|
||||
// Missing sized variants are handled by
|
||||
// generateMissingSizedVariants() at the end of a scan.
|
||||
// Skip if this cover has already been stored (same content hash).
|
||||
if _, err := os.Stat(filePath); err == nil {
|
||||
l.logger.Debug(
|
||||
"cover art already exists", "path", filePath,
|
||||
)
|
||||
l.logger.Debug("cover art already stored", "path", filePath)
|
||||
|
||||
return filePath, nil
|
||||
}
|
||||
|
||||
// Write file.
|
||||
if err := os.WriteFile(
|
||||
filePath, pic.Data, 0o644,
|
||||
); err != nil {
|
||||
return "", fmt.Errorf(
|
||||
"could not write cover art: %w", err,
|
||||
)
|
||||
}
|
||||
|
||||
metrics.addCoverArtSave(time.Since(saveStart))
|
||||
|
||||
l.logger.Debug(
|
||||
"saved cover art",
|
||||
"path", filePath, "size", len(pic.Data),
|
||||
)
|
||||
|
||||
// Dispatch thumbnail generation to the async worker pool
|
||||
// if available, otherwise generate inline.
|
||||
// Dispatch thumbnail generation to the async worker pool if
|
||||
// available, otherwise generate inline.
|
||||
if thumbChan != nil {
|
||||
thumbChan <- thumbnailWork{
|
||||
imgData: pic.Data,
|
||||
@@ -169,38 +131,18 @@ func (l *Library) saveCoverArt(
|
||||
hashStr: hashStr,
|
||||
metrics: metrics,
|
||||
}
|
||||
} else {
|
||||
if err := l.generateSizedVariantsWithMetrics(
|
||||
pic.Data, coverDir, hashStr, metrics,
|
||||
); err != nil {
|
||||
l.logger.Warn(
|
||||
"could not generate sized variants",
|
||||
"path", filePath, "err", err,
|
||||
)
|
||||
}
|
||||
} else if err := l.generateSizedVariantsWithMetrics(
|
||||
pic.Data, coverDir, hashStr, metrics,
|
||||
); err != nil {
|
||||
l.logger.Warn("could not generate sized variants",
|
||||
"path", filePath, "err", err)
|
||||
}
|
||||
|
||||
metrics.addCoverArtSave(time.Since(saveStart))
|
||||
|
||||
return filePath, nil
|
||||
}
|
||||
|
||||
// generateSizedVariants creates all thumbnail tiers for the given image data.
|
||||
// Each tier is saved as {hashStr}{suffix}.jpg in the given directory.
|
||||
func (l *Library) generateSizedVariants(
|
||||
imgData []byte,
|
||||
dir, hashStr string,
|
||||
) error {
|
||||
src, _, err := image.Decode(bytes.NewReader(imgData))
|
||||
if err != nil {
|
||||
return fmt.Errorf(
|
||||
"could not decode image for thumbnails: %w", err,
|
||||
)
|
||||
}
|
||||
|
||||
l.generateTiersFromImage(src, dir, hashStr)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// generateSizedVariantsWithMetrics is like generateSizedVariants
|
||||
// but records per-tier timing in the provided metrics.
|
||||
func (l *Library) generateSizedVariantsWithMetrics(
|
||||
@@ -257,46 +199,6 @@ func (l *Library) generateSizedVariantsWithMetrics(
|
||||
return nil
|
||||
}
|
||||
|
||||
// generateTiersFromImage creates all thumbnail tiers from an
|
||||
// already-decoded image.
|
||||
func (l *Library) generateTiersFromImage(
|
||||
src image.Image,
|
||||
dir, hashStr string,
|
||||
) {
|
||||
bounds := src.Bounds()
|
||||
srcW := bounds.Dx()
|
||||
srcH := bounds.Dy()
|
||||
|
||||
for _, tier := range thumbnailTiers {
|
||||
tierPath := filepath.Join(
|
||||
dir,
|
||||
fmt.Sprintf("%s%s.jpg", hashStr, tier.Suffix),
|
||||
)
|
||||
|
||||
w, h := fitDimensions(srcW, srcH, tier.MaxSize)
|
||||
|
||||
if err := encodeAndSaveImage(
|
||||
src, tierPath, w, h, tier.Quality,
|
||||
); err != nil {
|
||||
l.logger.Warn(
|
||||
"could not generate sized variant",
|
||||
"tier", tier.Suffix,
|
||||
"path", tierPath,
|
||||
"err", err,
|
||||
)
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
l.logger.Debug(
|
||||
"saved sized variant",
|
||||
"tier", tier.Suffix,
|
||||
"path", tierPath,
|
||||
"dimensions", fmt.Sprintf("%dx%d", w, h),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// fitDimensions calculates the output dimensions that fit within maxSize
|
||||
// while preserving the aspect ratio. If the source is already smaller
|
||||
// than maxSize, the original dimensions are returned unchanged.
|
||||
@@ -343,182 +245,3 @@ func encodeAndSaveImage(
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// generateMissingSizedVariants scans the covers directory, migrates legacy
|
||||
// _thumb files to _md, and generates any missing sized variants for each
|
||||
// original cover art file.
|
||||
func (l *Library) generateMissingSizedVariants() error {
|
||||
coverDir, err := coverart.CoversDir()
|
||||
if err != nil {
|
||||
return fmt.Errorf(
|
||||
"could not resolve covers directory: %w", err,
|
||||
)
|
||||
}
|
||||
|
||||
entries, err := os.ReadDir(coverDir)
|
||||
if err != nil {
|
||||
return fmt.Errorf(
|
||||
"could not read covers directory: %w", err,
|
||||
)
|
||||
}
|
||||
|
||||
// Build a set of existing filenames for quick lookup.
|
||||
existing := make(map[string]struct{}, len(entries))
|
||||
|
||||
for _, entry := range entries {
|
||||
if !entry.IsDir() {
|
||||
existing[entry.Name()] = struct{}{}
|
||||
}
|
||||
}
|
||||
|
||||
// First pass: migrate legacy _thumb files to _md.
|
||||
migrated := l.migrateLegacyThumbs(
|
||||
coverDir, existing,
|
||||
)
|
||||
|
||||
// Second pass: generate missing sized variants.
|
||||
var generated, skipped int
|
||||
|
||||
for _, entry := range entries {
|
||||
name := entry.Name()
|
||||
|
||||
// Skip directories and any sized variants.
|
||||
if entry.IsDir() || isSizedVariant(name) {
|
||||
continue
|
||||
}
|
||||
|
||||
hashStr := strings.SplitN(name, ".", 2)[0]
|
||||
|
||||
// Check which tiers are missing.
|
||||
allPresent := true
|
||||
|
||||
for _, tier := range thumbnailTiers {
|
||||
tierName := fmt.Sprintf(
|
||||
"%s%s.jpg", hashStr, tier.Suffix,
|
||||
)
|
||||
if _, exists := existing[tierName]; !exists {
|
||||
allPresent = false
|
||||
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if allPresent {
|
||||
skipped++
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
// Read the original and generate missing tiers.
|
||||
imgData, err := os.ReadFile(
|
||||
filepath.Join(coverDir, name),
|
||||
)
|
||||
if err != nil {
|
||||
l.logger.Warn(
|
||||
"could not read cover art for variant generation",
|
||||
"file", name, "err", err,
|
||||
)
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if err := l.generateSizedVariants(
|
||||
imgData, coverDir, hashStr,
|
||||
); err != nil {
|
||||
l.logger.Warn(
|
||||
"could not generate sized variants",
|
||||
"file", name, "err", err,
|
||||
)
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
generated++
|
||||
}
|
||||
|
||||
l.logger.Info(
|
||||
"sized variant generation complete",
|
||||
"generated", generated,
|
||||
"skipped", skipped,
|
||||
"migrated", migrated,
|
||||
)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// migrateLegacyThumbs renames _thumb.jpg files to _md.jpg.
|
||||
// Returns the number of files migrated.
|
||||
func (l *Library) migrateLegacyThumbs(
|
||||
coverDir string,
|
||||
existing map[string]struct{},
|
||||
) int {
|
||||
var migrated int
|
||||
|
||||
for name := range existing {
|
||||
if !strings.Contains(name, legacyThumbSuffix) {
|
||||
continue
|
||||
}
|
||||
|
||||
// Derive the _md name from the legacy name.
|
||||
mdName := strings.Replace(
|
||||
name, legacyThumbSuffix, "_md", 1,
|
||||
)
|
||||
|
||||
oldPath := filepath.Join(coverDir, name)
|
||||
newPath := filepath.Join(coverDir, mdName)
|
||||
|
||||
// Only rename if _md doesn't already exist.
|
||||
if _, exists := existing[mdName]; exists {
|
||||
// Both exist; remove the legacy file.
|
||||
if err := os.Remove(oldPath); err != nil {
|
||||
l.logger.Warn(
|
||||
"could not remove legacy thumbnail",
|
||||
"file", name, "err", err,
|
||||
)
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if err := os.Rename(oldPath, newPath); err != nil {
|
||||
l.logger.Warn(
|
||||
"could not migrate legacy thumbnail",
|
||||
"from", name, "to", mdName, "err", err,
|
||||
)
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
// Update the existing set so subsequent lookups
|
||||
// see the new name.
|
||||
delete(existing, name)
|
||||
existing[mdName] = struct{}{}
|
||||
|
||||
migrated++
|
||||
|
||||
l.logger.Debug(
|
||||
"migrated legacy thumbnail",
|
||||
"from", name, "to", mdName,
|
||||
)
|
||||
}
|
||||
|
||||
return migrated
|
||||
}
|
||||
|
||||
// extensionFromMIME returns a file extension for common image MIME types.
|
||||
func extensionFromMIME(mimeType string) string {
|
||||
switch mimeType {
|
||||
case "image/jpeg":
|
||||
return "jpg"
|
||||
case "image/png":
|
||||
return "png"
|
||||
case "image/gif":
|
||||
return "gif"
|
||||
case "image/webp":
|
||||
return "webp"
|
||||
case "image/bmp":
|
||||
return "bmp"
|
||||
default:
|
||||
return "jpg" // Default to jpg.
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user