mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 06:25:41 +00:00
feat(enrichment): oximedia BPM/mood facts, mood search, and queue display (#863)
* 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.
This commit is contained in:
@@ -25,15 +25,19 @@ import { search } from '../../api/subsonicSearch';
|
||||
import { libraryScopeForServer } from '../../api/subsonicClient';
|
||||
import { libraryIsReady } from './libraryReady';
|
||||
import { logLibrarySearch, timed } from './libraryDevLog';
|
||||
import { OXIMEDIA_MOOD_SEARCH_ENABLED } from './trackEnrichment';
|
||||
|
||||
export type AdvancedResultType = 'all' | 'artists' | 'albums' | 'songs';
|
||||
|
||||
/** UI opts for Advanced Search — BPM filter hidden until enrichment ships. */
|
||||
/** UI opts for Advanced Search — BPM/mood filters require local index. */
|
||||
export interface LocalSearchOpts {
|
||||
query: string;
|
||||
genre: string;
|
||||
yearFrom: string;
|
||||
yearTo: string;
|
||||
bpmFrom: string;
|
||||
bpmTo: string;
|
||||
moodGroup: string;
|
||||
resultType: AdvancedResultType;
|
||||
}
|
||||
|
||||
@@ -73,9 +77,39 @@ function buildFilters(opts: LocalSearchOpts): LibraryFilterClause[] {
|
||||
} else if (to !== null) {
|
||||
filters.push({ field: 'year', op: 'lte', value: to });
|
||||
}
|
||||
const bpmFrom = opts.bpmFrom ? parseInt(opts.bpmFrom, 10) : null;
|
||||
const bpmTo = opts.bpmTo ? parseInt(opts.bpmTo, 10) : null;
|
||||
if (bpmFrom !== null && bpmTo !== null) {
|
||||
filters.push({ field: 'bpm', op: 'between', value: bpmFrom, valueTo: bpmTo });
|
||||
} else if (bpmFrom !== null) {
|
||||
filters.push({ field: 'bpm', op: 'gte', value: bpmFrom });
|
||||
} else if (bpmTo !== null) {
|
||||
filters.push({ field: 'bpm', op: 'lte', value: bpmTo });
|
||||
}
|
||||
if (OXIMEDIA_MOOD_SEARCH_ENABLED && opts.moodGroup) {
|
||||
filters.push({ field: 'mood_group', op: 'eq', value: opts.moodGroup });
|
||||
}
|
||||
return filters;
|
||||
}
|
||||
|
||||
function applyClientSongFilters(
|
||||
list: SubsonicSong[],
|
||||
opts: LocalSearchOpts,
|
||||
): SubsonicSong[] {
|
||||
let r = list;
|
||||
const g = opts.genre;
|
||||
const from = opts.yearFrom ? parseInt(opts.yearFrom, 10) : null;
|
||||
const to = opts.yearTo ? parseInt(opts.yearTo, 10) : null;
|
||||
const bpmFrom = opts.bpmFrom ? parseInt(opts.bpmFrom, 10) : null;
|
||||
const bpmTo = opts.bpmTo ? parseInt(opts.bpmTo, 10) : null;
|
||||
if (g) r = r.filter(s => s.genre?.toLowerCase() === g.toLowerCase());
|
||||
if (from !== null) r = r.filter(s => !s.year || s.year >= from);
|
||||
if (to !== null) r = r.filter(s => !s.year || s.year <= to);
|
||||
if (bpmFrom !== null) r = r.filter(s => s.bpm != null && s.bpm > 0 && s.bpm >= bpmFrom);
|
||||
if (bpmTo !== null) r = r.filter(s => s.bpm != null && s.bpm > 0 && s.bpm <= bpmTo);
|
||||
return r;
|
||||
}
|
||||
|
||||
function buildRequest(
|
||||
serverId: string,
|
||||
opts: LocalSearchOpts,
|
||||
@@ -100,6 +134,7 @@ function buildRequest(
|
||||
|
||||
export function trackToSong(t: LibraryTrackDto): SubsonicSong {
|
||||
const raw = isObject(t.rawJson) ? t.rawJson : {};
|
||||
const resolvedBpm = t.bpm != null && t.bpm > 0 ? t.bpm : undefined;
|
||||
const base: SubsonicSong = {
|
||||
id: t.id,
|
||||
title: t.title,
|
||||
@@ -119,13 +154,18 @@ export function trackToSong(t: LibraryTrackDto): SubsonicSong {
|
||||
starred: t.starredAt != null ? new Date(t.starredAt).toISOString() : undefined,
|
||||
userRating: t.userRating ?? undefined,
|
||||
playCount: t.playCount ?? undefined,
|
||||
bpm: t.bpm ?? undefined,
|
||||
bpm: resolvedBpm,
|
||||
isrc: t.isrc ?? undefined,
|
||||
albumArtist: t.albumArtist ?? undefined,
|
||||
};
|
||||
// `rawJson` is the authoritative original song — let it override the
|
||||
// hot-column fallbacks (it carries OpenSubsonic extras too).
|
||||
return { ...base, ...(raw as Partial<SubsonicSong>) };
|
||||
const merged: SubsonicSong = { ...base, ...(raw as Partial<SubsonicSong>) };
|
||||
if (resolvedBpm != null) merged.bpm = resolvedBpm;
|
||||
if (t.bpmSource === 'analysis' || t.bpmSource === 'tag') {
|
||||
merged.localBpmSource = t.bpmSource;
|
||||
}
|
||||
return merged;
|
||||
}
|
||||
|
||||
export function albumToAlbum(a: LibraryAlbumDto): SubsonicAlbum {
|
||||
@@ -165,9 +205,6 @@ export async function runNetworkAdvancedTextSearch(
|
||||
): Promise<LocalAdvancedSearchPage | null> {
|
||||
const q = opts.query.trim();
|
||||
if (!q) return null;
|
||||
const g = opts.genre;
|
||||
const from = opts.yearFrom ? parseInt(opts.yearFrom, 10) : null;
|
||||
const to = opts.yearTo ? parseInt(opts.yearTo, 10) : null;
|
||||
const rt = opts.resultType;
|
||||
|
||||
const r = await search(q, {
|
||||
@@ -178,12 +215,11 @@ export async function runNetworkAdvancedTextSearch(
|
||||
|
||||
let artists = r.artists;
|
||||
let albums = r.albums;
|
||||
let songs = r.songs;
|
||||
|
||||
if (g) songs = songs.filter(s => s.genre?.toLowerCase() === g.toLowerCase());
|
||||
if (from !== null) songs = songs.filter(s => !s.year || s.year >= from);
|
||||
if (to !== null) songs = songs.filter(s => !s.year || s.year <= to);
|
||||
let songs = applyClientSongFilters(r.songs, opts);
|
||||
|
||||
const g = opts.genre;
|
||||
const from = opts.yearFrom ? parseInt(opts.yearFrom, 10) : null;
|
||||
const to = opts.yearTo ? parseInt(opts.yearTo, 10) : null;
|
||||
if (g) albums = albums.filter(a => a.genre?.toLowerCase() === g.toLowerCase());
|
||||
if (from !== null) albums = albums.filter(a => !a.year || a.year >= from);
|
||||
if (to !== null) albums = albums.filter(a => !a.year || a.year <= to);
|
||||
|
||||
Reference in New Issue
Block a user