fix: consistent artist parsing across player, NP overlay, and song list

Extract parseArtists() helper — uses Navidrome's resolved artists array
when it has multiple entries, otherwise splits artist string on ';' only.
Removes old split on / that broke Au/Ra, HUNTR/X etc everywhere.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
HoneyandClaude Sonnet 4.6 committed 2026-05-23 13:08:33 +02:00
1 parent 7b4e221881
commit 467ee8a0fe
2 files changed
+16 -14

No files matched your search

+2 -4
View File
@@ -2,7 +2,7 @@ import { S } from './state.js';
import { esc, formatDur } from './utils.js'; import { esc, formatDur } from './utils.js';
import { coverUrl } from './api.js'; import { coverUrl } from './api.js';
// Circular imports — safe (only used inside event handlers after module init) // Circular imports — safe (only used inside event handlers after module init)
import { playQueue, toggleStar, playPreview } from './player.js'; import { playQueue, toggleStar, playPreview, parseArtists } from './player.js';
import { showCtxMenu, openDlModal } from './ui.js'; import { showCtxMenu, openDlModal } from './ui.js';
import { navigate, quickPlayAlbum, quickPlayArtist } from './views.js'; import { navigate, quickPlayAlbum, quickPlayArtist } from './views.js';
@@ -33,9 +33,7 @@ export function makeSongItem(s, idx, list, { noArtistLink = false, noAlbumLink =
el.className = 'song-item' + (S.queue[S.qIdx]?.id === s.id ? ' playing' : ''); el.className = 'song-item' + (S.queue[S.qIdx]?.id === s.id ? ' playing' : '');
el.dataset.songId = s.id; el.dataset.songId = s.id;
const cv = coverUrl(s.coverArt, 128); const cv = coverUrl(s.coverArt, 128);
const artistParts = Array.isArray(s.artists) && s.artists.length const artistParts = parseArtists(s);
? s.artists
: s.artist ? [{ name: s.artist, id: s.artistId || '' }] : [];
const artistHtml = artistParts.length const artistHtml = artistParts.length
? artistParts.map(a => noArtistLink ? artistParts.map(a => noArtistLink
? `<span style="color:var(--text2)">${esc(a.name)}</span>` ? `<span style="color:var(--text2)">${esc(a.name)}</span>`
+14 -10
View File
@@ -442,14 +442,20 @@ function _updatePlayingHighlights() {
}); });
} }
// Returns [{name, id}] using Navidrome's resolved artists when available,
// otherwise splits the artist string on ';' only (safe for names like Au/Ra).
export function parseArtists(s) {
if (Array.isArray(s.artists) && s.artists.length > 1) return s.artists;
return (s.artist || '').split(/\s*;\s*/).filter(Boolean)
.map((name, i) => ({ name, id: i === 0 ? (s.artistId || '') : '' }));
}
export function updatePlayerUI(s, _skipMediaSession = false) { export function updatePlayerUI(s, _skipMediaSession = false) {
document.getElementById('player-title').textContent = s.title; document.getElementById('player-title').textContent = s.title;
const artistParts = (s.artist || '').split(/\s*(?:\/|•|,)\s*/).filter(Boolean); const artistParts = parseArtists(s);
document.getElementById('player-artist-name').innerHTML = artistParts.length document.getElementById('player-artist-name').innerHTML = artistParts.length
? artistParts.map((name, i) => { ? artistParts.map(a => `<span style="cursor:pointer" onclick="s_goArtist(event,'${esc(a.name)}','${a.id||''}')">${esc(a.name)}</span>`)
const aid = i === 0 ? (s.artistId || '') : ''; .join('<span style="color:var(--text3)"> • </span>')
return `<span style="cursor:pointer" onclick="s_goArtist(event,'${esc(name)}','${aid}')">${esc(name)}</span>`;
}).join('<span style="color:var(--text3)"> • </span>')
: '—'; : '—';
document.getElementById('player-album-name').textContent = s.album || ''; document.getElementById('player-album-name').textContent = s.album || '';
const art = document.getElementById('player-art'); const art = document.getElementById('player-art');
@@ -515,12 +521,10 @@ export function _syncNpDirect(s) {
const t = document.getElementById('np-title'); if(t) t.textContent = s.title || '—'; const t = document.getElementById('np-title'); if(t) t.textContent = s.title || '—';
const an = document.getElementById('np-artist-name'); const an = document.getElementById('np-artist-name');
if(an) { if(an) {
const parts = (s.artist || '').split(/\s*(?:\/|•|,)\s*/).filter(Boolean); const parts = parseArtists(s);
an.innerHTML = parts.length an.innerHTML = parts.length
? parts.map((name, i) => { ? parts.map(a => `<span style="cursor:pointer" onclick="closeNowPlaying();s_goArtist(event,'${esc(a.name)}','${a.id||''}')">${esc(a.name)}</span>`)
const aid = i === 0 ? (s.artistId || '') : ''; .join('<span style="opacity:.5"> • </span>')
return `<span style="cursor:pointer" onclick="closeNowPlaying();s_goArtist(event,'${esc(name)}','${aid}')">${esc(name)}</span>`;
}).join('<span style="opacity:.5"> • </span>')
: '—'; : '—';
} }
const aln = document.getElementById('np-album-name'); if(aln) aln.textContent = s.album || ''; const aln = document.getElementById('np-album-name'); if(aln) aln.textContent = s.album || '';