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
@@ -56,6 +56,9 @@ import '@awesome.me/webawesome/dist/components/popup/popup.js';
|
||||
import type WaPopup from '@awesome.me/webawesome/dist/components/popup/popup.js';
|
||||
import '@awesome.me/webawesome/dist/components/dropdown-item/dropdown-item.js';
|
||||
import { dict, dictByName } from '@utils/binding';
|
||||
import type { TrackDetails } from '@components/track-details/track-details.js';
|
||||
import { showTrackDetailsForPath } from '@utils/track-details-opener.js';
|
||||
import '@components/playlist-picker/playlist-picker.js';
|
||||
|
||||
/* ── Constants ── */
|
||||
|
||||
@@ -199,20 +202,33 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
||||
@query('#context-menu')
|
||||
private contextMenuPopup!: WaPopup;
|
||||
|
||||
@query('#playlist-submenu')
|
||||
private playlistSubmenuPopup?: WaPopup;
|
||||
|
||||
@query('track-details')
|
||||
private trackDetailsDialog?: TrackDetails;
|
||||
|
||||
/**
|
||||
* The open menu's file paths, resolved once per open — see the same
|
||||
* field on the album page. Only a track menu ever has any: a
|
||||
* release's tracks are a different question, and adding a whole
|
||||
* album to a playlist from here is not what this item says.
|
||||
*/
|
||||
private ctxMenuPaths: Promise<string[]> | null = null;
|
||||
|
||||
// -- ContextMenuHost interface --
|
||||
// No playlist submenu here, for the same reason as the album page:
|
||||
// every action resolves one recording's file lazily by MBID.
|
||||
|
||||
getContextMenuPopup(): WaPopup | undefined {
|
||||
return this.contextMenuPopup;
|
||||
}
|
||||
|
||||
getPlaylistSubmenuPopup(): WaPopup | undefined {
|
||||
return undefined;
|
||||
return this.playlistSubmenuPopup;
|
||||
}
|
||||
|
||||
onContextMenuClose(): void {
|
||||
this.ctxMenuTarget = null;
|
||||
this.ctxMenuPaths = null;
|
||||
}
|
||||
|
||||
/** The open menu's track, or null when it is not a track menu. */
|
||||
@@ -1313,10 +1329,13 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
||||
}
|
||||
}
|
||||
|
||||
// Discography: fetch albums by artist ID and seed thumbnails
|
||||
// Discography: fetch the artist's albums and seed thumbnails
|
||||
// directly from library cover art.
|
||||
try {
|
||||
const albums = await GetAlbumsByArtist(this.localArtistId);
|
||||
const albums = await GetAlbumsByArtist(
|
||||
this.artistName,
|
||||
libraryStore.libraryFilter(),
|
||||
);
|
||||
const thumbUpdates = new Map(this.thumbnailURLs);
|
||||
let thumbsChanged = false;
|
||||
|
||||
@@ -2231,7 +2250,9 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
||||
);
|
||||
}
|
||||
|
||||
private onContextMenuAction(action: 'play' | 'add-to-queue' | 'play-next'): void {
|
||||
private onContextMenuAction(
|
||||
action: 'play' | 'add-to-queue' | 'play-next' | 'track-details',
|
||||
): void {
|
||||
const track = this.ctxMenuTrack;
|
||||
|
||||
this.ctxMenu.close();
|
||||
@@ -2248,6 +2269,88 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
||||
case 'play-next':
|
||||
void this.queueTrackNext(track);
|
||||
break;
|
||||
case 'track-details':
|
||||
void this.openTrackDetails(track);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Open the "Add to Playlist" submenu for the track the menu is on.
|
||||
*
|
||||
* The path is resolved on demand rather than at menu-open time —
|
||||
* the release menus that share this panel never need one, and a
|
||||
* right-click on a track is not a statement that a playlist is
|
||||
* coming. A menu closed while the lookup was in flight must not
|
||||
* sprout a submenu afterwards.
|
||||
*/
|
||||
private async openPlaylistSubmenu(explicit: boolean): Promise<void> {
|
||||
const track = this.ctxMenuTrack;
|
||||
|
||||
if (!track || !this.isTrackOwned(track)) return;
|
||||
|
||||
this.ctxMenu.clearSubmenuCloseTimer();
|
||||
this.ctxMenuPaths ??= this.trackFilePath(track).then((p) =>
|
||||
p ? [p] : []);
|
||||
|
||||
let paths: string[] = [];
|
||||
|
||||
try {
|
||||
paths = await this.ctxMenuPaths;
|
||||
} catch (error) {
|
||||
console.error('Could not resolve the track’s file:', error);
|
||||
this.ctxMenuPaths = null;
|
||||
}
|
||||
|
||||
if (!this.ctxMenu.contextMenuOpen) return;
|
||||
|
||||
if (paths.length === 0) {
|
||||
// Only an explicit activation gets an answer. A hover is how
|
||||
// a submenu is *reached*, including on the way to the item
|
||||
// below it — reporting a failure from one would put an error
|
||||
// on screen for a menu the user was only passing through,
|
||||
// and closing the menu under the pointer is worse still.
|
||||
if (!explicit) return;
|
||||
|
||||
this.ctxMenu.close();
|
||||
notificationStore.inline(ExploreArtistRegion, {
|
||||
text: 'This track could not be found in your library.',
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
await this.ctxMenu.showPlaylistSubmenu(paths);
|
||||
}
|
||||
|
||||
/**
|
||||
* The details dialog for an owned top track.
|
||||
*
|
||||
* The dialog wants the library's `Track` and this page has the
|
||||
* catalog's recording, so the route in is the same MBID → file path
|
||||
* resolution the playback actions use.
|
||||
*/
|
||||
private async openTrackDetails(track: LBTopRecording): Promise<void> {
|
||||
try {
|
||||
const path = await this.trackFilePath(track);
|
||||
const outcome = path
|
||||
? await showTrackDetailsForPath(
|
||||
() => this.trackDetailsDialog,
|
||||
path,
|
||||
() => void this.openTrackDetails(track),
|
||||
)
|
||||
: 'not-in-library';
|
||||
|
||||
if (outcome === 'not-in-library') {
|
||||
notificationStore.inline(ExploreArtistRegion, {
|
||||
text: 'This track could not be found in your library.',
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Could not open track details:', error);
|
||||
notificationStore.inline(ExploreArtistRegion, {
|
||||
text: describeError(error, 'Could not open track details.'),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2458,6 +2561,7 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
||||
testid="artist-action-message"
|
||||
></inline-notice>
|
||||
${this.renderContextMenu()}
|
||||
<track-details></track-details>
|
||||
`;
|
||||
}
|
||||
|
||||
@@ -2529,6 +2633,29 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
||||
`
|
||||
: nothing}
|
||||
</wa-popup>
|
||||
|
||||
<wa-popup
|
||||
id="playlist-submenu"
|
||||
placement="right-start"
|
||||
flip
|
||||
shift
|
||||
.active=${this.ctxMenu.playlistSubmenuOpen}
|
||||
>
|
||||
${this.ctxMenu.playlistSubmenuOpen
|
||||
? html`
|
||||
<div
|
||||
@mouseenter=${() => this.ctxMenu.clearSubmenuCloseTimer()}
|
||||
@mouseleave=${this.ctxMenu.scheduleSubmenuClose}
|
||||
>
|
||||
<playlist-picker
|
||||
.filePaths=${this.ctxMenu.playlistFilePaths}
|
||||
@playlist-action-complete=${this.ctxMenu.onPlaylistActionComplete}
|
||||
@click=${(e: Event) => e.stopPropagation()}
|
||||
></playlist-picker>
|
||||
</div>
|
||||
`
|
||||
: nothing}
|
||||
</wa-popup>
|
||||
`;
|
||||
}
|
||||
|
||||
@@ -2536,21 +2663,53 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
||||
return html`
|
||||
${this.isTrackOwned(track)
|
||||
? html`
|
||||
<wa-dropdown-item @click=${() => this.onContextMenuAction('play')}>
|
||||
<wa-dropdown-item
|
||||
@click=${() => this.onContextMenuAction('play')}
|
||||
@mouseenter=${() => this.ctxMenu.closePlaylistSubmenu()}
|
||||
>
|
||||
<wa-icon slot="icon" name="play"></wa-icon>
|
||||
Play
|
||||
</wa-dropdown-item>
|
||||
<wa-dropdown-item @click=${() => this.onContextMenuAction('add-to-queue')}>
|
||||
<wa-dropdown-item
|
||||
@click=${() => this.onContextMenuAction('add-to-queue')}
|
||||
@mouseenter=${() => this.ctxMenu.closePlaylistSubmenu()}
|
||||
>
|
||||
<wa-icon slot="icon" name="plus"></wa-icon>
|
||||
Add to Queue
|
||||
</wa-dropdown-item>
|
||||
<wa-dropdown-item @click=${() => this.onContextMenuAction('play-next')}>
|
||||
<wa-dropdown-item
|
||||
@click=${() => this.onContextMenuAction('play-next')}
|
||||
@mouseenter=${() => this.ctxMenu.closePlaylistSubmenu()}
|
||||
>
|
||||
<wa-icon slot="icon" name="forward-step"></wa-icon>
|
||||
Play Next
|
||||
</wa-dropdown-item>
|
||||
<wa-dropdown-item
|
||||
class="submenu-item"
|
||||
@mouseenter=${() => void this.openPlaylistSubmenu(false)}
|
||||
@mouseleave=${this.ctxMenu.scheduleSubmenuClose}
|
||||
@click=${(e: Event) => {
|
||||
e.stopPropagation();
|
||||
void this.openPlaylistSubmenu(true);
|
||||
}}
|
||||
>
|
||||
<wa-icon slot="icon" name="plus"></wa-icon>
|
||||
Add to Playlist
|
||||
<span class="submenu-arrow">▶</span>
|
||||
</wa-dropdown-item>
|
||||
<wa-dropdown-item
|
||||
@click=${() => this.onContextMenuAction('track-details')}
|
||||
@mouseenter=${() => this.ctxMenu.closePlaylistSubmenu()}
|
||||
>
|
||||
<wa-icon slot="icon" name="circle-info"></wa-icon>
|
||||
Track Details
|
||||
</wa-dropdown-item>
|
||||
`
|
||||
: nothing}
|
||||
<wa-dropdown-item @click=${() => this.viewTrackOnMusicBrainz()}>
|
||||
<wa-dropdown-item
|
||||
@click=${() => this.viewTrackOnMusicBrainz()}
|
||||
@mouseenter=${() => this.ctxMenu.closePlaylistSubmenu()}
|
||||
>
|
||||
<wa-icon slot="icon" name="globe"></wa-icon>
|
||||
View on MusicBrainz
|
||||
</wa-dropdown-item>
|
||||
|
||||
Reference in New Issue
Block a user