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.
200 lines
7.4 KiB
Rust
200 lines
7.4 KiB
Rust
//! Live internet-radio playback. Distinct from main track playback: no
|
|
//! gapless chain, no seek, no replay-gain, no preload.
|
|
|
|
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
|
use std::sync::{Arc, Mutex};
|
|
use std::time::{Duration, Instant};
|
|
|
|
use ringbuf::traits::Split;
|
|
use ringbuf::{HeapCons, HeapRb};
|
|
use rodio::{Player, Source};
|
|
use tauri::{AppHandle, Emitter, State};
|
|
|
|
use super::decode::SizedDecoder;
|
|
use super::playback_rate::PlaybackRateAtomics;
|
|
use super::engine::{audio_http_client, AudioEngine};
|
|
use super::helpers::{content_type_to_hint, MASTER_HEADROOM};
|
|
use super::progress_task::spawn_progress_task;
|
|
use super::preview::preview_clear_for_new_main_playback;
|
|
use super::sources::{
|
|
CountingSource, DynSource, EqSource, EqualPowerFadeIn, NotifyingSource,
|
|
PriorityBoostSource, TriggeredFadeOut,
|
|
};
|
|
use super::stream::{
|
|
radio_download_task, AudioStreamReader, RadioLiveState, RadioSharedFlags,
|
|
RADIO_BUF_CAPACITY, RADIO_READ_TIMEOUT_SECS,
|
|
};
|
|
|
|
/// Play a live internet radio stream.
|
|
///
|
|
/// Sends `Icy-MetaData: 1` to request inline ICY metadata.
|
|
/// Emits `audio:playing` with `duration = 0.0` (sentinel for live stream)
|
|
/// and `radio:metadata` whenever the StreamTitle changes.
|
|
#[tauri::command]
|
|
pub async fn audio_play_radio(
|
|
url: String,
|
|
volume: f32,
|
|
app: AppHandle,
|
|
state: State<'_, AudioEngine>,
|
|
) -> Result<(), String> {
|
|
let gen = state.generation.fetch_add(1, Ordering::SeqCst) + 1;
|
|
|
|
// Cancel any active preview so it doesn't keep playing alongside radio.
|
|
preview_clear_for_new_main_playback(&state, &app);
|
|
|
|
// Abort any previous radio task before stopping the sink.
|
|
drop(state.radio_state.lock().unwrap().take());
|
|
|
|
*state.chained_info.lock().unwrap() = None;
|
|
{
|
|
let mut cur = state.current.lock().unwrap();
|
|
if let Some(old) = cur.sink.take() { old.stop(); }
|
|
}
|
|
if let Some(old) = state.fading_out_sink.lock().unwrap().take() { old.stop(); }
|
|
|
|
// ── Open initial HTTP connection ──────────────────────────────────────────
|
|
let response = audio_http_client(&state)
|
|
.get(&url)
|
|
.header("Icy-MetaData", "1")
|
|
.send()
|
|
.await
|
|
.map_err(|e| {
|
|
let m = format!("radio: connection failed: {e}");
|
|
app.emit("audio:error", &m).ok();
|
|
m
|
|
})?;
|
|
|
|
if !response.status().is_success() {
|
|
let m = format!("radio: HTTP {}", response.status());
|
|
app.emit("audio:error", &m).ok();
|
|
return Err(m);
|
|
}
|
|
|
|
let fmt_hint = content_type_to_hint(
|
|
response.headers()
|
|
.get("content-type")
|
|
.and_then(|v| v.to_str().ok())
|
|
.unwrap_or(""),
|
|
);
|
|
|
|
// ── Build 4 MB lock-free SPSC ring buffer ─────────────────────────────────
|
|
let rb = HeapRb::<u8>::new(RADIO_BUF_CAPACITY);
|
|
let (prod, cons) = rb.split();
|
|
|
|
let (new_cons_tx, new_cons_rx) = std::sync::mpsc::channel::<HeapCons<u8>>();
|
|
let flags = Arc::new(RadioSharedFlags {
|
|
is_paused: AtomicBool::new(false),
|
|
is_hard_paused: AtomicBool::new(false),
|
|
new_cons_tx: Mutex::new(new_cons_tx),
|
|
});
|
|
|
|
// ── Spawn download task ───────────────────────────────────────────────────
|
|
let task = tokio::spawn(radio_download_task(
|
|
gen,
|
|
state.generation.clone(),
|
|
Some(response),
|
|
audio_http_client(&state),
|
|
url.clone(),
|
|
prod,
|
|
flags.clone(),
|
|
app.clone(),
|
|
));
|
|
|
|
*state.radio_state.lock().unwrap() = Some(RadioLiveState {
|
|
url: url.clone(),
|
|
gen,
|
|
task,
|
|
flags: flags.clone(),
|
|
});
|
|
|
|
// ── Build Symphonia decoder in a blocking thread ──────────────────────────
|
|
let reader = AudioStreamReader {
|
|
read_timeout_secs: RADIO_READ_TIMEOUT_SECS,
|
|
cons: Mutex::new(cons),
|
|
new_cons_rx: Mutex::new(new_cons_rx),
|
|
deadline: std::time::Instant::now() + Duration::from_secs(RADIO_READ_TIMEOUT_SECS),
|
|
gen_arc: state.generation.clone(),
|
|
gen,
|
|
source_tag: "radio",
|
|
eof_when_empty: None,
|
|
pos: 0,
|
|
};
|
|
|
|
if state.generation.load(Ordering::SeqCst) != gen { return Ok(()); }
|
|
|
|
let hint_clone = fmt_hint.clone();
|
|
let decoder = tokio::task::spawn_blocking(move || {
|
|
SizedDecoder::new_streaming(Box::new(reader), hint_clone.as_deref(), "radio")
|
|
})
|
|
.await
|
|
.map_err(|e| e.to_string())??;
|
|
|
|
if state.generation.load(Ordering::SeqCst) != gen { return Ok(()); }
|
|
|
|
let sample_rate = decoder.sample_rate();
|
|
let channels = decoder.channels();
|
|
let done_flag = Arc::new(AtomicBool::new(false));
|
|
let fadeout_trigger = Arc::new(AtomicBool::new(false));
|
|
let fadeout_samples = Arc::new(AtomicU64::new(0));
|
|
state.samples_played.store(0, Ordering::Relaxed);
|
|
|
|
// Radio: no gapless trim, no ReplayGain, 5 ms fade-in to suppress click.
|
|
let dyn_src = DynSource::new(decoder);
|
|
let eq_src = EqSource::new(dyn_src, state.eq_gains.clone(),
|
|
state.eq_enabled.clone(), state.eq_pre_gain.clone());
|
|
let fade_in = EqualPowerFadeIn::new(eq_src, Duration::from_millis(5));
|
|
let fade_out = TriggeredFadeOut::new(fade_in, fadeout_trigger.clone(), fadeout_samples.clone());
|
|
let notifying = NotifyingSource::new(fade_out, done_flag.clone());
|
|
let counting = CountingSource::new(notifying, state.samples_played.clone());
|
|
let boosted = PriorityBoostSource::new(counting);
|
|
|
|
if state.generation.load(Ordering::SeqCst) != gen { return Ok(()); }
|
|
|
|
let sink = Arc::new(Player::connect_new(state.stream_handle.lock().unwrap().mixer()));
|
|
sink.set_volume((volume.clamp(0.0, 1.0) * MASTER_HEADROOM).clamp(0.0, 1.0));
|
|
sink.append(boosted);
|
|
|
|
{
|
|
let mut cur = state.current.lock().unwrap();
|
|
if let Some(old) = cur.sink.take() { old.stop(); }
|
|
cur.sink = Some(sink);
|
|
cur.duration_secs = 0.0; // sentinel: live stream
|
|
cur.seek_offset = 0.0;
|
|
cur.play_started = Some(Instant::now());
|
|
cur.paused_at = None;
|
|
cur.replay_gain_linear = 1.0;
|
|
cur.base_volume = volume.clamp(0.0, 1.0);
|
|
cur.fadeout_trigger = Some(fadeout_trigger);
|
|
cur.fadeout_samples = Some(fadeout_samples);
|
|
}
|
|
|
|
*state.current_playback_url.lock().unwrap() = Some(url.clone());
|
|
|
|
state.current_sample_rate.store(sample_rate.get(), Ordering::Relaxed);
|
|
state.current_channels.store(channels.get() as u32, Ordering::Relaxed);
|
|
|
|
app.emit("audio:playing", 0.0f64).ok();
|
|
|
|
state.stream_playback_armed.store(true, Ordering::SeqCst);
|
|
spawn_progress_task(
|
|
gen,
|
|
state.generation.clone(),
|
|
state.current.clone(),
|
|
state.chained_info.clone(),
|
|
state.crossfade_enabled.clone(),
|
|
state.crossfade_secs.clone(),
|
|
done_flag,
|
|
app,
|
|
None,
|
|
state.samples_played.clone(),
|
|
state.current_sample_rate.clone(),
|
|
state.current_channels.clone(),
|
|
state.gapless_switch_at.clone(),
|
|
state.current_playback_url.clone(),
|
|
state.stream_playback_armed.clone(),
|
|
PlaybackRateAtomics::default(),
|
|
);
|
|
|
|
Ok(())
|
|
}
|