Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e5c6b9f7a |
No files matched your search
@@ -779,7 +779,6 @@ func (yj *YellowJacketApp) startJanitor() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
yj.janitor.Register(maintenance.ExpiredHTTPCacheJob(yj.database))
|
yj.janitor.Register(maintenance.ExpiredHTTPCacheJob(yj.database))
|
||||||
yj.janitor.Register(maintenance.StaleArtistMetadataJob(yj.database))
|
|
||||||
yj.janitor.Register(maintenance.StaleSearchClicksJob(yj.database))
|
yj.janitor.Register(maintenance.StaleSearchClicksJob(yj.database))
|
||||||
yj.janitor.Register(maintenance.OrphanedCoverFilesJob(
|
yj.janitor.Register(maintenance.OrphanedCoverFilesJob(
|
||||||
yj.database, coversDir, library.CoverArtFileSet,
|
yj.database, coversDir, library.CoverArtFileSet,
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Preserving a playlist entry across the loss of its track is two
|
// Preserving a playlist entry across the loss of its track is two
|
||||||
@@ -90,14 +89,12 @@ const (
|
|||||||
// metadata on the entry itself, so the entry survives the rows being
|
// metadata on the entry itself, so the entry survives the rows being
|
||||||
// deleted underneath it.
|
// deleted underneath it.
|
||||||
//
|
//
|
||||||
// Every path that empties `audio_files` must call this (or the scoped
|
// Every path that empties `audio_files` must call this first, inside
|
||||||
// variant below) first, inside the same transaction as the delete.
|
// the same transaction as the delete. There are two such paths and
|
||||||
// These paths have drifted before: the full rescan in backend/library
|
// they had drifted: the full rescan in backend/library did this and the
|
||||||
// did this and the stale-shape retire in this package did not, so the
|
// stale-shape retire in this package did not, so the *documented*
|
||||||
// *documented* repair ("delete and rescan") preserved playlists while
|
// repair ("delete and rescan") preserved playlists while the automatic
|
||||||
// the automatic one that exists to spare the user that work silently
|
// one that exists to spare the user that work silently emptied them.
|
||||||
// emptied them (#183). The incremental scan's orphan cleanup and
|
|
||||||
// RemoveFromLibrary drifted the same way and are #246.
|
|
||||||
//
|
//
|
||||||
// The display half is skipped, with a warning, when `track_metadata`
|
// The display half is skipped, with a warning, when `track_metadata`
|
||||||
// cannot answer -- see the note above. Skipping it costs a phantom
|
// cannot answer -- see the note above. Skipping it costs a phantom
|
||||||
@@ -106,39 +103,13 @@ const (
|
|||||||
func PreservePlaylistPhantoms(
|
func PreservePlaylistPhantoms(
|
||||||
ctx context.Context, tx *sql.Tx, logger *slog.Logger,
|
ctx context.Context, tx *sql.Tx, logger *slog.Logger,
|
||||||
) error {
|
) error {
|
||||||
return preservePlaylistPhantoms(ctx, tx, nil, logger)
|
if _, err := tx.ExecContext(ctx, preservePhantomPathSQL); err != nil {
|
||||||
}
|
|
||||||
|
|
||||||
// PreservePlaylistPhantomsForFiles is PreservePlaylistPhantoms scoped to
|
|
||||||
// the given audio file ids, for the two removal paths that delete a
|
|
||||||
// known subset of the table rather than all of it: the incremental
|
|
||||||
// scan's orphan cleanup and RemoveFromLibrary. A bulk pass there would
|
|
||||||
// rewrite every linked playlist row on every scan for nothing.
|
|
||||||
func PreservePlaylistPhantomsForFiles(
|
|
||||||
ctx context.Context, tx *sql.Tx, ids []int64, logger *slog.Logger,
|
|
||||||
) error {
|
|
||||||
return preservePlaylistPhantoms(ctx, tx, ids, logger)
|
|
||||||
}
|
|
||||||
|
|
||||||
func preservePlaylistPhantoms(
|
|
||||||
ctx context.Context, tx *sql.Tx, ids []int64, logger *slog.Logger,
|
|
||||||
) error {
|
|
||||||
clause, args, skip := phantomIDFilter(ids)
|
|
||||||
if skip {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := tx.ExecContext(
|
|
||||||
ctx, preservePhantomPathSQL+clause, args...,
|
|
||||||
); err != nil {
|
|
||||||
return fmt.Errorf(
|
return fmt.Errorf(
|
||||||
"could not preserve playlist track file paths: %w", err,
|
"could not preserve playlist track file paths: %w", err,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := tx.ExecContext(
|
if _, err := tx.ExecContext(ctx, preservePhantomDisplaySQL); err != nil {
|
||||||
ctx, preservePhantomDisplaySQL+clause, args...,
|
|
||||||
); err != nil {
|
|
||||||
// A failed statement does not roll back a SQLite transaction,
|
// A failed statement does not roll back a SQLite transaction,
|
||||||
// so the path half above stands and the entries remain
|
// so the path half above stands and the entries remain
|
||||||
// re-linkable.
|
// re-linkable.
|
||||||
@@ -152,26 +123,3 @@ func preservePlaylistPhantoms(
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// phantomIDFilter builds the extra WHERE terms and arguments that scope
|
|
||||||
// a preservation pass to a set of audio file ids. A nil ids returns the
|
|
||||||
// empty clause (a bulk run over every linked entry); an empty slice
|
|
||||||
// reports skip, since there is nothing to preserve.
|
|
||||||
func phantomIDFilter(ids []int64) (clause string, args []any, skip bool) {
|
|
||||||
switch {
|
|
||||||
case ids == nil:
|
|
||||||
return "", nil, false
|
|
||||||
case len(ids) == 0:
|
|
||||||
return "", nil, true
|
|
||||||
}
|
|
||||||
|
|
||||||
clause = " AND audio_file_id IN (" +
|
|
||||||
strings.Repeat("?,", len(ids)-1) + "?)"
|
|
||||||
|
|
||||||
args = make([]any, len(ids))
|
|
||||||
for i, id := range ids {
|
|
||||||
args[i] = id
|
|
||||||
}
|
|
||||||
|
|
||||||
return clause, args, false
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
package database
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"database/sql"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
// TestPreservePlaylistPhantomsForFilesScopesToTheRequestedIDs is the
|
|
||||||
// scoping half of the scoped variant: a run over one file's id must
|
|
||||||
// fill that file's playlist entries and leave every other entry alone,
|
|
||||||
// because the incremental scan calls this once per orphan batch and a
|
|
||||||
// pass that rewrote the whole table would touch every playlist row on
|
|
||||||
// every scan.
|
|
||||||
func TestPreservePlaylistPhantomsForFilesScopesToTheRequestedIDs(t *testing.T) {
|
|
||||||
ctx := context.Background()
|
|
||||||
db := openRaw(t, t.TempDir())
|
|
||||||
|
|
||||||
if _, err := db.ExecContext(ctx, "PRAGMA foreign_keys = ON"); err != nil {
|
|
||||||
t.Fatalf("pragma: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := applySchema(ctx, db); err != nil {
|
|
||||||
t.Fatalf("applySchema: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := db.ExecContext(ctx, `
|
|
||||||
INSERT INTO playlists (id, name) VALUES (1, 'keepme');
|
|
||||||
INSERT INTO libraries (id, name, path) VALUES (0, 'test', '/music');
|
|
||||||
INSERT INTO artists (id, name) VALUES (3, 'Aurora Fields');
|
|
||||||
INSERT INTO cover_art (id, file_path, mime_type)
|
|
||||||
VALUES (9, 'covers/7.jpg', 'image/jpeg');
|
|
||||||
INSERT INTO albums (id, name, artist_id, cover_art_id)
|
|
||||||
VALUES (4, 'Tideline', 3, 9);
|
|
||||||
INSERT INTO audio_files
|
|
||||||
(id, file_path, file_type_id, length_milliseconds,
|
|
||||||
title, artist_credit, artist_id, album_id)
|
|
||||||
VALUES
|
|
||||||
(7, '/music/a.flac', 1, 1000,
|
|
||||||
'Slack Water', 'Aurora Fields', 3, 4),
|
|
||||||
(8, '/music/b.flac', 1, 2000,
|
|
||||||
'Second Tide', 'Aurora Fields', 3, 4);
|
|
||||||
INSERT INTO playlist_tracks (playlist_id, audio_file_id, position)
|
|
||||||
VALUES (1, 7, 0), (1, 8, 1);
|
|
||||||
`); err != nil {
|
|
||||||
t.Fatalf("seed: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
tx, err := db.BeginTx(ctx, nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("begin: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
defer func() { _ = tx.Rollback() }()
|
|
||||||
|
|
||||||
if err := PreservePlaylistPhantomsForFiles(
|
|
||||||
ctx, tx, []int64{7}, testLogger(),
|
|
||||||
); err != nil {
|
|
||||||
t.Fatalf("preserve: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(); err != nil {
|
|
||||||
t.Fatalf("commit: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var filled, untouched sql.NullString
|
|
||||||
|
|
||||||
if err := db.QueryRowContext(ctx,
|
|
||||||
"SELECT phantom_file_path FROM playlist_tracks WHERE audio_file_id = 7",
|
|
||||||
).Scan(&filled); err != nil {
|
|
||||||
t.Fatalf("read the requested entry: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if filled.String != "/music/a.flac" {
|
|
||||||
t.Errorf(
|
|
||||||
"requested entry phantom_file_path = %q, want %q",
|
|
||||||
filled.String, "/music/a.flac",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := db.QueryRowContext(ctx,
|
|
||||||
"SELECT phantom_file_path FROM playlist_tracks WHERE audio_file_id = 8",
|
|
||||||
).Scan(&untouched); err != nil {
|
|
||||||
t.Fatalf("read the untouched entry: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if untouched.Valid {
|
|
||||||
t.Errorf(
|
|
||||||
"untouched entry got phantom_file_path = %q, want NULL "+
|
|
||||||
"(a scoped run must not rewrite the whole table)",
|
|
||||||
untouched.String,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -383,13 +383,9 @@ func (si *SearchIndex) topByPopularity(
|
|||||||
// MusicBrainz IDs, so this never touches the library tables and asks
|
// MusicBrainz IDs, so this never touches the library tables and asks
|
||||||
// one query rather than one per artist.
|
// one query rather than one per artist.
|
||||||
//
|
//
|
||||||
// **The row is drawn at random, and that is the whole point of it.**
|
// The artists are drawn most-popular-owned-album first, so a large
|
||||||
// Ordered by popularity it was a second leaderboard: the same handful of
|
// library's pool is the part of it the user is likeliest to recognise
|
||||||
// big names appeared every time the page opened, which is not what "you
|
// rather than whichever artists sort first.
|
||||||
// own one album by these artists" is saying. The pool is still bounded
|
|
||||||
// to `pool` artists — a 4 000-artist library does not need all of them
|
|
||||||
// ranked — but which of them, and which of their albums, is `RANDOM()`,
|
|
||||||
// so the shelf is a different sample each visit.
|
|
||||||
func (si *SearchIndex) unownedAlbumsBySinglyOwnedArtists(
|
func (si *SearchIndex) unownedAlbumsBySinglyOwnedArtists(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
pool, limit int,
|
pool, limit int,
|
||||||
@@ -400,17 +396,15 @@ func (si *SearchIndex) unownedAlbumsBySinglyOwnedArtists(
|
|||||||
WHERE entity_type = 2 /* release_group */
|
WHERE entity_type = 2 /* release_group */
|
||||||
AND in_library = 0
|
AND in_library = 0
|
||||||
AND artist_mbid IN (
|
AND artist_mbid IN (
|
||||||
SELECT artist_mbid FROM (
|
|
||||||
SELECT artist_mbid FROM explore_index
|
SELECT artist_mbid FROM explore_index
|
||||||
WHERE entity_type = 2 /* release_group */
|
WHERE entity_type = 2 /* release_group */
|
||||||
AND in_library = 1
|
AND in_library = 1
|
||||||
AND artist_mbid != x''
|
AND artist_mbid != x''
|
||||||
GROUP BY artist_mbid
|
GROUP BY artist_mbid
|
||||||
HAVING COUNT(*) = 1
|
HAVING COUNT(*) = 1
|
||||||
)
|
ORDER BY MAX(popularity) DESC
|
||||||
ORDER BY RANDOM()
|
|
||||||
LIMIT ?)
|
LIMIT ?)
|
||||||
ORDER BY RANDOM()
|
ORDER BY popularity DESC
|
||||||
LIMIT ?`,
|
LIMIT ?`,
|
||||||
pool, limit,
|
pool, limit,
|
||||||
))
|
))
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package explore
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"sort"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"yellowjacket/backend/database"
|
"yellowjacket/backend/database"
|
||||||
@@ -203,11 +202,6 @@ func TestShelves_MoreFromOwnedNeedsExactlyOneOwnedAlbum(t *testing.T) {
|
|||||||
titles = append(titles, album.Title)
|
titles = append(titles, album.Title)
|
||||||
}
|
}
|
||||||
|
|
||||||
// The row is a random sample, so the *set* is what is asserted and
|
|
||||||
// not the order — see `unownedAlbumsBySinglyOwnedArtists` for why
|
|
||||||
// the ordering was given up.
|
|
||||||
sort.Strings(titles)
|
|
||||||
|
|
||||||
if len(titles) != 2 || titles[0] != "Second" || titles[1] != "Third" {
|
if len(titles) != 2 || titles[0] != "Second" || titles[1] != "Third" {
|
||||||
t.Fatalf("albums = %v, want [Second Third]", titles)
|
t.Fatalf("albums = %v, want [Second Third]", titles)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package library
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"database/sql"
|
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"image"
|
"image"
|
||||||
@@ -70,77 +69,6 @@ func CoverArtFileSet(coverPath string) []string {
|
|||||||
return paths
|
return paths
|
||||||
}
|
}
|
||||||
|
|
||||||
// sweepOrphanedCoverArt deletes the cover_art rows no album references
|
|
||||||
// and returns their file paths, for the caller to remove from disk
|
|
||||||
// after the transaction commits. Cover art is referenced only by
|
|
||||||
// albums.cover_art_id, so an orphan is a cover whose album is gone —
|
|
||||||
// which is every album the caller just swept.
|
|
||||||
//
|
|
||||||
// One implementation because the scan path, RemoveFromLibrary and
|
|
||||||
// RemoveLibrary all reach this state, and the scan side used to skip it
|
|
||||||
// entirely while RemoveLibrary did it inline (#247).
|
|
||||||
func (l *Library) sweepOrphanedCoverArt(tx *sql.Tx) ([]string, error) {
|
|
||||||
const orphanSQL = `
|
|
||||||
SELECT file_path FROM cover_art WHERE id NOT IN (
|
|
||||||
SELECT DISTINCT cover_art_id FROM albums
|
|
||||||
WHERE cover_art_id IS NOT NULL
|
|
||||||
)`
|
|
||||||
|
|
||||||
rows, err := tx.QueryContext(l.ctx, orphanSQL)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("could not query orphaned cover art: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var paths []string
|
|
||||||
|
|
||||||
for rows.Next() {
|
|
||||||
var filePath string
|
|
||||||
|
|
||||||
if err := rows.Scan(&filePath); err != nil {
|
|
||||||
l.logger.Warn("could not scan cover art path", "err", err)
|
|
||||||
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
paths = append(paths, filePath)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close before the DELETE: the two run on the one writer connection.
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
l.logger.Warn("could not close cover art rows", "err", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(paths) > 0 {
|
|
||||||
if _, err := tx.ExecContext(l.ctx, `
|
|
||||||
DELETE FROM cover_art WHERE id NOT IN (
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return paths, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// removeCoverArtFiles removes a cover original and its derived size
|
|
||||||
// variants. Only the original is stored in cover_art.file_path; the
|
|
||||||
// _sm/_md/_lg tiers are derived filenames beside it, so they have to be
|
|
||||||
// removed by name or they accumulate forever.
|
|
||||||
func (l *Library) removeCoverArtFiles(coverPaths []string) {
|
|
||||||
for _, coverPath := range coverPaths {
|
|
||||||
for _, path := range CoverArtFileSet(coverPath) {
|
|
||||||
if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
|
|
||||||
l.logger.Warn(
|
|
||||||
"could not remove orphaned cover art file",
|
|
||||||
"path", path,
|
|
||||||
"err", err,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// saveCoverArt saves embedded cover art to the cache directory.
|
// saveCoverArt saves embedded cover art to the cache directory.
|
||||||
// Returns the file path where the art was saved, or empty string
|
// Returns the file path where the art was saved, or empty string
|
||||||
// if no picture data. Timing is recorded in the provided metrics.
|
// if no picture data. Timing is recorded in the provided metrics.
|
||||||
|
|||||||
+50
-8
@@ -320,12 +320,43 @@ func (l *Library) RemoveLibrary(id int64) (*RemovalSummary, error) {
|
|||||||
|
|
||||||
genresRemoved, _ := result.RowsAffected()
|
genresRemoved, _ := result.RowsAffected()
|
||||||
|
|
||||||
// Collect and delete orphaned cover_art rows before the commit. The
|
// 15. Collect orphaned cover_art file paths for post-commit cleanup.
|
||||||
// shared helper is the one place this sweep lives, so the scan path,
|
// SAFETY: Hand-crafted SELECT for orphaned cover art identification.
|
||||||
// RemoveFromLibrary and this removal cannot drift (#247).
|
// Parameterless.
|
||||||
orphanedCoverArtPaths, err := l.sweepOrphanedCoverArt(tx)
|
rows, err := tx.QueryContext(l.ctx,
|
||||||
|
`SELECT file_path FROM cover_art WHERE id NOT IN (
|
||||||
|
SELECT DISTINCT cover_art_id FROM albums
|
||||||
|
WHERE cover_art_id IS NOT NULL
|
||||||
|
)`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, fmt.Errorf("could not query orphaned cover art: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var orphanedCoverArtPaths []string
|
||||||
|
|
||||||
|
for rows.Next() {
|
||||||
|
var filePath string
|
||||||
|
if err := rows.Scan(&filePath); err != nil {
|
||||||
|
l.logger.Warn("could not scan cover art path", "err", err)
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
orphanedCoverArtPaths = append(orphanedCoverArtPaths, filePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := rows.Close(); err != nil {
|
||||||
|
l.logger.Warn("could not close cover art rows", "err", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 16. Delete orphaned cover_art rows.
|
||||||
|
// 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 albums
|
||||||
|
WHERE cover_art_id IS NOT NULL
|
||||||
|
)`); err != nil {
|
||||||
|
return nil, fmt.Errorf("could not delete orphaned cover_art: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 17. Delete the library's tagging queue. tagging_items holds a
|
// 17. Delete the library's tagging queue. tagging_items holds a
|
||||||
@@ -361,9 +392,20 @@ func (l *Library) RemoveLibrary(id int64) (*RemovalSummary, error) {
|
|||||||
// avoids a costly full re-index of all remaining tracks (~10s for
|
// avoids a costly full re-index of all remaining tracks (~10s for
|
||||||
// 25K tracks).
|
// 25K tracks).
|
||||||
|
|
||||||
// Post-commit: remove the orphaned cover art files and their sized
|
// 21. Post-commit: Delete orphaned cover art files and their sized
|
||||||
// variants.
|
// variants. Only the original is stored in cover_art.file_path; the
|
||||||
l.removeCoverArtFiles(orphanedCoverArtPaths)
|
// _sm/_md/_lg thumbnails are derived filenames beside it, so they
|
||||||
|
// have to be removed by name or they accumulate forever.
|
||||||
|
for _, coverPath := range orphanedCoverArtPaths {
|
||||||
|
for _, path := range CoverArtFileSet(coverPath) {
|
||||||
|
if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
|
||||||
|
l.logger.Warn("could not remove orphaned cover art file",
|
||||||
|
"path", path,
|
||||||
|
"err", err,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 22. Post-commit: Compact queue.
|
// 22. Post-commit: Compact queue.
|
||||||
if l.removalHooks.CompactQueue != nil {
|
if l.removalHooks.CompactQueue != nil {
|
||||||
|
|||||||
+28
-103
@@ -911,96 +911,30 @@ func (l *Library) scanInternal(
|
|||||||
|
|
||||||
orphanStart := time.Now()
|
orphanStart := time.Now()
|
||||||
|
|
||||||
// Snapshot the orphan set first. The playlist-phantom
|
|
||||||
// preservation and the deletes are one transaction (the
|
|
||||||
// preservation has to land before the ON DELETE SET NULL, and
|
|
||||||
// both have to succeed or neither does), and the ids are what
|
|
||||||
// scope that preservation to just these files instead of
|
|
||||||
// rewriting every playlist row on a routine scan.
|
|
||||||
var (
|
|
||||||
orphans []sqlcgen.AudioFile
|
|
||||||
orphanPaths []string
|
|
||||||
)
|
|
||||||
|
|
||||||
existingPaths.Range(func(key, value any) bool {
|
existingPaths.Range(func(key, value any) bool {
|
||||||
orphanPaths = append(orphanPaths, key.(string))
|
path := key.(string)
|
||||||
orphans = append(orphans, value.(sqlcgen.AudioFile))
|
audioFile := value.(sqlcgen.AudioFile)
|
||||||
|
|
||||||
return true
|
l.logger.Debug(
|
||||||
})
|
"removing orphaned database entry",
|
||||||
|
"path", path, "id", audioFile.ID,
|
||||||
deleted := make([]bool, len(orphans))
|
|
||||||
|
|
||||||
if len(orphans) > 0 {
|
|
||||||
orphanIDs := make([]int64, len(orphans))
|
|
||||||
for i, f := range orphans {
|
|
||||||
orphanIDs[i] = f.ID
|
|
||||||
}
|
|
||||||
|
|
||||||
tx, beginErr := l.db.BeginTx()
|
|
||||||
if beginErr != nil {
|
|
||||||
metrics.addWarning("", "orphan", beginErr)
|
|
||||||
} else {
|
|
||||||
defer func() { _ = tx.Rollback() }() // no-op after commit
|
|
||||||
|
|
||||||
if err := database.PreservePlaylistPhantomsForFiles(
|
|
||||||
l.ctx, tx, orphanIDs, l.logger,
|
|
||||||
); err != nil {
|
|
||||||
// Deleting without the phantoms is exactly the
|
|
||||||
// playlist-emptying bug the preservation exists to
|
|
||||||
// prevent, so leave the rows for the next scan
|
|
||||||
// rather than empty the playlists now.
|
|
||||||
l.logger.Error(
|
|
||||||
"skipping orphan deletion: could not preserve "+
|
|
||||||
"playlist entries",
|
|
||||||
"err", err,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
metrics.addWarning("", "orphan", err)
|
if err := l.db.Queries.DeleteAudioFile(
|
||||||
|
l.ctx, audioFile.ID,
|
||||||
_ = tx.Rollback()
|
|
||||||
} else {
|
|
||||||
txq := l.db.Queries.WithTx(tx)
|
|
||||||
|
|
||||||
for i, f := range orphans {
|
|
||||||
if err := txq.DeleteAudioFile(
|
|
||||||
l.ctx, f.ID,
|
|
||||||
); err != nil {
|
); err != nil {
|
||||||
l.logger.Warn(
|
l.logger.Warn(
|
||||||
"failed to delete orphaned audio file",
|
"failed to delete orphaned audio file",
|
||||||
"path", orphanPaths[i],
|
"path", path,
|
||||||
"id", f.ID,
|
"id", audioFile.ID,
|
||||||
"err", err,
|
"err", err,
|
||||||
)
|
)
|
||||||
|
|
||||||
metrics.addWarning(orphanPaths[i], "orphan", err)
|
metrics.addWarning(path, "orphan", err)
|
||||||
|
|
||||||
continue
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
deleted[i] = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(); err != nil {
|
|
||||||
l.logger.Error(
|
|
||||||
"could not commit orphan deletion",
|
|
||||||
"err", err,
|
|
||||||
)
|
|
||||||
|
|
||||||
metrics.addWarning("", "orphan", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Post-commit bookkeeping for the files that actually went.
|
|
||||||
for i, f := range orphans {
|
|
||||||
if !deleted[i] {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
path := orphanPaths[i]
|
|
||||||
|
|
||||||
// Keep the file's tagging group in sync: drop the group's
|
// Keep the file's tagging group in sync: drop the group's
|
||||||
// track count and clear it out once empty, mirroring the
|
// track count and clear it out once empty, mirroring the
|
||||||
// bookkeeping maybeRebindTaggingGroup does for a group_key
|
// bookkeeping maybeRebindTaggingGroup does for a group_key
|
||||||
@@ -1008,25 +942,25 @@ func (l *Library) scanInternal(
|
|||||||
// and replaced leaves a stale tagging_items row behind —
|
// and replaced leaves a stale tagging_items row behind —
|
||||||
// its track_count still counts the deleted files, and it
|
// its track_count still counts the deleted files, and it
|
||||||
// never clears from the autotag queue.
|
// never clears from the autotag queue.
|
||||||
if f.GroupKey != "" {
|
if audioFile.GroupKey != "" {
|
||||||
if err := l.db.Queries.DecrementTaggingItemTrackCount(
|
if err := l.db.Queries.DecrementTaggingItemTrackCount(
|
||||||
l.ctx, f.GroupKey,
|
l.ctx, audioFile.GroupKey,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
l.logger.Warn(
|
l.logger.Warn(
|
||||||
"failed to decrement tagging group for orphan",
|
"failed to decrement tagging group for orphan",
|
||||||
"path", path,
|
"path", path,
|
||||||
"group_key", f.GroupKey,
|
"group_key", audioFile.GroupKey,
|
||||||
"err", err,
|
"err", err,
|
||||||
)
|
)
|
||||||
|
|
||||||
metrics.addWarning(path, "orphan", err)
|
metrics.addWarning(path, "orphan", err)
|
||||||
} else if err := l.db.Queries.DeleteTaggingItemIfEmpty(
|
} else if err := l.db.Queries.DeleteTaggingItemIfEmpty(
|
||||||
l.ctx, f.GroupKey,
|
l.ctx, audioFile.GroupKey,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
l.logger.Warn(
|
l.logger.Warn(
|
||||||
"failed to clean up emptied tagging group for orphan",
|
"failed to clean up emptied tagging group for orphan",
|
||||||
"path", path,
|
"path", path,
|
||||||
"group_key", f.GroupKey,
|
"group_key", audioFile.GroupKey,
|
||||||
"err", err,
|
"err", err,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1035,20 +969,24 @@ func (l *Library) scanInternal(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Remove from FTS5 search index and the lyrics index.
|
// Remove from FTS5 search index and the lyrics index.
|
||||||
if err := l.db.DeleteSearchIndex(f.ID); err != nil {
|
if err := l.db.DeleteSearchIndex(
|
||||||
|
audioFile.ID,
|
||||||
|
); err != nil {
|
||||||
l.logger.Warn(
|
l.logger.Warn(
|
||||||
"failed to delete FTS entry for orphan",
|
"failed to delete FTS entry for orphan",
|
||||||
"id", f.ID,
|
"id", audioFile.ID,
|
||||||
"err", err,
|
"err", err,
|
||||||
)
|
)
|
||||||
|
|
||||||
metrics.addWarning(path, "orphan", err)
|
metrics.addWarning(path, "orphan", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := l.db.DeleteLyricsIndex(f.ID); err != nil {
|
if err := l.db.DeleteLyricsIndex(
|
||||||
|
audioFile.ID,
|
||||||
|
); err != nil {
|
||||||
l.logger.Warn(
|
l.logger.Warn(
|
||||||
"failed to delete lyrics index entry for orphan",
|
"failed to delete lyrics index entry for orphan",
|
||||||
"id", f.ID,
|
"id", audioFile.ID,
|
||||||
"err", err,
|
"err", err,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1056,7 +994,9 @@ func (l *Library) scanInternal(
|
|||||||
}
|
}
|
||||||
|
|
||||||
removed.Add(1)
|
removed.Add(1)
|
||||||
}
|
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
metrics.OrphanCleanup = time.Since(orphanStart)
|
metrics.OrphanCleanup = time.Since(orphanStart)
|
||||||
|
|
||||||
@@ -1265,32 +1205,17 @@ func (l *Library) pruneEmptyEntities() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cover art after albums: a cover whose album just went is
|
|
||||||
// unreferenced, and leaving the row behind keeps its files exempt
|
|
||||||
// from the janitor's covers sweep forever (#247).
|
|
||||||
orphanedCovers, err := l.sweepOrphanedCoverArt(tx)
|
|
||||||
if err != nil {
|
|
||||||
l.logger.Warn("could not sweep orphaned cover art", "err", err)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := tx.Commit(); err != nil {
|
if err := tx.Commit(); err != nil {
|
||||||
l.logger.Warn("could not commit entity cleanup", "err", err)
|
l.logger.Warn("could not commit entity cleanup", "err", err)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Post-commit: the rows are gone, so their files can go too.
|
if len(albumIDs) > 0 || len(artistIDs) > 0 || len(genreIDs) > 0 {
|
||||||
l.removeCoverArtFiles(orphanedCovers)
|
|
||||||
|
|
||||||
if len(albumIDs) > 0 || len(artistIDs) > 0 || len(genreIDs) > 0 ||
|
|
||||||
len(orphanedCovers) > 0 {
|
|
||||||
l.logger.Info("pruned empty library entities",
|
l.logger.Info("pruned empty library entities",
|
||||||
"albums", len(albumIDs),
|
"albums", len(albumIDs),
|
||||||
"artists", len(artistIDs),
|
"artists", len(artistIDs),
|
||||||
"genres", len(genreIDs),
|
"genres", len(genreIDs),
|
||||||
"covers", len(orphanedCovers),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,57 +94,6 @@ func countRows(
|
|||||||
return n
|
return n
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveFromLibrary is the one path that empties a track *deliberately*:
|
|
||||||
// the file stays on disk but is excluded, so nothing re-imports it. The
|
|
||||||
// playlist entry must still survive as a re-linkable phantom rather than
|
|
||||||
// an empty row, because a later full rescan clears the exclusion and is
|
|
||||||
// what re-links the entry then (#246).
|
|
||||||
func TestRemoveFromLibrary_PreservesPlaylistPhantoms(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
lib, db := setupTestLibrary(t)
|
|
||||||
|
|
||||||
seedRemovableLibrary(t, lib, "/nonexistent/cover.jpg")
|
|
||||||
|
|
||||||
if _, err := lib.db.ExecContext(
|
|
||||||
`INSERT INTO playlists (name) VALUES ('keepme')`,
|
|
||||||
); err != nil {
|
|
||||||
t.Fatalf("seed playlist: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
playlistID := queryInt(
|
|
||||||
t, db, `SELECT id FROM playlists WHERE name = 'keepme'`,
|
|
||||||
)
|
|
||||||
|
|
||||||
if _, err := lib.db.ExecContext(
|
|
||||||
`INSERT INTO playlist_tracks (playlist_id, audio_file_id, position)
|
|
||||||
SELECT ?, id, 0 FROM audio_files
|
|
||||||
WHERE file_path = '/music/song.mp3'`,
|
|
||||||
playlistID,
|
|
||||||
); err != nil {
|
|
||||||
t.Fatalf("seed playlist_tracks: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := lib.RemoveFromLibrary([]string{"/music/song.mp3"}); err != nil {
|
|
||||||
t.Fatalf("RemoveFromLibrary: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
phantomPath := queryString(
|
|
||||||
t, db,
|
|
||||||
`SELECT phantom_file_path FROM playlist_tracks
|
|
||||||
WHERE playlist_id = ?`,
|
|
||||||
playlistID,
|
|
||||||
)
|
|
||||||
|
|
||||||
if phantomPath != "/music/song.mp3" {
|
|
||||||
t.Fatalf(
|
|
||||||
"phantom_file_path is %q, want %q -- the entry cannot be "+
|
|
||||||
"re-linked after a later full rescan",
|
|
||||||
phantomPath, "/music/song.mp3",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// A library with tagging_items must still be removable. tagging_items
|
// A library with tagging_items must still be removable. tagging_items
|
||||||
// FK-references libraries with no ON DELETE clause, so leaving those
|
// FK-references libraries with no ON DELETE clause, so leaving those
|
||||||
// rows behind fails the DELETE and rolls back the entire removal.
|
// rows behind fails the DELETE and rolls back the entire removal.
|
||||||
@@ -249,53 +198,3 @@ func TestCoverArtFileSet(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Removing the last track of an album must take the album's cover art
|
|
||||||
// with it — both the row and every derived file — or the row keeps its
|
|
||||||
// files exempt from the janitor's covers sweep forever (#247).
|
|
||||||
func TestRemoveFromLibrary_DeletesOrphanedCoverArt(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
lib, _ := setupTestLibrary(t)
|
|
||||||
|
|
||||||
dir := t.TempDir()
|
|
||||||
|
|
||||||
// The largest tier is what cover_art.file_path names; write every
|
|
||||||
// variant so the sweep has a real set to remove.
|
|
||||||
for _, tier := range thumbnailTiers {
|
|
||||||
p := filepath.Join(dir, coverart.SizedFilename("abc123.jpg", tier.Suffix))
|
|
||||||
if err := os.WriteFile(p, []byte("img"), 0o600); err != nil {
|
|
||||||
t.Fatalf("write %s: %v", p, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cover := filepath.Join(dir, coverart.SizedFilename("abc123.jpg", "_lg"))
|
|
||||||
|
|
||||||
seedRemovableLibrary(t, lib, cover)
|
|
||||||
|
|
||||||
// Link the album to the cover so it is not orphaned until the track
|
|
||||||
// (and with it the album) goes.
|
|
||||||
if _, err := lib.db.ExecContext(
|
|
||||||
`UPDATE albums SET cover_art_id =
|
|
||||||
(SELECT id FROM cover_art WHERE file_path = ?)
|
|
||||||
WHERE name = 'Test Album'`,
|
|
||||||
cover,
|
|
||||||
); err != nil {
|
|
||||||
t.Fatalf("link cover art: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := lib.RemoveFromLibrary([]string{"/music/song.mp3"}); err != nil {
|
|
||||||
t.Fatalf("RemoveFromLibrary: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if n := countRows(t, lib, "cover_art"); n != 0 {
|
|
||||||
t.Errorf("cover_art has %d rows after removal, want 0", n)
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tier := range thumbnailTiers {
|
|
||||||
p := filepath.Join(dir, coverart.SizedFilename("abc123.jpg", tier.Suffix))
|
|
||||||
if _, err := os.Stat(p); !os.IsNotExist(err) {
|
|
||||||
t.Errorf("cover art file still present: %s", filepath.Base(p))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"yellowjacket/backend/database"
|
|
||||||
"yellowjacket/backend/events"
|
"yellowjacket/backend/events"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -58,25 +57,6 @@ func (l *Library) RemoveFromLibrary(filePaths []string) (*RemovalResult, error)
|
|||||||
|
|
||||||
var result RemovalResult
|
var result RemovalResult
|
||||||
|
|
||||||
// Preserve the playlist entries before the rows go, so they survive
|
|
||||||
// as re-linkable phantoms rather than empty rows. The track is
|
|
||||||
// excluded and will not be re-imported on its own, but a later full
|
|
||||||
// rescan clears the exclusion and this is what lets the entry
|
|
||||||
// re-link then — the same preservation every other path that empties
|
|
||||||
// audio_files performs (#246).
|
|
||||||
rowIDs := make([]int64, len(rows))
|
|
||||||
for i, row := range rows {
|
|
||||||
rowIDs[i] = row.ID
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := database.PreservePlaylistPhantomsForFiles(
|
|
||||||
l.ctx, tx, rowIDs, l.logger,
|
|
||||||
); err != nil {
|
|
||||||
return nil, fmt.Errorf(
|
|
||||||
"could not preserve playlist entries for removal: %w", err,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exclude every path the caller named, including one whose row has
|
// 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
|
// 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
|
// that disappeared between the click and the commit is not a reason
|
||||||
|
|||||||
@@ -231,98 +231,3 @@ func TestScan_MultipleDirectoriesDoNotCrossContaminate(t *testing.T) {
|
|||||||
t.Errorf("Album A and Album B must not share a group_key: %+v", keys)
|
t.Errorf("Album A and Album B must not share a group_key: %+v", keys)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestScan_OrphanCleanupPreservesPlaylistPhantoms guards #246: a file
|
|
||||||
// deleted from the library folder *outside* YellowJacket is discovered
|
|
||||||
// as an orphan by the next scan, and its playlist entry must survive as
|
|
||||||
// a re-linkable phantom — the same preservation the full rescan and
|
|
||||||
// stale-retire paths already perform, scoped here to just the orphaned
|
|
||||||
// file. Before the fix the entry became an empty row (audio_file_id
|
|
||||||
// NULL and no phantom_file_path), which nothing can ever re-link.
|
|
||||||
func TestScan_OrphanCleanupPreservesPlaylistPhantoms(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
lib, db := setupTestLibrary(t)
|
|
||||||
|
|
||||||
root := t.TempDir()
|
|
||||||
track := filepath.Join(root, "gone.mp3")
|
|
||||||
|
|
||||||
writeTestTrack(t, track, 0)
|
|
||||||
|
|
||||||
library, err := db.Queries.CreateLibrary(lib.ctx, sqlcgen.CreateLibraryParams{
|
|
||||||
Name: "orphans",
|
|
||||||
Path: root,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("create library: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if metrics := lib.scanInternal(library.ID, library.Name, library.Path); metrics == nil {
|
|
||||||
t.Fatal("first scan returned nil metrics")
|
|
||||||
}
|
|
||||||
|
|
||||||
trackID := queryInt(
|
|
||||||
t, db, "SELECT id FROM audio_files WHERE file_path = ?", track,
|
|
||||||
)
|
|
||||||
if trackID == 0 {
|
|
||||||
t.Fatal("first scan did not import the track")
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := db.ExecContext(
|
|
||||||
`INSERT INTO playlists (name) VALUES ('keepme')`,
|
|
||||||
); err != nil {
|
|
||||||
t.Fatalf("seed playlist: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
playlistID := queryInt(
|
|
||||||
t, db, "SELECT id FROM playlists WHERE name = 'keepme'",
|
|
||||||
)
|
|
||||||
|
|
||||||
if _, err := db.ExecContext(
|
|
||||||
`INSERT INTO playlist_tracks (playlist_id, audio_file_id, position)
|
|
||||||
VALUES (?, ?, 0)`,
|
|
||||||
playlistID, trackID,
|
|
||||||
); err != nil {
|
|
||||||
t.Fatalf("seed playlist_tracks: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// The file goes away outside the app.
|
|
||||||
if err := os.Remove(track); err != nil {
|
|
||||||
t.Fatalf("remove track: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if metrics := lib.scanInternal(library.ID, library.Name, library.Path); metrics == nil {
|
|
||||||
t.Fatal("second scan returned nil metrics")
|
|
||||||
}
|
|
||||||
|
|
||||||
if n := queryInt(
|
|
||||||
t, db, "SELECT COUNT(*) FROM audio_files WHERE file_path = ?", track,
|
|
||||||
); n != 0 {
|
|
||||||
t.Fatalf("audio_files still holds the removed path: %d rows", n)
|
|
||||||
}
|
|
||||||
|
|
||||||
if n := queryInt(
|
|
||||||
t, db,
|
|
||||||
"SELECT COUNT(*) FROM playlist_tracks WHERE playlist_id = ? "+
|
|
||||||
"AND audio_file_id IS NULL",
|
|
||||||
playlistID,
|
|
||||||
); n != 1 {
|
|
||||||
t.Fatalf(
|
|
||||||
"playlist entry did not become a phantom: %d null-id rows, want 1",
|
|
||||||
n,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
phantomPath := queryString(
|
|
||||||
t, db,
|
|
||||||
"SELECT phantom_file_path FROM playlist_tracks WHERE playlist_id = ?",
|
|
||||||
playlistID,
|
|
||||||
)
|
|
||||||
if phantomPath != track {
|
|
||||||
t.Fatalf(
|
|
||||||
"phantom_file_path = %q, want %q -- the entry cannot be "+
|
|
||||||
"re-linked if the file comes back",
|
|
||||||
phantomPath, track,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -667,74 +667,6 @@ func TestExpiredHTTPCacheJob_TrimsToBudget(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestStaleArtistMetadataJob pins the sweep's two keep rules: an owned
|
|
||||||
// artist's metadata survives, a browsed artist's survives while it still
|
|
||||||
// holds cached artwork, and everything else goes (#248).
|
|
||||||
func TestStaleArtistMetadataJob(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
|
|
||||||
db := database.NewTestDB(t)
|
|
||||||
|
|
||||||
const (
|
|
||||||
ownedMBID = "11111111-1111-1111-1111-111111111111"
|
|
||||||
browsedMBID = "22222222-2222-2222-2222-222222222222"
|
|
||||||
staleMBID = "33333333-3333-3333-3333-333333333333"
|
|
||||||
)
|
|
||||||
|
|
||||||
// The owned artist is in the library - which means a *file* says
|
|
||||||
// so. An artists row on its own is not ownership.
|
|
||||||
database.InsertTestTrack(t, db, database.TestTrack{
|
|
||||||
FilePath: "/music/owned.mp3",
|
|
||||||
Artist: "Owned",
|
|
||||||
ArtistMBID: ownedMBID,
|
|
||||||
})
|
|
||||||
|
|
||||||
for _, mbid := range []string{ownedMBID, browsedMBID, staleMBID} {
|
|
||||||
if _, err := db.ExecContext(
|
|
||||||
`INSERT INTO artist_metadata (mbid, source, data, fetched_at)
|
|
||||||
VALUES (?, 'wikidata-p18', x'00', CURRENT_TIMESTAMP)`,
|
|
||||||
mbid,
|
|
||||||
); err != nil {
|
|
||||||
t.Fatalf("seed artist_metadata for %s: %v", mbid, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// The browsed artist holds cached artwork, so its metadata is still
|
|
||||||
// referenced and must survive.
|
|
||||||
if _, err := db.ExecContext(
|
|
||||||
`INSERT INTO artist_images
|
|
||||||
(artist_mbid, source, source_url, file_path)
|
|
||||||
VALUES (?, 'test', 'http://x', '/art/primary.jpg')`,
|
|
||||||
browsedMBID,
|
|
||||||
); err != nil {
|
|
||||||
t.Fatalf("seed artist_images: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := StaleArtistMetadataJob(db).Run(context.Background()); err != nil {
|
|
||||||
t.Fatalf("run job: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range []struct {
|
|
||||||
mbid string
|
|
||||||
want int
|
|
||||||
}{
|
|
||||||
{ownedMBID, 1},
|
|
||||||
{browsedMBID, 1},
|
|
||||||
{staleMBID, 0},
|
|
||||||
} {
|
|
||||||
var n int
|
|
||||||
if err := db.QueryRowWriter(
|
|
||||||
"SELECT COUNT(*) FROM artist_metadata WHERE mbid = ?", tc.mbid,
|
|
||||||
).Scan(&n); err != nil {
|
|
||||||
t.Fatalf("count %s: %v", tc.mbid, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if n != tc.want {
|
|
||||||
t.Errorf("artist_metadata rows for %s = %d, want %d", tc.mbid, n, tc.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TestStaleSearchClicksJob deletes only the clicks old enough to have
|
// TestStaleSearchClicksJob deletes only the clicks old enough to have
|
||||||
// left the retention window (#249).
|
// left the retention window (#249).
|
||||||
func TestStaleSearchClicksJob(t *testing.T) {
|
func TestStaleSearchClicksJob(t *testing.T) {
|
||||||
|
|||||||
@@ -629,40 +629,6 @@ func dirSize(dir string) (bytes, files int64) {
|
|||||||
return bytes, files
|
return bytes, files
|
||||||
}
|
}
|
||||||
|
|
||||||
// StaleArtistMetadataJob evicts long-lived artist metadata (bios, wiki
|
|
||||||
// leads, relationships) for artists the user no longer has any reason
|
|
||||||
// to keep around: not owned and holding no cached artwork.
|
|
||||||
//
|
|
||||||
// artist_metadata has no TTL by design — entity data changes rarely and
|
|
||||||
// re-fetching spends someone else's rate limit — so without a sweep it
|
|
||||||
// grows for the life of the install. This is the "swept when the
|
|
||||||
// artist is no longer referenced" contract the datamap always declared
|
|
||||||
// for it and nothing ever performed (#248).
|
|
||||||
func StaleArtistMetadataJob(db *database.DB) Job {
|
|
||||||
return Job{
|
|
||||||
Name: "artist-metadata-sweep",
|
|
||||||
MinInterval: dailyInterval,
|
|
||||||
Run: func(_ context.Context) (Result, error) {
|
|
||||||
res, err := db.ExecContext(
|
|
||||||
`DELETE FROM artist_metadata
|
|
||||||
WHERE mbid NOT IN (` + ownedArtistMBIDs + `)
|
|
||||||
AND mbid NOT IN (
|
|
||||||
SELECT artist_mbid FROM artist_images
|
|
||||||
)`,
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return Result{}, fmt.Errorf(
|
|
||||||
"delete stale artist_metadata rows: %w", err,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
rows, _ := res.RowsAffected()
|
|
||||||
|
|
||||||
return Result{RowsDeleted: rows}, nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// searchClicksRetention is how long a search-click ranking signal stays
|
// searchClicksRetention is how long a search-click ranking signal stays
|
||||||
// useful. search_clicks is authored behavioural data — nothing that
|
// useful. search_clicks is authored behavioural data — nothing that
|
||||||
// owns a row ever drops it — so age is the ceiling that keeps the table
|
// owns a row ever drops it — so age is the ceiling that keeps the table
|
||||||
|
|||||||
@@ -56,16 +56,6 @@ export function CycleRepeat(): $CancellablePromise<void> {
|
|||||||
return $Call.ByID(3510519482);
|
return $Call.ByID(3510519482);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* DropSourceForPlaylist clears the queue's "Playing from" label when
|
|
||||||
* its source playlist is deleted. A link back to a playlist that no
|
|
||||||
* longer exists is worse than none, and the label otherwise survives
|
|
||||||
* the deletion until the next SetQueue (#249).
|
|
||||||
*/
|
|
||||||
export function DropSourceForPlaylist(playlistID: number): $CancellablePromise<void> {
|
|
||||||
return $Call.ByID(1435106374, playlistID);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EmitCurrentState emits the current queue state to the frontend.
|
* EmitCurrentState emits the current queue state to the frontend.
|
||||||
* This is called after the frontend DOM is ready.
|
* This is called after the frontend DOM is ready.
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!--! Font Awesome Free 7.3.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2026 Fonticons, Inc. --><path fill="currentColor" d="M9.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l192 192c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L77.3 256 246.6 86.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-192 192z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 476 B |
@@ -60,7 +60,6 @@ import '@awesome.me/webawesome/dist/components/dropdown-item/dropdown-item.js';
|
|||||||
import { dictByName } from '@utils/binding';
|
import { dictByName } from '@utils/binding';
|
||||||
import type { TrackDetails } from '@components/track-details/track-details.js';
|
import type { TrackDetails } from '@components/track-details/track-details.js';
|
||||||
import { showTrackDetailsForPath } from '@utils/track-details-opener.js';
|
import { showTrackDetailsForPath } from '@utils/track-details-opener.js';
|
||||||
import { openMusicBrainz } from '@utils/external-link';
|
|
||||||
import '@components/playlist-picker/playlist-picker.js';
|
import '@components/playlist-picker/playlist-picker.js';
|
||||||
import {
|
import {
|
||||||
ICON_CAN_REQUEST,
|
ICON_CAN_REQUEST,
|
||||||
@@ -2943,7 +2942,7 @@ export class ExploreAlbumDetails extends LitElement implements ContextMenuHost {
|
|||||||
|
|
||||||
if (!track?.mbid) return;
|
if (!track?.mbid) return;
|
||||||
|
|
||||||
openMusicBrainz(`/recording/${track.mbid}`);
|
window.open(`https://musicbrainz.org/recording/${track.mbid}`, '_blank', 'noopener');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ import { customElement, property, state, query } from 'lit/decorators.js';
|
|||||||
import { classMap } from 'lit/directives/class-map.js';
|
import { classMap } from 'lit/directives/class-map.js';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
import { backButton } from '../../styles/back-button.css';
|
import { backButton } from '../../styles/back-button.css';
|
||||||
import { albumCardStyles } from '../../styles/album-card.css';
|
|
||||||
import '../scroll-row/scroll-row.js';
|
|
||||||
import {
|
import {
|
||||||
LookupArtist,
|
LookupArtist,
|
||||||
BrowseReleaseGroups,
|
BrowseReleaseGroups,
|
||||||
@@ -48,8 +46,11 @@ import {
|
|||||||
libraryStatusFor,
|
libraryStatusFor,
|
||||||
toggleRequest,
|
toggleRequest,
|
||||||
} from '@utils/library-status';
|
} from '@utils/library-status';
|
||||||
import { isOwned, ownershipLabel } from '@utils/ownership';
|
import {
|
||||||
import { openMusicBrainz } from '@utils/external-link';
|
isOwned,
|
||||||
|
ownershipLabel,
|
||||||
|
unownedStyles,
|
||||||
|
} from '@utils/ownership';
|
||||||
import { completenessStore } from '@store/completeness-store';
|
import { completenessStore } from '@store/completeness-store';
|
||||||
import '../catalog-scope-notice/catalog-scope-notice.js';
|
import '../catalog-scope-notice/catalog-scope-notice.js';
|
||||||
import type { CatalogScope } from '../catalog-scope-notice/catalog-scope-notice.js';
|
import type { CatalogScope } from '../catalog-scope-notice/catalog-scope-notice.js';
|
||||||
@@ -61,7 +62,6 @@ import {
|
|||||||
ContextMenuController,
|
ContextMenuController,
|
||||||
contextMenuStyles,
|
contextMenuStyles,
|
||||||
isContextMenuKey,
|
isContextMenuKey,
|
||||||
MenuKeyboard,
|
|
||||||
} from '@utils/context-menu-controller.js';
|
} from '@utils/context-menu-controller.js';
|
||||||
import type { ContextMenuHost, MenuTarget } from '@utils/context-menu-controller.js';
|
import type { ContextMenuHost, MenuTarget } from '@utils/context-menu-controller.js';
|
||||||
import '@awesome.me/webawesome/dist/components/popup/popup.js';
|
import '@awesome.me/webawesome/dist/components/popup/popup.js';
|
||||||
@@ -187,11 +187,11 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
@state() private topReleasesExpanded = false;
|
@state() private topReleasesExpanded = false;
|
||||||
private topSectionStacked = false;
|
private topSectionStacked = false;
|
||||||
private topSectionObserver?: ResizeObserver;
|
private topSectionObserver?: ResizeObserver;
|
||||||
|
@state() private expandedDiscoGroups = new Set<string>();
|
||||||
/** Whether the Play button's Shuffle dropdown is up. */
|
/** Number of album cards that fit in one row of the discography grid. */
|
||||||
@state() private playMenuOpen = false;
|
@state() private discoRowSize = 5;
|
||||||
private playMenuKeyboard = new MenuKeyboard(() => this.closePlayMenu());
|
private discoObserver?: ResizeObserver;
|
||||||
private playOutsideAttached = false;
|
@state() private similarExpanded = false;
|
||||||
|
|
||||||
/* ── Release prefetch ── */
|
/* ── Release prefetch ── */
|
||||||
|
|
||||||
@@ -221,12 +221,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
@query('#context-menu')
|
@query('#context-menu')
|
||||||
private contextMenuPopup!: MenuSurface;
|
private contextMenuPopup!: MenuSurface;
|
||||||
|
|
||||||
@query('.play-menu-button')
|
|
||||||
private playMenuButton?: HTMLButtonElement;
|
|
||||||
|
|
||||||
@query('#artist-play-menu')
|
|
||||||
private playMenuPanel?: HTMLElement;
|
|
||||||
|
|
||||||
@query('#playlist-submenu')
|
@query('#playlist-submenu')
|
||||||
private playlistSubmenuPopup?: WaPopup;
|
private playlistSubmenuPopup?: WaPopup;
|
||||||
|
|
||||||
@@ -277,7 +271,7 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
backButton,
|
backButton,
|
||||||
exploreLinkStyles,
|
exploreLinkStyles,
|
||||||
contextMenuStyles,
|
contextMenuStyles,
|
||||||
albumCardStyles,
|
unownedStyles,
|
||||||
css`
|
css`
|
||||||
:host {
|
:host {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -325,45 +319,10 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
}
|
}
|
||||||
|
|
||||||
.artist-actions {
|
.artist-follow {
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The Play button and its caret are one control, so they
|
|
||||||
are one box: no gap between them, and the caret carries
|
|
||||||
the same filled appearance as the button it extends. */
|
|
||||||
.play-split {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: stretch;
|
|
||||||
}
|
|
||||||
|
|
||||||
.play-menu-button {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 28px;
|
|
||||||
padding: 0;
|
|
||||||
border: none;
|
|
||||||
border-left: 1px solid rgba(0, 0, 0, 0.25);
|
|
||||||
border-radius: 0 6px 6px 0;
|
|
||||||
background: var(--yj-accent, #ffd43b);
|
|
||||||
color: var(--yj-accent-fg, #000);
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.play-menu-button:hover {
|
|
||||||
filter: brightness(1.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.play-menu-button:focus-visible {
|
|
||||||
outline: 2px solid var(--yj-accent-text, #ffd43b);
|
|
||||||
outline-offset: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.artist-info {
|
.artist-info {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -372,7 +331,7 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
}
|
}
|
||||||
|
|
||||||
.artist-title {
|
.artist-title {
|
||||||
font-size: 28px;
|
font-size: 24px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
color: var(--yj-text-primary, #fff);
|
color: var(--yj-text-primary, #fff);
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
@@ -400,13 +359,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The listen count is a headline number, not metadata, so
|
|
||||||
it sits a size above the type/country line. */
|
|
||||||
.artist-listens {
|
|
||||||
font-size: var(--yj-text-lg);
|
|
||||||
color: var(--yj-text-secondary, #b3b3b3);
|
|
||||||
}
|
|
||||||
|
|
||||||
.meta-separator {
|
.meta-separator {
|
||||||
opacity: 0.4;
|
opacity: 0.4;
|
||||||
}
|
}
|
||||||
@@ -494,6 +446,23 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
outline-offset: -2px;
|
outline-offset: -2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.artist-play-actions {
|
||||||
|
margin-top: 10px;
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.track-rank {
|
||||||
|
width: 24px;
|
||||||
|
text-align: right;
|
||||||
|
color: var(--yj-text-tertiary, #888);
|
||||||
|
font-size: var(--yj-text-md);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.track-art {
|
.track-art {
|
||||||
width: 32px;
|
width: 32px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
@@ -520,52 +489,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Play where you own the track, the request badge where you
|
|
||||||
do not — over the artwork rather than at the end of the
|
|
||||||
row, where it was a badge beside a row you can already
|
|
||||||
double-click. */
|
|
||||||
.track-art-overlay {
|
|
||||||
position: absolute;
|
|
||||||
inset: 0;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
border-radius: 4px;
|
|
||||||
background: rgba(0, 0, 0, 0.55);
|
|
||||||
visibility: hidden;
|
|
||||||
opacity: 0;
|
|
||||||
transition: opacity 0.15s ease, visibility 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.track-art-play {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
padding: 0;
|
|
||||||
border: none;
|
|
||||||
background: none;
|
|
||||||
color: #fff;
|
|
||||||
font-size: 14px;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (hover: hover) and (pointer: fine) {
|
|
||||||
.track-item:hover .track-art-overlay,
|
|
||||||
.track-item:focus-within .track-art-overlay {
|
|
||||||
visibility: visible;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* No hover means no double-click either, so the overlay is
|
|
||||||
the only route to playing a top track and must be there. */
|
|
||||||
@media not all and (hover: hover) {
|
|
||||||
.track-art-overlay {
|
|
||||||
visibility: visible;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.track-info {
|
.track-info {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
@@ -599,6 +522,7 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
.track-item library-status-indicator {
|
.track-item library-status-indicator {
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ── Top section (tracks + releases side-by-side) ── */
|
/* ── Top section (tracks + releases side-by-side) ── */
|
||||||
.top-section-wrapper {
|
.top-section-wrapper {
|
||||||
container-type: inline-size;
|
container-type: inline-size;
|
||||||
@@ -830,30 +754,8 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.top-release-art .album-card-badge {
|
.top-release-meta library-status-indicator {
|
||||||
position: absolute;
|
flex-shrink: 0;
|
||||||
top: 4px;
|
|
||||||
left: 4px;
|
|
||||||
z-index: 1;
|
|
||||||
display: flex;
|
|
||||||
visibility: hidden;
|
|
||||||
opacity: 0;
|
|
||||||
transition: opacity 0.15s ease, visibility 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (hover: hover) and (pointer: fine) {
|
|
||||||
.top-release-card:hover .album-card-badge,
|
|
||||||
.top-release-card:focus-within .album-card-badge {
|
|
||||||
visibility: visible;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media not all and (hover: hover) {
|
|
||||||
.top-release-art .album-card-badge {
|
|
||||||
visibility: visible;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -871,7 +773,150 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.album-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fill, 140px);
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-grid.collapsed {
|
||||||
|
grid-template-rows: 1fr;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.disco-toggle {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 4px 10px;
|
||||||
|
margin-top: 4px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 6px;
|
||||||
|
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.06));
|
||||||
|
color: var(--yj-text-secondary, #b3b3b3);
|
||||||
|
font-size: var(--yj-text-xs);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.15s ease, color 0.15s ease;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.disco-toggle:hover {
|
||||||
|
background: var(--yj-bg-hover, rgba(255, 255, 255, 0.1));
|
||||||
|
color: var(--yj-text-primary, #fff);
|
||||||
|
}
|
||||||
|
|
||||||
|
.disco-toggle wa-icon {
|
||||||
|
font-size: 11px;
|
||||||
|
transition: transform 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.disco-toggle[aria-expanded='true'] wa-icon {
|
||||||
|
transform: rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-card {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 8px;
|
||||||
|
border-radius: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-card:hover {
|
||||||
|
background: var(
|
||||||
|
--yj-bg-overlay,
|
||||||
|
rgba(255, 255, 255, 0.06)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-card:active {
|
||||||
|
transform: scale(0.97);
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-art-container {
|
||||||
|
width: 100%;
|
||||||
|
aspect-ratio: 1;
|
||||||
|
border-radius: 4px;
|
||||||
|
overflow: hidden;
|
||||||
|
flex-shrink: 0;
|
||||||
|
position: relative;
|
||||||
|
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.06));
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-art-container img {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
|
display: block;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-art-fallback {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-art-fallback wa-icon {
|
||||||
|
color: var(--yj-text-tertiary, #888);
|
||||||
|
font-size: 24px;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-title {
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--yj-text-primary, #fff);
|
||||||
|
font-size: var(--yj-text-sm);
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-meta {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 6px;
|
||||||
|
color: var(--yj-text-tertiary, #888);
|
||||||
|
font-size: var(--yj-text-xs);
|
||||||
|
min-height: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-meta-text {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-meta library-status-indicator {
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Similar artists ── */
|
/* ── Similar artists ── */
|
||||||
|
.similar-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fill, 140px);
|
||||||
|
gap: 16px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.similar-row.collapsed {
|
||||||
|
grid-template-rows: 1fr;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
.similar-artist-card {
|
.similar-artist-card {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -881,9 +926,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 120px;
|
|
||||||
box-sizing: border-box;
|
|
||||||
flex-shrink: 0;
|
|
||||||
transition: background 0.15s ease;
|
transition: background 0.15s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1014,7 +1056,7 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
this.unsubSimilarReady?.();
|
this.unsubSimilarReady?.();
|
||||||
if (this.discogFallbackTimer) clearTimeout(this.discogFallbackTimer);
|
if (this.discogFallbackTimer) clearTimeout(this.discogFallbackTimer);
|
||||||
this.topSectionObserver?.disconnect();
|
this.topSectionObserver?.disconnect();
|
||||||
this.detachPlayOutsideClose();
|
this.discoObserver?.disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1041,14 +1083,17 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
|
|
||||||
protected override firstUpdated() {
|
protected override firstUpdated() {
|
||||||
this.observeTopSectionWidth();
|
this.observeTopSectionWidth();
|
||||||
|
this.observeDiscoWidth();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override updated() {
|
protected override updated() {
|
||||||
// Re-attach the observer if the section appeared after initial
|
// Re-attach observers if elements appeared after initial render.
|
||||||
// render.
|
|
||||||
if (!this.topSectionObserver) {
|
if (!this.topSectionObserver) {
|
||||||
this.observeTopSectionWidth();
|
this.observeTopSectionWidth();
|
||||||
}
|
}
|
||||||
|
if (!this.discoObserver) {
|
||||||
|
this.observeDiscoWidth();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1081,6 +1126,32 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
this.topSectionObserver.observe(wrapper);
|
this.topSectionObserver.observe(wrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Watch the .content width and compute how many album cards
|
||||||
|
* fit in one row of the discography grid.
|
||||||
|
* Grid uses: repeat(auto-fill, minmax(140px, 1fr)) with 16px gap
|
||||||
|
* and album-card has 8px padding on each side.
|
||||||
|
*/
|
||||||
|
private observeDiscoWidth() {
|
||||||
|
const content = this.renderRoot.querySelector('.content');
|
||||||
|
if (!content) return;
|
||||||
|
|
||||||
|
const CARD_MIN = 140;
|
||||||
|
const GAP = 16;
|
||||||
|
|
||||||
|
this.discoObserver = new ResizeObserver((entries) => {
|
||||||
|
for (const entry of entries) {
|
||||||
|
const width = entry.contentBoxSize?.[0]?.inlineSize ?? entry.contentRect.width;
|
||||||
|
const cols = Math.max(1, Math.floor((width + GAP) / (CARD_MIN + GAP)));
|
||||||
|
if (cols !== this.discoRowSize) {
|
||||||
|
this.discoRowSize = cols;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.discoObserver.observe(content);
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Data Loading ── */
|
/* ── Data Loading ── */
|
||||||
|
|
||||||
private async loadAllData() {
|
private async loadAllData() {
|
||||||
@@ -1791,8 +1862,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
} catch {
|
} catch {
|
||||||
// No image — letter avatar stays.
|
// No image — letter avatar stays.
|
||||||
}
|
}
|
||||||
|
|
||||||
return undefined;
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1930,65 +1999,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ── Play / Shuffle split button ── */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the Play button's Shuffle dropdown.
|
|
||||||
*
|
|
||||||
* `page-header`'s overflow menu one control over: the same
|
|
||||||
* `MenuKeyboard`, the same document-level outside-close, and the
|
|
||||||
* same `menu-surface`, so the phone gets the bottom sheet rather
|
|
||||||
* than a popup that Chrome 113 clips.
|
|
||||||
*/
|
|
||||||
private togglePlayMenu = (): void => {
|
|
||||||
if (this.playMenuOpen) {
|
|
||||||
this.closePlayMenu();
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.playMenuOpen = true;
|
|
||||||
|
|
||||||
void this.updateComplete.then(() => {
|
|
||||||
if (!this.playMenuOpen) return;
|
|
||||||
|
|
||||||
this.playMenuKeyboard.open(
|
|
||||||
this.playMenuPanel ?? null,
|
|
||||||
this.playMenuButton ?? null,
|
|
||||||
);
|
|
||||||
this.attachPlayOutsideClose();
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
private closePlayMenu = (): void => {
|
|
||||||
if (!this.playMenuOpen) return;
|
|
||||||
|
|
||||||
this.detachPlayOutsideClose();
|
|
||||||
this.playMenuKeyboard.close();
|
|
||||||
this.playMenuOpen = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
private onPlayOutsideDown = (e: Event): void => {
|
|
||||||
if (e.composedPath().includes(this.playMenuPanel as EventTarget)) return;
|
|
||||||
if (e.composedPath().includes(this.playMenuButton as EventTarget)) return;
|
|
||||||
|
|
||||||
this.closePlayMenu();
|
|
||||||
};
|
|
||||||
|
|
||||||
private attachPlayOutsideClose(): void {
|
|
||||||
if (this.playOutsideAttached) return;
|
|
||||||
|
|
||||||
this.playOutsideAttached = true;
|
|
||||||
document.addEventListener('mousedown', this.onPlayOutsideDown, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private detachPlayOutsideClose(): void {
|
|
||||||
if (!this.playOutsideAttached) return;
|
|
||||||
|
|
||||||
this.playOutsideAttached = false;
|
|
||||||
document.removeEventListener('mousedown', this.onPlayOutsideDown, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* File path for one top track, resolved by recording MBID — the
|
* File path for one top track, resolved by recording MBID — the
|
||||||
* same key `localId` was set from. Works whether or not the
|
* same key `localId` was set from. Works whether or not the
|
||||||
@@ -2230,7 +2240,11 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
|
|
||||||
if (!release?.mbid) return;
|
if (!release?.mbid) return;
|
||||||
|
|
||||||
openMusicBrainz(`/release-group/${release.mbid}`);
|
window.open(
|
||||||
|
`https://musicbrainz.org/release-group/${release.mbid}`,
|
||||||
|
'_blank',
|
||||||
|
'noopener',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private onContextMenuAction(
|
private onContextMenuAction(
|
||||||
@@ -2344,7 +2358,7 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
|
|
||||||
if (!track?.recordingMbid) return;
|
if (!track?.recordingMbid) return;
|
||||||
|
|
||||||
openMusicBrainz(`/recording/${track.recordingMbid}`);
|
window.open(`https://musicbrainz.org/recording/${track.recordingMbid}`, '_blank', 'noopener');
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ── Navigation ── */
|
/* ── Navigation ── */
|
||||||
@@ -2524,14 +2538,12 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
: nothing}
|
: nothing}
|
||||||
${this.renderArtistMeta()}
|
${this.renderArtistMeta()}
|
||||||
${this.artist?.popularity && this.artist.popularity > 0
|
${this.artist?.popularity && this.artist.popularity > 0
|
||||||
? html`<span class="artist-listens">${formatListenCount(this.artist.popularity)} plays on ListenBrainz</span>`
|
? html`<span class="artist-meta">${formatListenCount(this.artist.popularity)} plays on ListenBrainz</span>`
|
||||||
: nothing}
|
: nothing}
|
||||||
<div class="artist-actions">
|
|
||||||
${this.renderPlayLibraryAction()}
|
${this.renderPlayLibraryAction()}
|
||||||
${this.renderFollowAction()}
|
${this.renderFollowAction()}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<catalog-scope-notice
|
<catalog-scope-notice
|
||||||
scope=${this.catalogScope()}
|
scope=${this.catalogScope()}
|
||||||
@@ -2560,53 +2572,25 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
if (this.ownedLocalAlbumIds().length === 0) return nothing;
|
if (this.ownedLocalAlbumIds().length === 0) return nothing;
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<div class="play-split">
|
<div class="artist-play-actions">
|
||||||
<wa-button
|
<wa-button
|
||||||
size="small"
|
size="small"
|
||||||
appearance="filled"
|
appearance="filled"
|
||||||
data-testid="artist-play-library"
|
data-testid="artist-play-library"
|
||||||
title="Play library tracks"
|
|
||||||
@click=${() => void this.playLibraryTracks(false)}
|
@click=${() => void this.playLibraryTracks(false)}
|
||||||
>
|
>
|
||||||
<wa-icon slot="start" name="play"></wa-icon>
|
<wa-icon slot="start" name="play"></wa-icon>
|
||||||
Play
|
Play library tracks
|
||||||
</wa-button>
|
</wa-button>
|
||||||
<menu-surface
|
<wa-button
|
||||||
placement="bottom-start"
|
size="small"
|
||||||
.active=${this.playMenuOpen}
|
appearance="outlined"
|
||||||
@menu-dismiss=${this.closePlayMenu}
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
slot="anchor"
|
|
||||||
class="play-menu-button"
|
|
||||||
type="button"
|
|
||||||
data-testid="artist-play-menu"
|
|
||||||
aria-label="More play options"
|
|
||||||
aria-haspopup="menu"
|
|
||||||
aria-expanded=${this.playMenuOpen ? 'true' : 'false'}
|
|
||||||
aria-controls="artist-play-menu"
|
|
||||||
@click=${this.togglePlayMenu}
|
|
||||||
>
|
|
||||||
<wa-icon name="chevron-down"></wa-icon>
|
|
||||||
</button>
|
|
||||||
<div
|
|
||||||
id="artist-play-menu"
|
|
||||||
class="context-menu-panel"
|
|
||||||
role="menu"
|
|
||||||
aria-label="Play options"
|
|
||||||
>
|
|
||||||
<wa-dropdown-item
|
|
||||||
data-testid="artist-shuffle-library"
|
data-testid="artist-shuffle-library"
|
||||||
@click=${() => {
|
@click=${() => void this.playLibraryTracks(true)}
|
||||||
this.closePlayMenu();
|
|
||||||
void this.playLibraryTracks(true);
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
<wa-icon slot="icon" name="shuffle"></wa-icon>
|
<wa-icon slot="start" name="shuffle"></wa-icon>
|
||||||
Shuffle
|
Shuffle
|
||||||
</wa-dropdown-item>
|
</wa-button>
|
||||||
</div>
|
|
||||||
</menu-surface>
|
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
@@ -2802,13 +2786,10 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
const request = downloadStore.requestFor(this.artistMBID);
|
const request = downloadStore.requestFor(this.artistMBID);
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
|
<div class="artist-follow">
|
||||||
<wa-button
|
<wa-button
|
||||||
size="small"
|
size="small"
|
||||||
appearance=${request ? 'filled' : 'outlined'}
|
appearance=${request ? 'filled' : 'outlined'}
|
||||||
data-testid="artist-follow"
|
|
||||||
title=${request
|
|
||||||
? 'Following this artist'
|
|
||||||
: 'Follow this artist for new releases'}
|
|
||||||
@click=${() => void this.toggleFollow(request?.id)}
|
@click=${() => void this.toggleFollow(request?.id)}
|
||||||
>
|
>
|
||||||
<!-- This was bookmark-check, which is not in
|
<!-- This was bookmark-check, which is not in
|
||||||
@@ -2821,8 +2802,9 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
slot="start"
|
slot="start"
|
||||||
name=${request ? ICON_REQUESTED : ICON_CAN_REQUEST}
|
name=${request ? ICON_REQUESTED : ICON_CAN_REQUEST}
|
||||||
></wa-icon>
|
></wa-icon>
|
||||||
${request ? 'Following' : 'Follow'}
|
${request ? 'Following' : 'Follow for new releases'}
|
||||||
</wa-button>
|
</wa-button>
|
||||||
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2906,6 +2888,16 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
this.topReleasesExpanded = !this.topReleasesExpanded;
|
this.topReleasesExpanded = !this.topReleasesExpanded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private toggleDiscoGroup(type: string) {
|
||||||
|
const next = new Set(this.expandedDiscoGroups);
|
||||||
|
if (next.has(type)) {
|
||||||
|
next.delete(type);
|
||||||
|
} else {
|
||||||
|
next.add(type);
|
||||||
|
}
|
||||||
|
this.expandedDiscoGroups = next;
|
||||||
|
}
|
||||||
|
|
||||||
private renderTopSection() {
|
private renderTopSection() {
|
||||||
const hasTracks = !this.loadingTracks && this.topTracks.length > 0;
|
const hasTracks = !this.loadingTracks && this.topTracks.length > 0;
|
||||||
const hasReleases = !this.loadingTopReleases && this.topReleaseGroups.length > 0;
|
const hasReleases = !this.loadingTopReleases && this.topReleaseGroups.length > 0;
|
||||||
@@ -2979,31 +2971,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
}} />`
|
}} />`
|
||||||
: html`<wa-icon name="compact-disc"></wa-icon>`;
|
: html`<wa-icon name="compact-disc"></wa-icon>`;
|
||||||
})()}
|
})()}
|
||||||
<!-- Over the artwork, not beside the
|
|
||||||
row: play where you own it, the
|
|
||||||
request badge where you do not. -->
|
|
||||||
<div class="track-art-overlay">
|
|
||||||
${owned
|
|
||||||
? html`<button
|
|
||||||
class="track-art-play"
|
|
||||||
type="button"
|
|
||||||
aria-label=${`Play ${t.trackName}`}
|
|
||||||
@click=${(e: Event) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
void this.playTrack(t);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<wa-icon name="play"></wa-icon>
|
|
||||||
</button>`
|
|
||||||
: html`<library-status-indicator
|
|
||||||
status=${libraryStatusFor(false, t.recordingMbid)}
|
|
||||||
entity-type="track"
|
|
||||||
label=${t.trackName}
|
|
||||||
request-mbid=${t.recordingMbid}
|
|
||||||
request-artist=${t.artistName ?? ''}
|
|
||||||
size="18"
|
|
||||||
></library-status-indicator>`}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="track-info">
|
<div class="track-info">
|
||||||
<div class="track-title">${trackLink(t.trackName, t.releaseName, t.releaseGroupMbid ?? '', t.recordingMbid)}</div>
|
<div class="track-title">${trackLink(t.trackName, t.releaseName, t.releaseGroupMbid ?? '', t.recordingMbid)}</div>
|
||||||
@@ -3012,6 +2979,15 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
<span class="track-listens">
|
<span class="track-listens">
|
||||||
${formatListenCount(t.totalListenCount)} plays
|
${formatListenCount(t.totalListenCount)} plays
|
||||||
</span>
|
</span>
|
||||||
|
${owned
|
||||||
|
? nothing
|
||||||
|
: html`<library-status-indicator
|
||||||
|
status=${libraryStatusFor(false, t.recordingMbid)}
|
||||||
|
entity-type="track"
|
||||||
|
label=${t.trackName}
|
||||||
|
request-mbid=${t.recordingMbid}
|
||||||
|
request-artist=${t.artistName ?? ''}
|
||||||
|
></library-status-indicator>`}
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
})}
|
})}
|
||||||
@@ -3117,18 +3093,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
<div class="album-art-fallback" style="${artURL ? 'display: none' : ''}">
|
<div class="album-art-fallback" style="${artURL ? 'display: none' : ''}">
|
||||||
<wa-icon name="compact-disc"></wa-icon>
|
<wa-icon name="compact-disc"></wa-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="album-card-badge">
|
|
||||||
<library-status-indicator
|
|
||||||
status=${badge.status}
|
|
||||||
owned=${badge.owned}
|
|
||||||
expected=${badge.expected}
|
|
||||||
entity-type="album"
|
|
||||||
label=${rg.title}
|
|
||||||
request-mbid=${rg.releaseGroupMbid}
|
|
||||||
request-artist=${this.artist?.name ?? ''}
|
|
||||||
size="21"
|
|
||||||
></library-status-indicator>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="top-release-text">
|
<div class="top-release-text">
|
||||||
<div class="top-release-title" title="${rg.title}">
|
<div class="top-release-title" title="${rg.title}">
|
||||||
@@ -3138,6 +3102,18 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
<div class="top-release-meta-text">
|
<div class="top-release-meta-text">
|
||||||
${rg.date ? html`<span>${extractYear(rg.date)}</span>` : nothing}
|
${rg.date ? html`<span>${extractYear(rg.date)}</span>` : nothing}
|
||||||
</div>
|
</div>
|
||||||
|
${badge.status === 'in-library'
|
||||||
|
? nothing
|
||||||
|
: html`<library-status-indicator
|
||||||
|
status=${badge.status}
|
||||||
|
owned=${badge.owned}
|
||||||
|
expected=${badge.expected}
|
||||||
|
entity-type="album"
|
||||||
|
label=${rg.title}
|
||||||
|
request-mbid=${rg.releaseGroupMbid}
|
||||||
|
request-artist=${this.artist?.name ?? ''}
|
||||||
|
size="18"
|
||||||
|
></library-status-indicator>`}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -3188,16 +3164,37 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
<section>
|
<section>
|
||||||
<h3 class="section-header">Discography</h3>
|
<h3 class="section-header">Discography</h3>
|
||||||
${groups.map(
|
${groups.map(
|
||||||
(g) => html`
|
(g) => {
|
||||||
|
const isExpanded = this.expandedDiscoGroups.has(g.type);
|
||||||
|
const rowSize = this.discoRowSize;
|
||||||
|
const showToggle = g.items.length > rowSize;
|
||||||
|
const visibleItems = isExpanded ? g.items : g.items.slice(0, rowSize);
|
||||||
|
|
||||||
|
return html`
|
||||||
<div class="disco-group">
|
<div class="disco-group">
|
||||||
<h4 class="disco-type-header">
|
<h4 class="disco-type-header">
|
||||||
${g.type === 'Other' ? 'Other Releases' : g.type.endsWith('s') ? g.type : `${g.type}s`}
|
${g.type === 'Other' ? 'Other Releases' : g.type.endsWith('s') ? g.type : `${g.type}s`}
|
||||||
</h4>
|
</h4>
|
||||||
<scroll-row>
|
<div class="album-grid">
|
||||||
${g.items.map((rg) => this.renderAlbumCard(rg))}
|
${visibleItems.map((rg) => this.renderAlbumCard(rg))}
|
||||||
</scroll-row>
|
|
||||||
</div>
|
</div>
|
||||||
`,
|
${showToggle
|
||||||
|
? html`
|
||||||
|
<button
|
||||||
|
class="disco-toggle"
|
||||||
|
aria-expanded="${isExpanded}"
|
||||||
|
@click=${() => this.toggleDiscoGroup(g.type)}
|
||||||
|
>
|
||||||
|
${isExpanded
|
||||||
|
? 'Show less'
|
||||||
|
: `Show all ${g.items.length}`}
|
||||||
|
<wa-icon name="chevron-down"></wa-icon>
|
||||||
|
</button>
|
||||||
|
`
|
||||||
|
: nothing}
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
},
|
||||||
)}
|
)}
|
||||||
</section>
|
</section>
|
||||||
`;
|
`;
|
||||||
@@ -3237,8 +3234,15 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
<div class="album-art-fallback" style="${artURL ? 'display: none' : ''}">
|
<div class="album-art-fallback" style="${artURL ? 'display: none' : ''}">
|
||||||
<wa-icon name="compact-disc"></wa-icon>
|
<wa-icon name="compact-disc"></wa-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="album-card-badge">
|
</div>
|
||||||
<library-status-indicator
|
<div class="album-title" title="${rg.title}">${rg.title}</div>
|
||||||
|
<div class="album-meta">
|
||||||
|
<div class="album-meta-text">
|
||||||
|
${year ? html`<span>${year}</span>` : nothing}
|
||||||
|
</div>
|
||||||
|
${badge.status === 'in-library'
|
||||||
|
? nothing
|
||||||
|
: html`<library-status-indicator
|
||||||
status=${badge.status}
|
status=${badge.status}
|
||||||
owned=${badge.owned}
|
owned=${badge.owned}
|
||||||
expected=${badge.expected}
|
expected=${badge.expected}
|
||||||
@@ -3246,16 +3250,7 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
label=${rg.title}
|
label=${rg.title}
|
||||||
request-mbid=${rg.mbid}
|
request-mbid=${rg.mbid}
|
||||||
request-artist=${this.artist?.name ?? ''}
|
request-artist=${this.artist?.name ?? ''}
|
||||||
size="23"
|
></library-status-indicator>`}
|
||||||
></library-status-indicator>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="album-title" title="${rg.title}">${rg.title}</div>
|
|
||||||
<div class="album-artist">${rg.artistCredit ?? ''}</div>
|
|
||||||
<div class="album-meta">
|
|
||||||
<div class="album-meta-text">
|
|
||||||
${year ? html`<span>${year}</span>` : nothing}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
@@ -3271,12 +3266,15 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
// Cap the similar-artists list at 10 to avoid a very long list.
|
// Cap the similar-artists list at 10 to avoid a very long list.
|
||||||
const maxSimilar = 10;
|
const maxSimilar = 10;
|
||||||
const artists = this.similarArtists.slice(0, maxSimilar);
|
const artists = this.similarArtists.slice(0, maxSimilar);
|
||||||
|
const showToggle = artists.length > this.discoRowSize;
|
||||||
|
const collapsed = !this.similarExpanded && showToggle;
|
||||||
|
const visible = collapsed ? artists.slice(0, this.discoRowSize) : artists;
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<section>
|
<section>
|
||||||
<h3 class="section-header">Similar Artists</h3>
|
<h3 class="section-header">Similar Artists</h3>
|
||||||
<scroll-row>
|
<div class="similar-row ${collapsed ? 'collapsed' : ''}">
|
||||||
${artists.map((a) => {
|
${visible.map((a) => {
|
||||||
const imgURL = this.similarImageURLs.get(a.artistMbid);
|
const imgURL = this.similarImageURLs.get(a.artistMbid);
|
||||||
return html`
|
return html`
|
||||||
<div
|
<div
|
||||||
@@ -3315,7 +3313,21 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
})}
|
})}
|
||||||
</scroll-row>
|
</div>
|
||||||
|
${showToggle
|
||||||
|
? html`
|
||||||
|
<button
|
||||||
|
class="disco-toggle"
|
||||||
|
aria-expanded="${this.similarExpanded}"
|
||||||
|
@click=${() => { this.similarExpanded = !this.similarExpanded; }}
|
||||||
|
>
|
||||||
|
${this.similarExpanded
|
||||||
|
? 'Show less'
|
||||||
|
: `Show all ${artists.length}`}
|
||||||
|
<wa-icon name="chevron-down"></wa-icon>
|
||||||
|
</button>
|
||||||
|
`
|
||||||
|
: nothing}
|
||||||
</section>
|
</section>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import { avatarBackground } from '@utils/avatar-color';
|
import { avatarBackground } from '@utils/avatar-color';
|
||||||
import { albumBadgeFor, libraryStatusFor } from '@utils/library-status';
|
import { albumBadgeFor, libraryStatusFor } from '@utils/library-status';
|
||||||
import { isOwned, ownershipLabel } from '@utils/ownership';
|
import {
|
||||||
import { openMusicBrainz } from '@utils/external-link';
|
isOwned,
|
||||||
|
ownershipLabel,
|
||||||
|
unownedStyles,
|
||||||
|
} from '@utils/ownership';
|
||||||
import { completenessStore } from '@store/completeness-store';
|
import { completenessStore } from '@store/completeness-store';
|
||||||
import { downloadStore } from '@store/download-store';
|
import { downloadStore } from '@store/download-store';
|
||||||
import { LitElement, html, css, nothing } from 'lit';
|
import { LitElement, html, css, nothing } from 'lit';
|
||||||
@@ -10,8 +13,6 @@ import { classMap } from 'lit/directives/class-map.js';
|
|||||||
import '@components/page-header/page-header';
|
import '@components/page-header/page-header';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
import { srOnly } from '../../styles/sr-only.css';
|
import { srOnly } from '../../styles/sr-only.css';
|
||||||
import { albumCardStyles } from '../../styles/album-card.css';
|
|
||||||
import '../scroll-row/scroll-row.js';
|
|
||||||
import { SearchLocal, SearchLyrics, GetThumbnail, GetThumbnails, GetArtistImageURL, GetArtistImagesCachedPaths, GetExploreShelves, RecordSearchClick } from '@go/explore/service.js';
|
import { SearchLocal, SearchLyrics, GetThumbnail, GetThumbnails, GetArtistImageURL, GetArtistImagesCachedPaths, GetExploreShelves, RecordSearchClick } from '@go/explore/service.js';
|
||||||
import { GetFilePathsByAlbums, GetFilePathsByRecordingMBIDs } from '@go/library/library.js';
|
import { GetFilePathsByAlbums, GetFilePathsByRecordingMBIDs } from '@go/library/library.js';
|
||||||
import { EventsOn } from '@runtime/runtime';
|
import { EventsOn } from '@runtime/runtime';
|
||||||
@@ -252,7 +253,7 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
srOnly,
|
srOnly,
|
||||||
exploreLinkStyles,
|
exploreLinkStyles,
|
||||||
contextMenuStyles,
|
contextMenuStyles,
|
||||||
albumCardStyles,
|
unownedStyles,
|
||||||
css`
|
css`
|
||||||
:host {
|
:host {
|
||||||
display: block;
|
display: block;
|
||||||
@@ -528,9 +529,21 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ── Horizontal scroll rows ── */
|
||||||
|
.horizontal-row {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
overflow-x: auto;
|
||||||
|
padding-bottom: 4px;
|
||||||
|
scrollbar-width: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.horizontal-row::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Top result cards ── */
|
||||||
/* ── Artist cards ── */
|
/* ── Artist cards ── */
|
||||||
/* Fixed width, for the reason the album card is: a range
|
|
||||||
means two cards in one row are different sizes. */
|
|
||||||
.artist-card {
|
.artist-card {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -539,8 +552,8 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
padding: 10px;
|
padding: 10px;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
width: 120px;
|
min-width: 100px;
|
||||||
box-sizing: border-box;
|
max-width: 120px;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
transition: background 0.15s ease;
|
transition: background 0.15s ease;
|
||||||
@@ -611,6 +624,115 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
font-size: var(--yj-text-xs);
|
font-size: var(--yj-text-xs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ── Album cards ── */
|
||||||
|
.album-card {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 8px;
|
||||||
|
border-radius: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
min-width: 130px;
|
||||||
|
max-width: 150px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
transition: background 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-card:hover {
|
||||||
|
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.06));
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-card:active {
|
||||||
|
transform: scale(0.97);
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-art-container {
|
||||||
|
width: 100%;
|
||||||
|
aspect-ratio: 1;
|
||||||
|
border-radius: 4px;
|
||||||
|
overflow: hidden;
|
||||||
|
background: linear-gradient(
|
||||||
|
135deg,
|
||||||
|
var(--yj-bg-overlay, #404040) 0%,
|
||||||
|
var(--yj-bg-surface, #282828) 100%
|
||||||
|
);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-art-container img {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-art-fallback {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-art-fallback wa-icon {
|
||||||
|
color: var(--yj-text-tertiary, #888);
|
||||||
|
font-size: 24px;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-title {
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--yj-text-primary, #fff);
|
||||||
|
font-size: var(--yj-text-sm);
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-artist {
|
||||||
|
color: var(--yj-text-tertiary, #888);
|
||||||
|
font-size: var(--yj-text-xs);
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-meta {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 6px;
|
||||||
|
color: var(--yj-text-tertiary, #888);
|
||||||
|
font-size: var(--yj-text-xs);
|
||||||
|
min-height: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-meta-text {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-meta library-status-indicator {
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.type-badge {
|
||||||
|
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.08));
|
||||||
|
padding: 1px 6px;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-size: 10px;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Track list ── */
|
/* ── Track list ── */
|
||||||
.track-list {
|
.track-list {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -631,6 +753,7 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.album-card:focus-visible,
|
||||||
.track-item:focus-visible {
|
.track-item:focus-visible {
|
||||||
outline: 2px solid var(--yj-accent-text, #ffd43b);
|
outline: 2px solid var(--yj-accent-text, #ffd43b);
|
||||||
outline-offset: -2px;
|
outline-offset: -2px;
|
||||||
@@ -1248,7 +1371,7 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
|
|
||||||
const entity = target.kind === 'album' ? 'release-group' : 'recording';
|
const entity = target.kind === 'album' ? 'release-group' : 'recording';
|
||||||
|
|
||||||
openMusicBrainz(`/${entity}/${target.mbid}`);
|
window.open(`https://musicbrainz.org/${entity}/${target.mbid}`, '_blank', 'noopener');
|
||||||
}
|
}
|
||||||
|
|
||||||
private renderExploreContextMenu() {
|
private renderExploreContextMenu() {
|
||||||
@@ -1539,8 +1662,6 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
} catch {
|
} catch {
|
||||||
// No image — leave empty string.
|
// No image — leave empty string.
|
||||||
}
|
}
|
||||||
|
|
||||||
return undefined;
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -2001,7 +2122,7 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
${subtitle
|
${subtitle
|
||||||
? html`<p class="section-reason">${subtitle}</p>`
|
? html`<p class="section-reason">${subtitle}</p>`
|
||||||
: nothing}
|
: nothing}
|
||||||
<scroll-row>
|
<div class="horizontal-row">
|
||||||
${artists.map((a) => {
|
${artists.map((a) => {
|
||||||
const owned = isOwned(a);
|
const owned = isOwned(a);
|
||||||
const name = a.englishName || a.name;
|
const name = a.englishName || a.name;
|
||||||
@@ -2050,7 +2171,7 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
})}
|
})}
|
||||||
</scroll-row>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
@@ -2066,7 +2187,7 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
${subtitle
|
${subtitle
|
||||||
? html`<p class="section-reason">${subtitle}</p>`
|
? html`<p class="section-reason">${subtitle}</p>`
|
||||||
: nothing}
|
: nothing}
|
||||||
<scroll-row>
|
<div class="horizontal-row">
|
||||||
${releaseGroups.map((rg) => {
|
${releaseGroups.map((rg) => {
|
||||||
const artURL = this.thumbnailCache.get(rg.mbid) || '';
|
const artURL = this.thumbnailCache.get(rg.mbid) || '';
|
||||||
const year = extractYear(rg.firstReleaseDate);
|
const year = extractYear(rg.firstReleaseDate);
|
||||||
@@ -2128,18 +2249,6 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
>
|
>
|
||||||
<wa-icon name="compact-disc"></wa-icon>
|
<wa-icon name="compact-disc"></wa-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="album-card-badge">
|
|
||||||
<library-status-indicator
|
|
||||||
status=${badge.status}
|
|
||||||
owned=${badge.owned}
|
|
||||||
expected=${badge.expected}
|
|
||||||
entity-type="album"
|
|
||||||
label=${rg.title}
|
|
||||||
request-mbid=${rg.mbid}
|
|
||||||
request-artist=${rg.artistCredit ?? ''}
|
|
||||||
size="23"
|
|
||||||
></library-status-indicator>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="album-title" title="${rg.title}">
|
<div class="album-title" title="${rg.title}">
|
||||||
${rg.title}
|
${rg.title}
|
||||||
@@ -2147,18 +2256,29 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
<div class="album-artist">${creditLink(creditStore.credits(rg.mbid), rg.artistCredit, rg.artistMbid ?? '')}</div>
|
<div class="album-artist">${creditLink(creditStore.credits(rg.mbid), rg.artistCredit, rg.artistMbid ?? '')}</div>
|
||||||
<div class="album-meta">
|
<div class="album-meta">
|
||||||
<div class="album-meta-text">
|
<div class="album-meta-text">
|
||||||
${year ? html`<span>${year}</span>` : nothing}
|
|
||||||
${rg.primaryType
|
${rg.primaryType
|
||||||
? html`<span class="type-badge"
|
? html`<span class="type-badge"
|
||||||
>${rg.primaryType}</span
|
>${rg.primaryType}</span
|
||||||
>`
|
>`
|
||||||
: nothing}
|
: nothing}
|
||||||
|
${year ? html`<span>${year}</span>` : nothing}
|
||||||
</div>
|
</div>
|
||||||
|
${badge.status === 'in-library'
|
||||||
|
? nothing
|
||||||
|
: html`<library-status-indicator
|
||||||
|
status=${badge.status}
|
||||||
|
owned=${badge.owned}
|
||||||
|
expected=${badge.expected}
|
||||||
|
entity-type="album"
|
||||||
|
label=${rg.title}
|
||||||
|
request-mbid=${rg.mbid}
|
||||||
|
request-artist=${rg.artistCredit ?? ''}
|
||||||
|
></library-status-indicator>`}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
})}
|
})}
|
||||||
</scroll-row>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import { libraryStore } from '@store/library-store';
|
|||||||
import { EventsOn } from '@runtime/runtime';
|
import { EventsOn } from '@runtime/runtime';
|
||||||
import { Events } from '../../events';
|
import { Events } from '../../events';
|
||||||
import '@components/page-header/page-header';
|
import '@components/page-header/page-header';
|
||||||
import '../scroll-row/scroll-row.js';
|
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
import { ViewLifecycleMixin } from '../../utils/view-lifecycle';
|
import { ViewLifecycleMixin } from '../../utils/view-lifecycle';
|
||||||
|
|
||||||
@@ -100,6 +99,16 @@ export class HomeView extends ViewLifecycleMixin(LitElement) {
|
|||||||
color: var(--yj-text-tertiary, #888);
|
color: var(--yj-text-tertiary, #888);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.row {
|
||||||
|
display: grid;
|
||||||
|
grid-auto-flow: column;
|
||||||
|
grid-auto-columns: 160px;
|
||||||
|
gap: 14px;
|
||||||
|
overflow-x: auto;
|
||||||
|
padding-bottom: 6px;
|
||||||
|
scrollbar-width: thin;
|
||||||
|
}
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
background: none;
|
background: none;
|
||||||
border: none;
|
border: none;
|
||||||
@@ -108,8 +117,6 @@ export class HomeView extends ViewLifecycleMixin(LitElement) {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
color: inherit;
|
color: inherit;
|
||||||
display: block;
|
display: block;
|
||||||
width: 160px;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.art {
|
.art {
|
||||||
@@ -329,9 +336,9 @@ export class HomeView extends ViewLifecycleMixin(LitElement) {
|
|||||||
<span class="shelf-title">${shelf.title}</span>
|
<span class="shelf-title">${shelf.title}</span>
|
||||||
</div>
|
</div>
|
||||||
<p class="shelf-sub">${shelf.subtitle}</p>
|
<p class="shelf-sub">${shelf.subtitle}</p>
|
||||||
<scroll-row>
|
<div class="row">
|
||||||
${(shelf.albums ?? []).map((album) => this.renderCard(album))}
|
${(shelf.albums ?? []).map((album) => this.renderCard(album))}
|
||||||
</scroll-row>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,213 +0,0 @@
|
|||||||
import { LitElement, css, html } from 'lit';
|
|
||||||
import { customElement, query, state } from 'lit/decorators.js';
|
|
||||||
import '@awesome.me/webawesome/dist/components/icon/icon.js';
|
|
||||||
|
|
||||||
/** How far one press moves the row — most of a screenful, not all of
|
|
||||||
* it, so the card that was at the edge stays as an anchor. */
|
|
||||||
const SCROLL_FRACTION = 0.8;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A horizontally scrolling row with arrow buttons.
|
|
||||||
*
|
|
||||||
* The shelves, the search results and (now) the artist page's
|
|
||||||
* discography and similar-artists rows are all "more than fits, scroll
|
|
||||||
* sideways". Until this existed the only way to see the rest was a
|
|
||||||
* mousewheel or a trackpad gesture, which is not an affordance — a
|
|
||||||
* mouse with no horizontal wheel simply could not reach the cards past
|
|
||||||
* the fold.
|
|
||||||
*
|
|
||||||
* It is a component rather than a rule on `.horizontal-row` for two
|
|
||||||
* reasons. The arrows are *state* — which way the row can still move —
|
|
||||||
* and that state has to be recomputed when the viewport resizes or a
|
|
||||||
* card arrives with its cover art; a stylesheet cannot do that. And
|
|
||||||
* every caller then gets the same arrows, the same reveal and the same
|
|
||||||
* keyboard labels without writing them again.
|
|
||||||
*
|
|
||||||
* **The arrows are `hidden`, not merely transparent, at the end they
|
|
||||||
* cannot move from** — a control that cannot act is worse than none,
|
|
||||||
* and an invisible one still holds a hit area and a tab stop. On a
|
|
||||||
* pointer device the pair fades in with the row's hover; where there is
|
|
||||||
* no hover they are always visible, because there is no other route to
|
|
||||||
* them there (a swipe is not an affordance a mouse-less keyboard user
|
|
||||||
* has either).
|
|
||||||
*
|
|
||||||
* The cards are light DOM children and stay in the *host's* shadow
|
|
||||||
* root, so the host's own `.album-card` / `.artist-card` styles apply
|
|
||||||
* unchanged — this component only owns the box they scroll inside.
|
|
||||||
*/
|
|
||||||
@customElement('scroll-row')
|
|
||||||
export class ScrollRow extends LitElement {
|
|
||||||
@query('.viewport') private viewport?: HTMLElement;
|
|
||||||
|
|
||||||
@state() private atStart = true;
|
|
||||||
|
|
||||||
@state() private atEnd = true;
|
|
||||||
|
|
||||||
@state() private overflowing = false;
|
|
||||||
|
|
||||||
private observer?: ResizeObserver;
|
|
||||||
|
|
||||||
static override styles = css`
|
|
||||||
:host {
|
|
||||||
display: block;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.viewport {
|
|
||||||
overflow-x: auto;
|
|
||||||
overflow-y: hidden;
|
|
||||||
scrollbar-width: none;
|
|
||||||
/* A swipe that reaches the row's end should not drag the
|
|
||||||
whole page sideways with it. */
|
|
||||||
overscroll-behavior-x: contain;
|
|
||||||
}
|
|
||||||
|
|
||||||
.viewport::-webkit-scrollbar {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.track {
|
|
||||||
display: flex;
|
|
||||||
gap: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.arrow {
|
|
||||||
position: absolute;
|
|
||||||
top: 50%;
|
|
||||||
transform: translateY(-50%);
|
|
||||||
z-index: 2;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 36px;
|
|
||||||
height: 36px;
|
|
||||||
padding: 0;
|
|
||||||
border-radius: 50%;
|
|
||||||
border: 1px solid var(--yj-border-subtle, rgba(255, 255, 255, 0.1));
|
|
||||||
background: var(--yj-bg-elevated, #343a40);
|
|
||||||
color: var(--yj-text-primary, #fff);
|
|
||||||
cursor: pointer;
|
|
||||||
opacity: 0;
|
|
||||||
transition: opacity 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.arrow[hidden] {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.arrow.prev {
|
|
||||||
left: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.arrow.next {
|
|
||||||
right: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.arrow:hover {
|
|
||||||
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.12));
|
|
||||||
}
|
|
||||||
|
|
||||||
.arrow:focus-visible {
|
|
||||||
outline: 2px solid var(--yj-accent, #ffd43b);
|
|
||||||
outline-offset: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (hover: hover) and (pointer: fine) {
|
|
||||||
:host(:hover) .arrow,
|
|
||||||
.arrow:focus-visible {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media not all and (hover: hover) {
|
|
||||||
.arrow {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
override firstUpdated(): void {
|
|
||||||
const viewport = this.viewport;
|
|
||||||
|
|
||||||
if (!viewport) return;
|
|
||||||
|
|
||||||
this.observer = new ResizeObserver(() => this.measure());
|
|
||||||
|
|
||||||
this.observer.observe(viewport);
|
|
||||||
|
|
||||||
// The track's own size is what changes when a card arrives with
|
|
||||||
// its cover art, and a ResizeObserver on the viewport alone
|
|
||||||
// never fires for that.
|
|
||||||
const track = viewport.firstElementChild;
|
|
||||||
|
|
||||||
if (track) this.observer.observe(track);
|
|
||||||
|
|
||||||
this.measure();
|
|
||||||
}
|
|
||||||
|
|
||||||
override disconnectedCallback(): void {
|
|
||||||
super.disconnectedCallback();
|
|
||||||
this.observer?.disconnect();
|
|
||||||
this.observer = undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
private measure(): void {
|
|
||||||
const viewport = this.viewport;
|
|
||||||
|
|
||||||
if (!viewport) return;
|
|
||||||
|
|
||||||
this.overflowing = viewport.scrollWidth > viewport.clientWidth + 1;
|
|
||||||
this.atStart = viewport.scrollLeft <= 1;
|
|
||||||
this.atEnd =
|
|
||||||
viewport.scrollLeft + viewport.clientWidth >=
|
|
||||||
viewport.scrollWidth - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
private onScroll = (): void => this.measure();
|
|
||||||
|
|
||||||
private scrollStep(direction: -1 | 1): void {
|
|
||||||
const viewport = this.viewport;
|
|
||||||
|
|
||||||
if (!viewport) return;
|
|
||||||
|
|
||||||
viewport.scrollBy({
|
|
||||||
left: direction * viewport.clientWidth * SCROLL_FRACTION,
|
|
||||||
behavior: 'smooth',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
override render() {
|
|
||||||
const showPrev = this.overflowing && !this.atStart;
|
|
||||||
const showNext = this.overflowing && !this.atEnd;
|
|
||||||
|
|
||||||
return html`
|
|
||||||
<button
|
|
||||||
class="arrow prev"
|
|
||||||
type="button"
|
|
||||||
aria-label="Scroll left"
|
|
||||||
?hidden=${!showPrev}
|
|
||||||
@click=${() => this.scrollStep(-1)}
|
|
||||||
>
|
|
||||||
<wa-icon name="chevron-left"></wa-icon>
|
|
||||||
</button>
|
|
||||||
<div class="viewport" @scroll=${this.onScroll}>
|
|
||||||
<div class="track"><slot></slot></div>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
class="arrow next"
|
|
||||||
type="button"
|
|
||||||
aria-label="Scroll right"
|
|
||||||
?hidden=${!showNext}
|
|
||||||
@click=${() => this.scrollStep(1)}
|
|
||||||
>
|
|
||||||
<wa-icon name="chevron-right"></wa-icon>
|
|
||||||
</button>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
declare global {
|
|
||||||
interface HTMLElementTagNameMap {
|
|
||||||
'scroll-row': ScrollRow;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import { LitElement, html, css, nothing } from 'lit';
|
import { LitElement, html, css, nothing } from 'lit';
|
||||||
import { customElement, property } from 'lit/decorators.js';
|
import { customElement, property } from 'lit/decorators.js';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
import '../scroll-row/scroll-row.js';
|
|
||||||
import type * as explore from '@go/explore/models.js';
|
import type * as explore from '@go/explore/models.js';
|
||||||
import {
|
import {
|
||||||
GetArtistImageURL,
|
GetArtistImageURL,
|
||||||
@@ -16,6 +15,7 @@ import { albumBadgeFor, libraryStatusFor } from '../../utils/library-status';
|
|||||||
import {
|
import {
|
||||||
isOwned,
|
isOwned,
|
||||||
ownershipLabel,
|
ownershipLabel,
|
||||||
|
unownedStyles,
|
||||||
type OwnableKind,
|
type OwnableKind,
|
||||||
} from '../../utils/ownership';
|
} from '../../utils/ownership';
|
||||||
import { completenessStore } from '../../store/completeness-store';
|
import { completenessStore } from '../../store/completeness-store';
|
||||||
@@ -103,12 +103,20 @@ export class TopResultsRow extends LitElement {
|
|||||||
static override styles = [
|
static override styles = [
|
||||||
designTokens,
|
designTokens,
|
||||||
exploreLinkStyles,
|
exploreLinkStyles,
|
||||||
|
unownedStyles,
|
||||||
css`
|
css`
|
||||||
:host {
|
:host {
|
||||||
display: block;
|
display: block;
|
||||||
margin-bottom: 16px;
|
margin-bottom: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.row {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
overflow-x: auto;
|
||||||
|
padding-bottom: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
@@ -277,9 +285,9 @@ export class TopResultsRow extends LitElement {
|
|||||||
|
|
||||||
return html`
|
return html`
|
||||||
<div class="section-label">Top Results</div>
|
<div class="section-label">Top Results</div>
|
||||||
<scroll-row>
|
<div class="row">
|
||||||
${this.results.map((r) => this.renderCard(r))}
|
${this.results.map((r) => this.renderCard(r))}
|
||||||
</scroll-row>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ solid/bookmark
|
|||||||
solid/box-open
|
solid/box-open
|
||||||
solid/check
|
solid/check
|
||||||
solid/chevron-down
|
solid/chevron-down
|
||||||
solid/chevron-left
|
|
||||||
solid/chevron-right
|
solid/chevron-right
|
||||||
solid/circle-check
|
solid/circle-check
|
||||||
solid/circle-exclamation
|
solid/circle-exclamation
|
||||||
|
|||||||
@@ -1,184 +0,0 @@
|
|||||||
import { css } from 'lit';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The Explore album card, once.
|
|
||||||
*
|
|
||||||
* Two components draw one — `explore-view`'s shelves and search
|
|
||||||
* results, and `explore-artist-details`'s discography — and they had
|
|
||||||
* grown two copies of the same rules. That is how the size came apart:
|
|
||||||
* `explore-view` clamped its cards to a 130–150px range so two cards in
|
|
||||||
* one row could be different widths, and since the artwork is square
|
|
||||||
* that made them different *heights* as well. A row of covers with
|
|
||||||
* ragged bottoms is the whole complaint.
|
|
||||||
*
|
|
||||||
* So the width is a fixed `--yj-album-card-width` and the lines below
|
|
||||||
* the art each reserve their own space, which is what makes every card
|
|
||||||
* the same size no matter what a given album happens to carry —
|
|
||||||
* `album-card-size.test.ts` measures that rather than trusting it.
|
|
||||||
*
|
|
||||||
* Three rules here are the parts that changed rather than moved.
|
|
||||||
*
|
|
||||||
* **The artwork is inset in the square, not cropped to it.** The
|
|
||||||
* container was already `aspect-ratio: 1` but the image was
|
|
||||||
* `object-fit: cover`, so a non-square cover lost its edges. It is
|
|
||||||
* `contain` now and the container's own background is transparent, so
|
|
||||||
* a tall or wide cover sits in the middle of the square with the page
|
|
||||||
* showing through beside it.
|
|
||||||
*
|
|
||||||
* **The badge lives on the artwork, top-left, and only under the
|
|
||||||
* pointer.** It used to sit in the metadata line and only for the
|
|
||||||
* unowned case. It draws for every card now — an owned album's tick is
|
|
||||||
* the answer to the same question — and it is revealed by hover on a
|
|
||||||
* pointer device. Where there is no hover it is *always* visible rather
|
|
||||||
* than never, because on those devices it is the only route to its
|
|
||||||
* action: `explore-view`'s card menu carries no request item, so a
|
|
||||||
* phone with the badge hidden could not ask for an album at all.
|
|
||||||
*
|
|
||||||
* **Nothing dims an unowned card.** `unownedStyles` was removed from
|
|
||||||
* the catalog surfaces on the rule that the badge is the mark; the
|
|
||||||
* album page's *tracklist* still dims unowned rows, which is a
|
|
||||||
* different statement about a different thing.
|
|
||||||
*/
|
|
||||||
export const albumCardStyles = css`
|
|
||||||
.album-card {
|
|
||||||
width: var(--yj-album-card-width, 150px);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 6px;
|
|
||||||
padding: 8px;
|
|
||||||
border-radius: 8px;
|
|
||||||
box-sizing: border-box;
|
|
||||||
flex-shrink: 0;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: background 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-card:hover {
|
|
||||||
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.06));
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-card:active {
|
|
||||||
transform: scale(0.97);
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-card:focus-visible {
|
|
||||||
outline: 2px solid var(--yj-accent-text, #ffd43b);
|
|
||||||
outline-offset: -2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-art-container {
|
|
||||||
position: relative;
|
|
||||||
width: 100%;
|
|
||||||
aspect-ratio: 1;
|
|
||||||
border-radius: 4px;
|
|
||||||
overflow: hidden;
|
|
||||||
background: transparent;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-art-container img {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
object-fit: contain;
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The placeholder is the one case that *is* a full square, so it
|
|
||||||
carries the background the container gave up. */
|
|
||||||
.album-art-fallback {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
position: absolute;
|
|
||||||
inset: 0;
|
|
||||||
background: linear-gradient(
|
|
||||||
135deg,
|
|
||||||
var(--yj-bg-overlay, #404040) 0%,
|
|
||||||
var(--yj-bg-surface, #282828) 100%
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-art-fallback wa-icon {
|
|
||||||
color: var(--yj-text-tertiary, #888);
|
|
||||||
font-size: 24px;
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-card-badge {
|
|
||||||
position: absolute;
|
|
||||||
top: 6px;
|
|
||||||
left: 6px;
|
|
||||||
z-index: 1;
|
|
||||||
display: flex;
|
|
||||||
visibility: hidden;
|
|
||||||
opacity: 0;
|
|
||||||
transition: opacity 0.15s ease, visibility 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (hover: hover) and (pointer: fine) {
|
|
||||||
.album-card:hover .album-card-badge,
|
|
||||||
.album-card:focus-within .album-card-badge {
|
|
||||||
visibility: visible;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media not all and (hover: hover) {
|
|
||||||
.album-card-badge {
|
|
||||||
visibility: visible;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-title {
|
|
||||||
font-weight: 500;
|
|
||||||
color: var(--yj-text-primary, #fff);
|
|
||||||
font-size: var(--yj-text-sm);
|
|
||||||
line-height: 1.3;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Reserved even where a surface has no artist to draw, so a card
|
|
||||||
in a row is never shorter than its neighbour. */
|
|
||||||
.album-artist {
|
|
||||||
color: var(--yj-text-tertiary, #888);
|
|
||||||
font-size: var(--yj-text-xs);
|
|
||||||
line-height: 1.3;
|
|
||||||
min-height: 1.3em;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-meta {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 6px;
|
|
||||||
color: var(--yj-text-tertiary, #888);
|
|
||||||
font-size: var(--yj-text-xs);
|
|
||||||
height: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.album-meta-text {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 6px;
|
|
||||||
min-width: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.type-badge {
|
|
||||||
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.08));
|
|
||||||
padding: 1px 6px;
|
|
||||||
border-radius: 3px;
|
|
||||||
font-size: 10px;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/**
|
|
||||||
* Opening an external page, with the destination pinned.
|
|
||||||
*
|
|
||||||
* Every external link this app opens is a MusicBrainz entity page built
|
|
||||||
* from an MBID that came from the catalog. Constructing the URL by
|
|
||||||
* string concatenation leaves the destination to whatever is in that
|
|
||||||
* string, so this parses it against the one origin the app means and
|
|
||||||
* refuses anything else — an MBID cannot change the host, and if it
|
|
||||||
* somehow did, nothing would open.
|
|
||||||
*
|
|
||||||
* It navigates through a real anchor rather than `window.open`: the
|
|
||||||
* same top-level `_blank` navigation with `noopener`, and it keeps the
|
|
||||||
* destination an ordinary link rather than an argument to a function
|
|
||||||
* whose first parameter is a URL.
|
|
||||||
*/
|
|
||||||
const MUSICBRAINZ_ORIGIN = 'https://musicbrainz.org';
|
|
||||||
|
|
||||||
export function openMusicBrainz(path: string): void {
|
|
||||||
const url = new URL(path, MUSICBRAINZ_ORIGIN);
|
|
||||||
|
|
||||||
if (url.origin !== MUSICBRAINZ_ORIGIN) return;
|
|
||||||
|
|
||||||
const link = document.createElement('a');
|
|
||||||
|
|
||||||
link.href = url.toString();
|
|
||||||
link.target = '_blank';
|
|
||||||
link.rel = 'noopener noreferrer';
|
|
||||||
link.click();
|
|
||||||
}
|
|
||||||
@@ -10,16 +10,6 @@
|
|||||||
* badge as the only difference. This is that rule, written once, so
|
* badge as the only difference. This is that rule, written once, so
|
||||||
* eight surfaces cannot each keep their own version of it.
|
* eight surfaces cannot each keep their own version of it.
|
||||||
*
|
*
|
||||||
* **The catalog's *cards* no longer dim.** A grid of dimmed covers read
|
|
||||||
* as a page that had failed to load rather than as a page of things you
|
|
||||||
* could ask for, so on Explore the mark is the badge alone — over the
|
|
||||||
* artwork, on hover, drawn for owned and unowned alike. The album
|
|
||||||
* page's *tracklist* still dims unowned rows: that is a different
|
|
||||||
* statement ("this one is not here") about a different thing, and the
|
|
||||||
* `aria-disabled` row that cannot be played is what it is for. So
|
|
||||||
* `unownedStyles` survives for that one surface and the cards simply do
|
|
||||||
* not include it.
|
|
||||||
*
|
|
||||||
* ## Ownership is a file, and `localId` is the flag that says so
|
* ## Ownership is a file, and `localId` is the flag that says so
|
||||||
*
|
*
|
||||||
* The album page answers "do I own this row" with `filePaths`, a map
|
* The album page answers "do I own this row" with `filePaths`, a map
|
||||||
@@ -106,8 +96,7 @@ export function ownershipLabel(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The dimming, shared so it cannot drift across surfaces — and now
|
* The dimming, shared so it cannot drift across surfaces.
|
||||||
* used by exactly one of them.
|
|
||||||
*
|
*
|
||||||
* Two things about it are load-bearing.
|
* Two things about it are load-bearing.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,174 +0,0 @@
|
|||||||
/**
|
|
||||||
* Every album card is the same size, and its artwork is a square.
|
|
||||||
*
|
|
||||||
* The size came apart because `explore-view` clamped its cards to a
|
|
||||||
* 130–150px range, so two cards in one row could be different widths —
|
|
||||||
* and since the artwork is square, different *heights* as well. A row
|
|
||||||
* of covers with ragged bottoms is what that looks like.
|
|
||||||
*
|
|
||||||
* What makes the fix hold is that the lines below the art each reserve
|
|
||||||
* their own space (`album-card.css.ts`), so an album with no year, no
|
|
||||||
* release type or a one-character title is not shorter than its
|
|
||||||
* neighbour. This measures that rather than trusting it, because the
|
|
||||||
* next component to format a card is the way it comes back.
|
|
||||||
*
|
|
||||||
* The artwork half is the other change: the container was already
|
|
||||||
* square but the image was `object-fit: cover`, so a non-square cover
|
|
||||||
* was cropped to it. It is `contain` now, and the container has no
|
|
||||||
* background of its own, so a tall cover is inset with the page
|
|
||||||
* showing through beside it.
|
|
||||||
*/
|
|
||||||
import { beforeEach, describe, expect, it } from 'vitest';
|
|
||||||
import type { LitElement } from 'lit';
|
|
||||||
|
|
||||||
import '@components/explore-view/explore-view';
|
|
||||||
import { flush, stub, resetHarness } from '@test/support/harness';
|
|
||||||
import { fixture, shadow, shadowAll, update } from '@test/support/render';
|
|
||||||
import { completenessStore } from '@store/completeness-store';
|
|
||||||
|
|
||||||
const SEARCH = 'explore.Service.SearchLocal';
|
|
||||||
const SHELVES = 'explore.Service.GetExploreShelves';
|
|
||||||
|
|
||||||
/** A 1x1 transparent gif, so the `<img>` branch renders. */
|
|
||||||
const TINY_IMAGE =
|
|
||||||
'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
|
|
||||||
|
|
||||||
/** Release groups chosen so every optional line is present on one and
|
|
||||||
* absent on another — that is what a size regression hides behind. */
|
|
||||||
const ALBUMS = [
|
|
||||||
{
|
|
||||||
mbid: 'rg-1',
|
|
||||||
title: 'A',
|
|
||||||
artistCredit: '',
|
|
||||||
artistMbid: 'ar-1',
|
|
||||||
primaryType: '',
|
|
||||||
firstReleaseDate: '',
|
|
||||||
popularity: 1,
|
|
||||||
listenerCount: 1,
|
|
||||||
secondaryTypes: [],
|
|
||||||
inLibrary: false,
|
|
||||||
localId: 0,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
mbid: 'rg-2',
|
|
||||||
title: 'A Very Long Album Name That Will Certainly Be Truncated By The Card',
|
|
||||||
artistCredit: 'An Artist With A Long Name',
|
|
||||||
artistMbid: 'ar-2',
|
|
||||||
primaryType: 'Album',
|
|
||||||
firstReleaseDate: '1994-05-01',
|
|
||||||
popularity: 1,
|
|
||||||
listenerCount: 1,
|
|
||||||
secondaryTypes: [],
|
|
||||||
inLibrary: false,
|
|
||||||
localId: 0,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
mbid: 'rg-3',
|
|
||||||
title: 'Three',
|
|
||||||
artistCredit: 'Another',
|
|
||||||
artistMbid: 'ar-3',
|
|
||||||
primaryType: 'EP',
|
|
||||||
firstReleaseDate: '2001-01-01',
|
|
||||||
popularity: 1,
|
|
||||||
listenerCount: 1,
|
|
||||||
secondaryTypes: [],
|
|
||||||
inLibrary: false,
|
|
||||||
localId: 0,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
async function exploreWithAlbums(): Promise<LitElement> {
|
|
||||||
stub(SHELVES, { shelves: [], state: 'ready' });
|
|
||||||
stub(SEARCH, {
|
|
||||||
artists: [],
|
|
||||||
releaseGroups: ALBUMS,
|
|
||||||
recordings: [],
|
|
||||||
});
|
|
||||||
stub('explore.Service.GetThumbnails', Object.fromEntries(
|
|
||||||
ALBUMS.map((a) => [a.mbid, TINY_IMAGE]),
|
|
||||||
));
|
|
||||||
stub('explore.Service.GetThumbnail', TINY_IMAGE);
|
|
||||||
|
|
||||||
const el = await fixture<LitElement>('explore-view');
|
|
||||||
|
|
||||||
(el as unknown as { onViewActivate: () => void }).onViewActivate?.();
|
|
||||||
await update(el, {
|
|
||||||
results: { artists: [], releaseGroups: ALBUMS, recordings: [] },
|
|
||||||
});
|
|
||||||
await flush();
|
|
||||||
await el.updateComplete;
|
|
||||||
|
|
||||||
return el;
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
resetHarness();
|
|
||||||
stub('library.Library.GetAlbumsCompleteness', {});
|
|
||||||
completenessStore.invalidate();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('the album card size', () => {
|
|
||||||
it('is the same width and height for every card in a row', async () => {
|
|
||||||
const el = await exploreWithAlbums();
|
|
||||||
const cards = shadowAll(el, '.album-card');
|
|
||||||
|
|
||||||
expect(cards.length).toBe(ALBUMS.length);
|
|
||||||
|
|
||||||
const boxes = cards.map((c) => c.getBoundingClientRect());
|
|
||||||
|
|
||||||
// The first card is the reference; every other one must match it.
|
|
||||||
for (const box of boxes) {
|
|
||||||
expect(box.width).toBe(boxes[0]!.width);
|
|
||||||
expect(box.height).toBe(boxes[0]!.height);
|
|
||||||
}
|
|
||||||
|
|
||||||
// …and the reference is a real box, or the loop above is vacuous.
|
|
||||||
expect(boxes[0]!.width).toBeGreaterThan(0);
|
|
||||||
expect(boxes[0]!.height).toBeGreaterThan(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('keeps the artwork square', async () => {
|
|
||||||
const el = await exploreWithAlbums();
|
|
||||||
|
|
||||||
for (const art of shadowAll(el, '.album-art-container')) {
|
|
||||||
const box = art.getBoundingClientRect();
|
|
||||||
|
|
||||||
expect(Math.round(box.width)).toBe(Math.round(box.height));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it('insets a non-square cover rather than cropping it', async () => {
|
|
||||||
const el = await exploreWithAlbums();
|
|
||||||
|
|
||||||
// Read from the parsed stylesheet rather than from a rendered
|
|
||||||
// `<img>`: the search path is what calls `loadThumbnails`, and
|
|
||||||
// setting `results` directly skips it, so there is no image to
|
|
||||||
// measure. The regression worth catching is the rule going back to
|
|
||||||
// `cover`, which is a stylesheet fact.
|
|
||||||
const rules = (el.shadowRoot?.adoptedStyleSheets ?? []).flatMap((sheet) =>
|
|
||||||
Array.from(sheet.cssRules).map((rule) => rule.cssText),
|
|
||||||
);
|
|
||||||
const art = rules.find(
|
|
||||||
(text) =>
|
|
||||||
text.startsWith('.album-art-container img') &&
|
|
||||||
text.includes('object-fit'),
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(art, 'no object-fit rule for the cover image').toBeDefined();
|
|
||||||
expect(art).toContain('object-fit: contain');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('draws the badge over the artwork, and not in the metadata line', async () => {
|
|
||||||
const el = await exploreWithAlbums();
|
|
||||||
const card = shadow(el, '.album-card')!;
|
|
||||||
|
|
||||||
const badge = card.querySelector('.album-art-container .album-card-badge');
|
|
||||||
|
|
||||||
expect(badge).not.toBeNull();
|
|
||||||
// The badge is positioned inside the art box, so its parent is the
|
|
||||||
// square rather than the row underneath it.
|
|
||||||
expect(badge?.parentElement?.classList.contains('album-art-container')).toBe(
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/**
|
|
||||||
* The artist page's header and its top tracks.
|
|
||||||
*
|
|
||||||
* Two cleanups, asserted together because they are one screen:
|
|
||||||
*
|
|
||||||
* - the Play/Shuffle pair became one split button ("Play" with the
|
|
||||||
* words on its title, Shuffle behind the caret), the Follow button
|
|
||||||
* moved onto the same line, and the name and listen count went up a
|
|
||||||
* size;
|
|
||||||
* - a top track's play/request affordance moved onto its artwork,
|
|
||||||
* where a hover reveals it, instead of a badge at the end of the
|
|
||||||
* row beside a row that already plays on a double-click.
|
|
||||||
*/
|
|
||||||
import { describe, expect, it, beforeEach } from 'vitest';
|
|
||||||
import type { LitElement } from 'lit';
|
|
||||||
|
|
||||||
import '@components/explore-artist-details/explore-artist-details';
|
|
||||||
import { stub, flush, emit, resetHarness } from '@test/support/harness';
|
|
||||||
import { Events } from '../../src/events';
|
|
||||||
import { fixture, shadow, shadowAll } from '@test/support/render';
|
|
||||||
|
|
||||||
const ARTIST = 'artist-0001';
|
|
||||||
|
|
||||||
const track = (name: string, localId = 0) => ({
|
|
||||||
recordingMbid: `rec-${name}`,
|
|
||||||
artistName: 'Tideline',
|
|
||||||
trackName: name,
|
|
||||||
totalListenCount: 100,
|
|
||||||
caaReleaseMbid: '',
|
|
||||||
releaseName: 'Foreshore',
|
|
||||||
releaseGroupMbid: 'rg-owned',
|
|
||||||
length: 200000,
|
|
||||||
inLibrary: localId > 0,
|
|
||||||
localId,
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
resetHarness();
|
|
||||||
|
|
||||||
stub('explore.Service.LookupArtist', {
|
|
||||||
mbid: ARTIST,
|
|
||||||
name: 'Tideline',
|
|
||||||
popularity: 1200,
|
|
||||||
type: 'Group',
|
|
||||||
country: 'GB',
|
|
||||||
});
|
|
||||||
stub('explore.Service.TopReleaseGroupsForArtist', []);
|
|
||||||
stub('explore.Service.TopRecordingsForArtist', [
|
|
||||||
track('Owned Song', 7),
|
|
||||||
track('Absent Song'),
|
|
||||||
]);
|
|
||||||
stub('explore.Service.SimilarArtists', []);
|
|
||||||
stub('explore.Service.PrefetchReleases', undefined);
|
|
||||||
stub('explore.Service.BrowseReleaseGroups', [
|
|
||||||
{
|
|
||||||
mbid: 'rg-owned',
|
|
||||||
title: 'Foreshore',
|
|
||||||
artistCredit: 'Tideline',
|
|
||||||
primaryType: 'Album',
|
|
||||||
inLibrary: true,
|
|
||||||
localId: 7,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
stub('library.Library.GetAlbumsCompleteness', {});
|
|
||||||
stub('download.Service.ListRequests', []);
|
|
||||||
});
|
|
||||||
|
|
||||||
async function mount(): Promise<LitElement> {
|
|
||||||
const el = await fixture<LitElement>('explore-artist-details', {
|
|
||||||
artistMBID: ARTIST,
|
|
||||||
artistName: 'Tideline',
|
|
||||||
});
|
|
||||||
|
|
||||||
await flush();
|
|
||||||
|
|
||||||
return el;
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('the artist header', () => {
|
|
||||||
it('offers Play, with Shuffle behind its caret', async () => {
|
|
||||||
const el = await mount();
|
|
||||||
const play = shadow<HTMLElement>(el, '[data-testid="artist-play-library"]')!;
|
|
||||||
|
|
||||||
// The words moved to the title, which is where "Play library
|
|
||||||
// tracks" can still be read without taking the width of a button.
|
|
||||||
expect(play.textContent?.trim()).toBe('Play');
|
|
||||||
expect(play.getAttribute('title')).toBe('Play library tracks');
|
|
||||||
|
|
||||||
const menuButton = shadow(el, '[data-testid="artist-play-menu"]');
|
|
||||||
|
|
||||||
expect(menuButton).not.toBeNull();
|
|
||||||
|
|
||||||
const menu = shadow(el, '#artist-play-menu');
|
|
||||||
|
|
||||||
expect(menu?.textContent).toContain('Shuffle');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('puts Follow on the same line as Play', async () => {
|
|
||||||
const el = await mount();
|
|
||||||
const actions = shadow(el, '.artist-actions')!;
|
|
||||||
|
|
||||||
expect(actions.querySelector('[data-testid="artist-play-library"]')).not.toBeNull();
|
|
||||||
|
|
||||||
const follow = actions.querySelector('[data-testid="artist-follow"]') as HTMLElement;
|
|
||||||
|
|
||||||
expect(follow).not.toBeNull();
|
|
||||||
expect(follow.textContent?.trim()).toBe('Follow');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('says Following once the artist is on the request list', async () => {
|
|
||||||
const el = await mount();
|
|
||||||
|
|
||||||
// The store is a singleton and caches its list, so the change is
|
|
||||||
// announced the way the backend announces one.
|
|
||||||
stub('download.Service.ListRequests', [
|
|
||||||
{ id: 3, mbid: ARTIST, state: 'queued' },
|
|
||||||
]);
|
|
||||||
emit(Events.RequestsChanged);
|
|
||||||
await flush();
|
|
||||||
await el.updateComplete;
|
|
||||||
|
|
||||||
const follow = shadow<HTMLElement>(el, '[data-testid="artist-follow"]')!;
|
|
||||||
|
|
||||||
expect(follow.textContent?.trim()).toBe('Following');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('sizes the name and the listen count above the metadata line', async () => {
|
|
||||||
const el = await mount();
|
|
||||||
|
|
||||||
const title = shadow<HTMLElement>(el, '.artist-title')!;
|
|
||||||
const listens = shadow<HTMLElement>(el, '.artist-listens')!;
|
|
||||||
const meta = shadow<HTMLElement>(el, '.artist-meta')!;
|
|
||||||
|
|
||||||
expect(listens.textContent).toContain('plays on ListenBrainz');
|
|
||||||
|
|
||||||
const titleSize = parseFloat(getComputedStyle(title).fontSize);
|
|
||||||
const listensSize = parseFloat(getComputedStyle(listens).fontSize);
|
|
||||||
const metaSize = parseFloat(getComputedStyle(meta).fontSize);
|
|
||||||
|
|
||||||
expect(titleSize).toBeGreaterThan(24);
|
|
||||||
expect(listensSize).toBeGreaterThan(metaSize);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('a top track’s affordance', () => {
|
|
||||||
it('plays from the artwork when it is owned', async () => {
|
|
||||||
const el = await mount();
|
|
||||||
const rows = shadowAll<HTMLElement>(el, '.track-item');
|
|
||||||
|
|
||||||
const owned = rows.find((r) => r.textContent?.includes('Owned Song'))!;
|
|
||||||
|
|
||||||
expect(owned.querySelector('.track-art-overlay .track-art-play')).not.toBeNull();
|
|
||||||
// Nothing beside the row any more.
|
|
||||||
expect(owned.querySelector(':scope > library-status-indicator')).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('requests from the artwork when it is not', async () => {
|
|
||||||
const el = await mount();
|
|
||||||
const rows = shadowAll<HTMLElement>(el, '.track-item');
|
|
||||||
|
|
||||||
const absent = rows.find((r) => r.textContent?.includes('Absent Song'))!;
|
|
||||||
|
|
||||||
expect(
|
|
||||||
absent.querySelector('.track-art-overlay library-status-indicator'),
|
|
||||||
).not.toBeNull();
|
|
||||||
expect(absent.querySelector('.track-art-overlay .track-art-play')).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -25,9 +25,7 @@ const ARTIST = 'artist-0001';
|
|||||||
|
|
||||||
/** The labels of the open menu's items, trimmed. */
|
/** The labels of the open menu's items, trimmed. */
|
||||||
function menuItems(el: LitElement): string[] {
|
function menuItems(el: LitElement): string[] {
|
||||||
// Scoped to the context menu: the artist page also has a Play/Shuffle
|
const panel = shadow(el, '.context-menu-panel');
|
||||||
// dropdown, and its panel carries the same class.
|
|
||||||
const panel = shadow(el, '#context-menu .context-menu-panel');
|
|
||||||
|
|
||||||
if (!panel) return [];
|
if (!panel) return [];
|
||||||
|
|
||||||
@@ -102,7 +100,7 @@ describe('the context menu on an artist page release', () => {
|
|||||||
|
|
||||||
await openMenuOnAlbum(el, 0);
|
await openMenuOnAlbum(el, 0);
|
||||||
|
|
||||||
const panel = shadow(el, '#context-menu .context-menu-panel');
|
const panel = shadow(el, '.context-menu-panel');
|
||||||
|
|
||||||
expect(panel).toBeTruthy();
|
expect(panel).toBeTruthy();
|
||||||
// The panel is shared with the track menu, so a label that does not
|
// The panel is shared with the track menu, so a label that does not
|
||||||
|
|||||||
@@ -1,131 +0,0 @@
|
|||||||
/**
|
|
||||||
* A horizontally scrolling row can be moved without a wheel.
|
|
||||||
*
|
|
||||||
* Until this existed the only way to see the cards past the fold on the
|
|
||||||
* shelves, the search results and the artist page's discography was a
|
|
||||||
* mousewheel or a trackpad gesture — which is not an affordance. A
|
|
||||||
* mouse with no horizontal wheel simply could not reach them.
|
|
||||||
*
|
|
||||||
* What is asserted here is the state that makes the arrows honest: an
|
|
||||||
* arrow is `hidden` at the end it cannot move from, because a control
|
|
||||||
* that cannot act is worse than none, and an invisible one still holds
|
|
||||||
* a hit area and a tab stop.
|
|
||||||
*/
|
|
||||||
import { beforeEach, describe, expect, it } from 'vitest';
|
|
||||||
import type { LitElement } from 'lit';
|
|
||||||
|
|
||||||
import '@components/scroll-row/scroll-row';
|
|
||||||
import { fixture } from '@test/support/render';
|
|
||||||
|
|
||||||
/** Six 100px cards in a 320px row — comfortably overflowing. */
|
|
||||||
function content(el: Element): void {
|
|
||||||
for (let i = 0; i < 6; i += 1) {
|
|
||||||
const card = document.createElement('div');
|
|
||||||
|
|
||||||
card.style.cssText = 'flex: 0 0 100px; height: 40px';
|
|
||||||
card.textContent = String(i);
|
|
||||||
el.append(card);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function arrows(el: LitElement): { prev: HTMLButtonElement; next: HTMLButtonElement } {
|
|
||||||
const root = el.shadowRoot!;
|
|
||||||
|
|
||||||
return {
|
|
||||||
prev: root.querySelector('.arrow.prev') as HTMLButtonElement,
|
|
||||||
next: root.querySelector('.arrow.next') as HTMLButtonElement,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function viewport(el: LitElement): HTMLElement {
|
|
||||||
return el.shadowRoot!.querySelector('.viewport') as HTMLElement;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function row(): Promise<LitElement> {
|
|
||||||
const el = await fixture<LitElement>('scroll-row');
|
|
||||||
|
|
||||||
el.style.display = 'block';
|
|
||||||
el.style.width = '320px';
|
|
||||||
content(el);
|
|
||||||
await el.updateComplete;
|
|
||||||
// The observer reports on a later frame than a microtask drain.
|
|
||||||
await new Promise((r) => setTimeout(r, 60));
|
|
||||||
await el.updateComplete;
|
|
||||||
|
|
||||||
return el;
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('<scroll-row>', () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
document.body.style.margin = '0';
|
|
||||||
});
|
|
||||||
|
|
||||||
it('draws an arrow for each direction it can still move', async () => {
|
|
||||||
const el = await row();
|
|
||||||
const { prev, next } = arrows(el);
|
|
||||||
|
|
||||||
expect(prev).not.toBeNull();
|
|
||||||
expect(next).not.toBeNull();
|
|
||||||
|
|
||||||
// At the start there is nothing behind, so only the forward arrow is
|
|
||||||
// offered.
|
|
||||||
expect(prev.hasAttribute('hidden')).toBe(true);
|
|
||||||
expect(next.hasAttribute('hidden')).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('offers the way back once the row has moved', async () => {
|
|
||||||
const el = await row();
|
|
||||||
const vp = viewport(el);
|
|
||||||
|
|
||||||
vp.scrollLeft = 120;
|
|
||||||
vp.dispatchEvent(new Event('scroll'));
|
|
||||||
await el.updateComplete;
|
|
||||||
|
|
||||||
expect(arrows(el).prev.hasAttribute('hidden')).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('stands the forward arrow down at the end', async () => {
|
|
||||||
const el = await row();
|
|
||||||
const vp = viewport(el);
|
|
||||||
|
|
||||||
vp.scrollLeft = vp.scrollWidth;
|
|
||||||
vp.dispatchEvent(new Event('scroll'));
|
|
||||||
await el.updateComplete;
|
|
||||||
|
|
||||||
expect(arrows(el).next.hasAttribute('hidden')).toBe(true);
|
|
||||||
expect(arrows(el).prev.hasAttribute('hidden')).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('moves the row when the arrow is pressed', async () => {
|
|
||||||
const el = await row();
|
|
||||||
const vp = viewport(el);
|
|
||||||
|
|
||||||
expect(vp.scrollLeft).toBe(0);
|
|
||||||
|
|
||||||
arrows(el).next.click();
|
|
||||||
|
|
||||||
await expect.poll(() => vp.scrollLeft).toBeGreaterThan(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('shows nothing to scroll when the content fits', async () => {
|
|
||||||
const el = await fixture<LitElement>('scroll-row');
|
|
||||||
|
|
||||||
el.style.cssText = 'display: block; width: 320px';
|
|
||||||
|
|
||||||
const only = document.createElement('div');
|
|
||||||
|
|
||||||
only.style.cssText = 'flex: 0 0 100px; height: 40px';
|
|
||||||
only.textContent = 'one';
|
|
||||||
el.append(only);
|
|
||||||
await el.updateComplete;
|
|
||||||
await new Promise((r) => setTimeout(r, 60));
|
|
||||||
await el.updateComplete;
|
|
||||||
await new Promise((r) => requestAnimationFrame(() => r(null)));
|
|
||||||
await el.updateComplete;
|
|
||||||
|
|
||||||
const { prev, next } = arrows(el);
|
|
||||||
|
|
||||||
expect(prev.hasAttribute('hidden')).toBe(true);
|
|
||||||
expect(next.hasAttribute('hidden')).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,28 +1,24 @@
|
|||||||
/**
|
/**
|
||||||
* The catalog's cards are not dimmed; the badge is the mark.
|
* Owned is plain; unowned is what gets marked.
|
||||||
*
|
*
|
||||||
* The rule this replaced had every unowned card dimmed *and* badged,
|
* `explore-album-details` had this right for one tracklist and nothing
|
||||||
* which on a shelf of mostly-unowned covers read as a page that had
|
* else did: Explore's cards, the top-results row and the artist page's
|
||||||
* failed to load rather than a page of things you could ask for. So the
|
* three card shapes all mixed owned and unowned with a small badge as
|
||||||
* dimming is gone from the catalog surfaces and the badge carries the
|
* the only difference — and drew a green tick on the *common* case,
|
||||||
* whole statement — over the artwork, on hover, drawn for owned and
|
* which is the treatment the album page's own green ticks were removed
|
||||||
* unowned alike.
|
* for.
|
||||||
*
|
*
|
||||||
* What is still pinned here is the half that was never about dimming:
|
* What is pinned here is the rule rather than any one surface, because
|
||||||
|
* the fault this replaced was eight call sites each holding their own
|
||||||
|
* version of it:
|
||||||
*
|
*
|
||||||
|
* - an owned thing draws **no badge at all**;
|
||||||
|
* - an unowned one is dimmed *and* says so in its accessible name,
|
||||||
|
* because dimming is a colour and cannot be the only signal;
|
||||||
* - ownership is a **file** (`localId`), never the catalog's
|
* - ownership is a **file** (`localId`), never the catalog's
|
||||||
* `inLibrary` ratchet, which is a flag that happens to agree;
|
* `inLibrary` ratchet, which is a flag that happens to agree;
|
||||||
* - a row that cannot be played is `aria-disabled`, while a card that
|
* - and a partly-held album says *how* partly, which is the one thing
|
||||||
* still navigates is not;
|
* a tick cannot.
|
||||||
* - a partly-held album says *how* partly, which is the one thing a
|
|
||||||
* tick cannot;
|
|
||||||
* - and an unowned thing still says so in its accessible name, because
|
|
||||||
* with the dimming gone that name is the whole signal for anyone not
|
|
||||||
* seeing the badge.
|
|
||||||
*
|
|
||||||
* The album page's *tracklist* still dims unowned rows — a different
|
|
||||||
* statement about a different thing — and is covered by
|
|
||||||
* `album-request-badge-visibility.test.ts`.
|
|
||||||
*/
|
*/
|
||||||
import { beforeEach, describe, expect, it } from 'vitest';
|
import { beforeEach, describe, expect, it } from 'vitest';
|
||||||
import { page } from 'vitest/browser';
|
import { page } from 'vitest/browser';
|
||||||
@@ -30,7 +26,7 @@ import { page } from 'vitest/browser';
|
|||||||
import '@components/explore-view/explore-view';
|
import '@components/explore-view/explore-view';
|
||||||
import '@components/top-results-row/top-results-row';
|
import '@components/top-results-row/top-results-row';
|
||||||
import { flush, stub, resetHarness } from '@test/support/harness';
|
import { flush, stub, resetHarness } from '@test/support/harness';
|
||||||
import { fixture, shadow, update } from '@test/support/render';
|
import { fixture, shadow, shadowAll, update } from '@test/support/render';
|
||||||
import { completenessStore } from '@store/completeness-store';
|
import { completenessStore } from '@store/completeness-store';
|
||||||
|
|
||||||
const SEARCH = 'explore.Service.SearchLocal';
|
const SEARCH = 'explore.Service.SearchLocal';
|
||||||
@@ -109,44 +105,27 @@ beforeEach(() => {
|
|||||||
// absent one — which is the point, or 87% of a grid re-asks forever.
|
// absent one — which is the point, or 87% of a grid re-asks forever.
|
||||||
// Two tests in one file are two sessions as far as it is concerned,
|
// Two tests in one file are two sessions as far as it is concerned,
|
||||||
// so a stale entry from the test above would otherwise decide the
|
// so a stale entry from the test above would otherwise decide the
|
||||||
// one below.
|
// one below. Found by writing the assertion the wrong way round.
|
||||||
completenessStore.invalidate();
|
completenessStore.invalidate();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('an unowned card is marked by its badge alone', () => {
|
describe('an owned thing is plain', () => {
|
||||||
it('does not dim the artwork', async () => {
|
it('draws no badge on an album card it has files for', async () => {
|
||||||
const el = await exploreShowing({
|
|
||||||
releaseGroups: [album('Absent', {})],
|
|
||||||
});
|
|
||||||
|
|
||||||
const art = shadow(el, '.album-card .album-art-container')!;
|
|
||||||
|
|
||||||
// The dimming was an opacity on this box. With it gone the cover is
|
|
||||||
// at full strength, and the badge is what says the card is not
|
|
||||||
// yours.
|
|
||||||
expect(getComputedStyle(art).opacity).toBe('1');
|
|
||||||
expect(shadow(el, '.album-card library-status-indicator')).not.toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('still says so in the name the browser computes', async () => {
|
|
||||||
await exploreShowing({ releaseGroups: [album('Absent', {})] });
|
|
||||||
|
|
||||||
await expect
|
|
||||||
.element(page.getByRole('button', { name: /Absent — not in your library/ }))
|
|
||||||
.toBeInTheDocument();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('an owned card is plain except for its badge', () => {
|
|
||||||
it('draws the in-library badge rather than nothing', async () => {
|
|
||||||
const el = await exploreShowing({
|
const el = await exploreShowing({
|
||||||
releaseGroups: [album('Held', { localId: 7 })],
|
releaseGroups: [album('Held', { localId: 7 })],
|
||||||
});
|
});
|
||||||
|
|
||||||
const badge = shadow(el, '.album-card library-status-indicator');
|
expect(shadowAll(el, '.album-card')).toHaveLength(1);
|
||||||
|
expect(shadow(el, '.album-card library-status-indicator')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
expect(badge).not.toBeNull();
|
it('draws no badge on a track row it has a file for', async () => {
|
||||||
expect(badge?.getAttribute('status')).toBe('in-library');
|
const el = await exploreShowing({
|
||||||
|
recordings: [recording('Held', { localId: 9 })],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(shadowAll(el, '.track-item')).toHaveLength(1);
|
||||||
|
expect(shadow(el, '.track-item library-status-indicator')).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('does not dim it', async () => {
|
it('does not dim it', async () => {
|
||||||
@@ -160,6 +139,56 @@ describe('an owned card is plain except for its badge', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('an unowned thing is marked', () => {
|
||||||
|
it('dims the card and keeps its request badge', async () => {
|
||||||
|
const el = await exploreShowing({
|
||||||
|
releaseGroups: [album('Absent', {})],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(shadow(el, '.album-card')?.classList.contains('unowned')).toBe(true);
|
||||||
|
expect(shadow(el, '.album-card library-status-indicator')).not.toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The name is the half of this that reaches anyone not seeing the
|
||||||
|
* dimming, so it has to be the browser's own answer — a shadow-root
|
||||||
|
* query cannot compute a name, and this repo has shipped a nameless
|
||||||
|
* control three times.
|
||||||
|
*/
|
||||||
|
it('says so in the name the browser computes', async () => {
|
||||||
|
await exploreShowing({ releaseGroups: [album('Absent', {})] });
|
||||||
|
|
||||||
|
await expect
|
||||||
|
.element(page.getByRole('button', { name: /Absent — not in your library/ }))
|
||||||
|
.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A track row is `aria-disabled` and a card is not, and the
|
||||||
|
* difference is not cosmetic: activating an unowned row does nothing
|
||||||
|
* (`onRecordingRowDblClick` returns early), while a card navigates to
|
||||||
|
* the catalog page for it, which is a perfectly good thing to do with
|
||||||
|
* something you do not own.
|
||||||
|
*/
|
||||||
|
it('marks a row that cannot be played as disabled', async () => {
|
||||||
|
const el = await exploreShowing({
|
||||||
|
recordings: [recording('Absent', {})],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(shadow(el, '.track-item')?.getAttribute('aria-disabled')).toBe(
|
||||||
|
'true',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves a card that still navigates enabled', async () => {
|
||||||
|
const el = await exploreShowing({
|
||||||
|
releaseGroups: [album('Absent', {})],
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(shadow(el, '.album-card')?.getAttribute('aria-disabled')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The decision this issue turned on.
|
* The decision this issue turned on.
|
||||||
*
|
*
|
||||||
@@ -177,9 +206,7 @@ describe('ownership is a file, not a flag', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
expect(shadow(el, '.album-card')?.classList.contains('unowned')).toBe(true);
|
expect(shadow(el, '.album-card')?.classList.contains('unowned')).toBe(true);
|
||||||
expect(
|
expect(shadow(el, '.album-card library-status-indicator')).not.toBeNull();
|
||||||
shadow(el, '.album-card library-status-indicator')?.getAttribute('status'),
|
|
||||||
).not.toBe('in-library');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('does the same for a track row', async () => {
|
it('does the same for a track row', async () => {
|
||||||
@@ -193,26 +220,6 @@ describe('ownership is a file, not a flag', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('a track row that cannot be played is disabled', () => {
|
|
||||||
it('marks an unowned row', async () => {
|
|
||||||
const el = await exploreShowing({
|
|
||||||
recordings: [recording('Absent', {})],
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(shadow(el, '.track-item')?.getAttribute('aria-disabled')).toBe(
|
|
||||||
'true',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('leaves a card that still navigates enabled', async () => {
|
|
||||||
const el = await exploreShowing({
|
|
||||||
releaseGroups: [album('Absent', {})],
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(shadow(el, '.album-card')?.getAttribute('aria-disabled')).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The count, which is what `#16`'s deferred third step asked for: an
|
* The count, which is what `#16`'s deferred third step asked for: an
|
||||||
* album held 2 tracks of 10 wore the same green tick as one held whole,
|
* album held 2 tracks of 10 wore the same green tick as one held whole,
|
||||||
@@ -241,13 +248,9 @@ describe('a partly-held album says how partly', () => {
|
|||||||
|
|
||||||
// A partly-held album is *actionable* — it has three tracks left to
|
// A partly-held album is *actionable* — it has three tracks left to
|
||||||
// ask for — so the badge is a button, and the name has to carry the
|
// ask for — so the badge is a button, and the name has to carry the
|
||||||
// action and the count. The badge is revealed by the card's focus
|
// action and the count. Naming it after the action alone left the
|
||||||
// (`:focus-within`), and `visibility: hidden` is what takes it out
|
// one state the ring exists for as the one state whose name did not
|
||||||
// of the accessibility tree until then, so the card is focused
|
// mention it.
|
||||||
// first — which is exactly the route a keyboard user takes.
|
|
||||||
shadow<HTMLElement>(el, '.album-card')?.focus();
|
|
||||||
await el.updateComplete;
|
|
||||||
|
|
||||||
await expect
|
await expect
|
||||||
.element(
|
.element(
|
||||||
page.getByRole('button', {
|
page.getByRole('button', {
|
||||||
@@ -263,7 +266,7 @@ describe('a partly-held album says how partly', () => {
|
|||||||
* state, and a ring drawn from its absence would mark all of it
|
* state, and a ring drawn from its absence would mark all of it
|
||||||
* incomplete on no evidence. That is the rule `Known` exists for.
|
* incomplete on no evidence. That is the rule `Known` exists for.
|
||||||
*/
|
*/
|
||||||
it('falls back to the plain in-library badge when the total was never declared', async () => {
|
it('says nothing when the total was never declared', async () => {
|
||||||
stub(COMPLETENESS, {
|
stub(COMPLETENESS, {
|
||||||
'7': { owned: 3, expected: 0, known: false, complete: false },
|
'7': { owned: 3, expected: 0, known: false, complete: false },
|
||||||
});
|
});
|
||||||
@@ -276,9 +279,7 @@ describe('a partly-held album says how partly', () => {
|
|||||||
await flush();
|
await flush();
|
||||||
await el.updateComplete;
|
await el.updateComplete;
|
||||||
|
|
||||||
expect(
|
expect(shadow(el, '.album-card library-status-indicator')).toBeNull();
|
||||||
shadow(el, '.album-card library-status-indicator')?.getAttribute('status'),
|
|
||||||
).toBe('in-library');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('asks about the owned albums only, in one call', async () => {
|
it('asks about the owned albums only, in one call', async () => {
|
||||||
@@ -328,13 +329,11 @@ describe('the top-results row follows the same rule', () => {
|
|||||||
query: 'held',
|
query: 'held',
|
||||||
});
|
});
|
||||||
|
|
||||||
// A top-result card is a mixed bag — artist, album or track — and
|
|
||||||
// its badge is a corner mark rather than the cover overlay the
|
|
||||||
// album cards grew, so an owned one stays plain.
|
|
||||||
expect(shadow(el, '.card library-status-indicator')).toBeNull();
|
expect(shadow(el, '.card library-status-indicator')).toBeNull();
|
||||||
|
expect(shadow(el, '.card')?.classList.contains('unowned')).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('names something it does not own', async () => {
|
it('dims and names something it does not', async () => {
|
||||||
const el = await fixture('top-results-row', {
|
const el = await fixture('top-results-row', {
|
||||||
results: [result('Absent', 'release_group')],
|
results: [result('Absent', 'release_group')],
|
||||||
query: 'absent',
|
query: 'absent',
|
||||||
@@ -350,7 +349,7 @@ describe('the top-results row follows the same rule', () => {
|
|||||||
/**
|
/**
|
||||||
* An artist card has never had a badge — a discography subscription
|
* An artist card has never had a badge — a discography subscription
|
||||||
* is the artist page's Follow button, which can say what it commits
|
* is the artist page's Follow button, which can say what it commits
|
||||||
* to — so the name is the whole signal there.
|
* to — so the dimming and the name are the whole signal there.
|
||||||
*/
|
*/
|
||||||
it('marks an unowned artist without offering a request', async () => {
|
it('marks an unowned artist without offering a request', async () => {
|
||||||
const el = await fixture('top-results-row', {
|
const el = await fixture('top-results-row', {
|
||||||
|
|||||||
Reference in new issue
Block a user