mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 14:35:41 +00:00
003b280a77
* feat(enrichment): oximedia BPM/mood facts, mood search, and queue UI Run client-side oximedia analysis after CPU seed and persist BPM, mood JSON, and searchable mood_tag facts. Add product mood groups (joy/sadness/dance/work/ romance) with Advanced Search filter on the local index, queue BPM/mood display, migration 008 mood_tag index, and refreshed licenses for oximedia crates. * fix(enrichment): keep mood_groups module comment in English * feat(search): virtual mood groups, anger filter, and Advanced Search UX Expand mood search via overlapping virtual groups (tag expansion only), add anger/Злость group, skip album/artist shortcuts for track-only filters, and simplify mood search UI (songs-only, hide type tabs). Fix CustomSelect spurious scrollbar on short option lists. * feat(analysis): unified track analysis plan and enqueue path Add TrackAnalysisPlan (waveform, LUFS, enrichment) with a single enqueue_track_analysis entry for all byte-backed triggers. Run enrichment when cache is full but library facts are missing; route playback, cache, and backfill through the planner. Fix browseTextSearch LocalSearchOpts tsc gap and remove obsolete read_seed_bytes_if_needed helper. * fix(analysis): wire playback dispatch, preload enrichment, and UI refresh Route stream, gapless, preload, and local-file playback through analysis_dispatch so BPM/mood enrichment runs when waveform/LUFS are already cached. Fix audio_preload cache-hit and hot-cache paths, emit preload-cancelled for retry, and add analysis:enrichment-updated plus content_cache_coverage key resolution. * fix(audio): preload local files from disk and stop analysis retry loop Seed hot/offline next tracks via LocalFilePlayback (512 MiB) instead of copying into the RAM preload slot. Keep bytePreloadingId set after preload-ready so progress ticks do not re-invoke audio_preload every second. * fix(enrichment): clippy, album bpm filter routing, and queue mood display Clippy-clean analysis_dispatch and engine imports; restrict track-derived album routing to mood_group/mood_tag only so bpm is skipped on album queries. Log enrichment plan errors with retry-all plan; filter queue mood labels to oximedia ids. * fix(enrichment): simplify mood_tag backfill branch in plan_track_enrichment Remove empty if-block; keep same behaviour when backfill fails and moods row exists. * docs: CHANGELOG and credits for track enrichment PR #863 * docs(credits): track enrichment PR #863 contributor line * chore(enrichment): clippy-clean plan branch and trim dead exports Collapse mood_tag backfill if for clippy; remove unused moodGroupById and OXIMEDIA_MOOD_LABELS re-exports; stop poll when server BPM is already known. * fix(enrichment): close R2/S1–S3 limits and Song Info BPM fallback Return TrackEnrichmentOutcome::Failed on oximedia errors so retries are not masked as complete; extract mood Advanced Search SQL, unify top-3 mood tag selection in mood_groups with TS invariant tests, and show measured BPM in Song Info when tag BPM is missing or zero. * fix(enrichment): restore offline coverage and show mood in Song Info Add unit tests for offline download cancel/clear registry after the analysis seed refactor dropped read_seed_bytes coverage; show localized mood labels in Song Info when library enrichment facts exist. * fix(enrichment): soft mood scoring and unblock offline cancel tests Replace oximedia quadrant happy/excited mapping with valence/arousal soft scores across all mood tags for display, storage, and backfill; fix offline cancel unit tests that deadlocked by calling clear while holding the global offline_cancel_flags mutex. * fix(enrichment): dedupe joy cluster and cap mood display at two labels Never show happy and excited together; pick one tag per V/A cluster, tighten oximedia recalibration, and limit queue/Song Info to two moods that pass a relative score floor. * fix(enrichment): disable oximedia mood labels in UI and search tags Oximedia 0.1.7 mood is a spectral energy heuristic, not independent mood weights; valence correlates with loud/bright audio and false-labels metal and lyrical tracks as happy. Hide queue/Song Info mood and stop writing mood_tag facts until a reliable detector lands; keep V/A/moods JSON stored. * fix(enrichment): disable oximedia mood analysis and add BPM advanced search Stop planning, running, and storing oximedia mood facts; purge accumulated mood rows via migration 009. Hide mood filters in Advanced Search, expose BPM range filter with dual-storage resolution, and show a BPM column in song results when that filter is active. * feat(search): analysis BPM priority, source tooltip, and filter UX Prefer analysis track_fact over file tags for BPM resolution; show source in list tooltips. Validate BPM range on blur, add clear button, fix double tooltip. * fix(enrichment): prefer analysis BPM in Song Info and queue tech row Show measured track_fact BPM before file tags until analysis completes; pick the highest-confidence analysis fact when several exist.
149 lines
5.7 KiB
TypeScript
149 lines
5.7 KiB
TypeScript
import type { SubsonicSong } from '../api/subsonicTypes';
|
||
import { songToTrack } from '../utils/playback/songToTrack';
|
||
import React, { memo } from 'react';
|
||
import { useNavigate } from 'react-router-dom';
|
||
import { Play, ListPlus } from 'lucide-react';
|
||
import { useTranslation } from 'react-i18next';
|
||
import { usePlayerStore } from '../store/playerStore';
|
||
import { enqueueAndPlay } from '../utils/playback/playSong';
|
||
import { useDragDrop } from '../contexts/DragDropContext';
|
||
import { useOrbitSongRowBehavior } from '../hooks/useOrbitSongRowBehavior';
|
||
import { formatTrackTime } from '../utils/format/formatDuration';
|
||
|
||
interface Props {
|
||
song: SubsonicSong;
|
||
showBpm?: boolean;
|
||
}
|
||
|
||
function SongRow({ song, showBpm }: Props) {
|
||
const navigate = useNavigate();
|
||
const { t } = useTranslation();
|
||
const enqueue = usePlayerStore(s => s.enqueue);
|
||
const openContextMenu = usePlayerStore(s => s.openContextMenu);
|
||
const isCurrent = usePlayerStore(s => s.currentTrack?.id === song.id);
|
||
const psyDrag = useDragDrop();
|
||
const { orbitActive, addTrackToOrbit } = useOrbitSongRowBehavior();
|
||
|
||
// In an orbit session both buttons collapse into the orbit-suggest / host-enqueue
|
||
// path so we don't ship a queue replacement to every guest.
|
||
const handlePlay = () => {
|
||
if (orbitActive) { addTrackToOrbit(song.id); return; }
|
||
enqueueAndPlay(song);
|
||
};
|
||
|
||
const handleEnqueue = () => {
|
||
if (orbitActive) { addTrackToOrbit(song.id); return; }
|
||
enqueue([songToTrack(song)]);
|
||
};
|
||
|
||
const bpmTooltip =
|
||
song.localBpmSource === 'analysis'
|
||
? t('search.bpmSourceAnalysis')
|
||
: song.localBpmSource === 'tag'
|
||
? t('search.bpmSourceTag')
|
||
: undefined;
|
||
|
||
return (
|
||
<div
|
||
className={`song-list-row${isCurrent ? ' is-current' : ''}${showBpm ? ' song-list-row--with-bpm' : ''}`}
|
||
onDoubleClick={handlePlay}
|
||
onContextMenu={(e) => {
|
||
e.preventDefault();
|
||
openContextMenu(e.clientX, e.clientY, song, 'song');
|
||
}}
|
||
onMouseDown={(e) => {
|
||
if (e.button !== 0) return;
|
||
const sx = e.clientX, sy = e.clientY;
|
||
const track = songToTrack(song);
|
||
const onMove = (me: MouseEvent) => {
|
||
if (Math.abs(me.clientX - sx) > 5 || Math.abs(me.clientY - sy) > 5) {
|
||
document.removeEventListener('mousemove', onMove);
|
||
document.removeEventListener('mouseup', onUp);
|
||
psyDrag.startDrag(
|
||
{ data: JSON.stringify({ type: 'song', track }), label: song.title },
|
||
me.clientX, me.clientY,
|
||
);
|
||
}
|
||
};
|
||
const onUp = () => {
|
||
document.removeEventListener('mousemove', onMove);
|
||
document.removeEventListener('mouseup', onUp);
|
||
};
|
||
document.addEventListener('mousemove', onMove);
|
||
document.addEventListener('mouseup', onUp);
|
||
}}
|
||
>
|
||
<div className="song-list-row-cell song-list-row-actions">
|
||
<button
|
||
className="song-list-row-btn song-list-row-btn--play"
|
||
onClick={(e) => { e.stopPropagation(); handlePlay(); }}
|
||
aria-label="Play"
|
||
>
|
||
<Play size={14} fill="currentColor" />
|
||
</button>
|
||
<button
|
||
className="song-list-row-btn"
|
||
onClick={(e) => { e.stopPropagation(); handleEnqueue(); }}
|
||
aria-label="Enqueue"
|
||
>
|
||
<ListPlus size={14} />
|
||
</button>
|
||
</div>
|
||
<div className="song-list-row-cell song-list-row-title truncate" title={song.title}>{song.title}</div>
|
||
<div className="song-list-row-cell truncate">
|
||
<span
|
||
className={song.artistId ? 'track-artist-link' : ''}
|
||
style={{ cursor: song.artistId ? 'pointer' : 'default' }}
|
||
onClick={(e) => { if (song.artistId) { e.stopPropagation(); navigate(`/artist/${song.artistId}`); } }}
|
||
title={song.artist}
|
||
>{song.artist}</span>
|
||
</div>
|
||
<div className="song-list-row-cell truncate">
|
||
{song.albumId ? (
|
||
<span
|
||
className="track-artist-link"
|
||
style={{ cursor: 'pointer' }}
|
||
onClick={(e) => { e.stopPropagation(); navigate(`/album/${song.albumId}`); }}
|
||
title={song.album}
|
||
>{song.album}</span>
|
||
) : <span title={song.album}>{song.album}</span>}
|
||
</div>
|
||
<div className="song-list-row-cell song-list-row-genre truncate" title={song.genre ?? ''}>
|
||
{song.genre ?? '—'}
|
||
</div>
|
||
{showBpm && (
|
||
<div
|
||
className="song-list-row-cell song-list-row-bpm"
|
||
data-tooltip={bpmTooltip}
|
||
>
|
||
{song.bpm != null && song.bpm > 0 ? song.bpm : '—'}
|
||
</div>
|
||
)}
|
||
<div className="song-list-row-cell song-list-row-duration">{formatTrackTime(song.duration, '–')}</div>
|
||
</div>
|
||
);
|
||
}
|
||
|
||
/** Column header with the same grid as <SongRow>. Optional — pages can render it above the list. */
|
||
export function SongListHeader({ showBpm }: { showBpm?: boolean } = {}) {
|
||
const { t } = useTranslation();
|
||
return (
|
||
<div
|
||
className={`song-list-row song-list-row--header${showBpm ? ' song-list-row--with-bpm' : ''}`}
|
||
role="row"
|
||
>
|
||
<div className="song-list-row-cell song-list-row-actions" />
|
||
<div className="song-list-row-cell">{t('albumDetail.trackTitle')}</div>
|
||
<div className="song-list-row-cell">{t('albumDetail.trackArtist')}</div>
|
||
<div className="song-list-row-cell">{t('albumDetail.trackAlbum')}</div>
|
||
<div className="song-list-row-cell">{t('randomMix.trackGenre')}</div>
|
||
{showBpm && (
|
||
<div className="song-list-row-cell song-list-row-bpm">{t('albumDetail.trackBpm')}</div>
|
||
)}
|
||
<div className="song-list-row-cell song-list-row-duration">{t('albumDetail.trackDuration')}</div>
|
||
</div>
|
||
);
|
||
}
|
||
|
||
export default memo(SongRow);
|