mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 23:35:44 +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.
202 lines
8.2 KiB
Rust
202 lines
8.2 KiB
Rust
//! One-shot HTTP downloader for non-ranged track streaming.
|
|
//!
|
|
//! Pushes response chunks into an SPSC ring buffer consumed by `AudioStreamReader`.
|
|
//! Terminates when:
|
|
//! - generation changes (track superseded),
|
|
//! - response stream ends, or
|
|
//! - response emits an error.
|
|
|
|
use std::sync::atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering};
|
|
use std::sync::{Arc, Mutex};
|
|
use std::time::{Duration, Instant};
|
|
|
|
use futures_util::StreamExt;
|
|
use ringbuf::HeapProd;
|
|
use ringbuf::traits::Producer;
|
|
use tauri::AppHandle;
|
|
|
|
use super::super::state::PreloadedTrack;
|
|
use super::{
|
|
maybe_arm_stream_playback, TRACK_STREAM_MAX_RECONNECTS, TRACK_STREAM_PROMOTE_MAX_BYTES,
|
|
};
|
|
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub(crate) async fn track_download_task(
|
|
gen: u64,
|
|
gen_arc: Arc<AtomicU64>,
|
|
http_client: reqwest::Client,
|
|
app: AppHandle,
|
|
url: String,
|
|
initial_response: reqwest::Response,
|
|
mut prod: HeapProd<u8>,
|
|
done: Arc<AtomicBool>,
|
|
promote_cache_slot: Arc<Mutex<Option<PreloadedTrack>>>,
|
|
normalization_engine: Arc<AtomicU32>,
|
|
normalization_target_lufs: Arc<AtomicU32>,
|
|
loudness_pre_analysis_attenuation_db: Arc<AtomicU32>,
|
|
cache_track_id: Option<String>,
|
|
// Playback server scope for the analysis-cache write key (empty/`None` → legacy '').
|
|
server_id: Option<String>,
|
|
playback_armed: Arc<AtomicBool>,
|
|
) {
|
|
let mut downloaded: u64 = 0;
|
|
let mut reconnects: u32 = 0;
|
|
let mut next_response: Option<reqwest::Response> = Some(initial_response);
|
|
let mut capture: Vec<u8> = Vec::new();
|
|
let mut capture_over_limit = false;
|
|
let mut last_partial_loudness_emit = Instant::now() - Duration::from_secs(5);
|
|
'outer: loop {
|
|
let response = if let Some(r) = next_response.take() {
|
|
r
|
|
} else {
|
|
let mut req = http_client.get(&url);
|
|
if downloaded > 0 {
|
|
req = req.header(reqwest::header::RANGE, format!("bytes={downloaded}-"));
|
|
}
|
|
match req.send().await {
|
|
Ok(r) => r,
|
|
Err(err) => {
|
|
if reconnects >= TRACK_STREAM_MAX_RECONNECTS {
|
|
crate::app_eprintln!(
|
|
"[audio] streaming reconnect failed after {} attempts: {}",
|
|
reconnects, err
|
|
);
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
reconnects += 1;
|
|
tokio::time::sleep(Duration::from_millis(200)).await;
|
|
continue 'outer;
|
|
}
|
|
}
|
|
};
|
|
if downloaded > 0 && response.status() != reqwest::StatusCode::PARTIAL_CONTENT {
|
|
crate::app_eprintln!(
|
|
"[audio] streaming reconnect returned {}, expected 206 for range resume",
|
|
response.status()
|
|
);
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
if downloaded == 0 && !response.status().is_success() {
|
|
crate::app_eprintln!("[audio] streaming HTTP {}", response.status());
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
|
|
let mut byte_stream = response.bytes_stream();
|
|
while let Some(chunk) = byte_stream.next().await {
|
|
if gen_arc.load(Ordering::SeqCst) != gen {
|
|
crate::app_deprintln!(
|
|
"[stream] track-stream dl superseded by skip: track_id={:?} gen={}→{}",
|
|
cache_track_id, gen, gen_arc.load(Ordering::SeqCst)
|
|
);
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
let chunk = match chunk {
|
|
Ok(c) => c,
|
|
Err(e) => {
|
|
if reconnects >= TRACK_STREAM_MAX_RECONNECTS {
|
|
crate::app_eprintln!(
|
|
"[audio] streaming download error after {} reconnects: {}",
|
|
reconnects, e
|
|
);
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
reconnects += 1;
|
|
crate::app_eprintln!(
|
|
"[audio] streaming download error (attempt {}/{}): {} — reconnecting",
|
|
reconnects,
|
|
TRACK_STREAM_MAX_RECONNECTS,
|
|
e
|
|
);
|
|
next_response = None;
|
|
continue 'outer;
|
|
}
|
|
};
|
|
reconnects = 0;
|
|
let mut offset = 0;
|
|
while offset < chunk.len() {
|
|
if gen_arc.load(Ordering::SeqCst) != gen {
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
let pushed = prod.push_slice(&chunk[offset..]);
|
|
if pushed == 0 {
|
|
tokio::time::sleep(Duration::from_millis(5)).await;
|
|
} else {
|
|
if !capture_over_limit {
|
|
if capture.len().saturating_add(pushed) <= TRACK_STREAM_PROMOTE_MAX_BYTES {
|
|
let from = offset;
|
|
let to = offset + pushed;
|
|
capture.extend_from_slice(&chunk[from..to]);
|
|
} else {
|
|
capture.clear();
|
|
capture_over_limit = true;
|
|
}
|
|
}
|
|
if !capture_over_limit
|
|
&& last_partial_loudness_emit.elapsed() >= Duration::from_millis(crate::helpers::PARTIAL_LOUDNESS_EMIT_INTERVAL_MS)
|
|
{
|
|
last_partial_loudness_emit = Instant::now();
|
|
if normalization_engine.load(Ordering::Relaxed) == 2 {
|
|
let target_lufs = f32::from_bits(normalization_target_lufs.load(Ordering::Relaxed));
|
|
let pre_db = f32::from_bits(
|
|
loudness_pre_analysis_attenuation_db.load(Ordering::Relaxed),
|
|
)
|
|
.clamp(-24.0, 0.0);
|
|
crate::helpers::emit_partial_loudness_from_bytes(&app, &url, &capture, target_lufs, pre_db);
|
|
}
|
|
}
|
|
offset += pushed;
|
|
downloaded += pushed as u64;
|
|
maybe_arm_stream_playback(downloaded, &playback_armed);
|
|
}
|
|
}
|
|
}
|
|
if !capture_over_limit && !capture.is_empty() {
|
|
if gen_arc.load(Ordering::SeqCst) != gen {
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
if let Some(track_id) = cache_track_id {
|
|
crate::app_deprintln!(
|
|
"[stream] legacy stream: capture complete track_id={} capture_mib={:.2} — full-track analysis (cpu-seed queue)",
|
|
track_id,
|
|
capture.len() as f64 / (1024.0 * 1024.0)
|
|
);
|
|
let sid = crate::analysis_dispatch::resolve_server_id_for_app(
|
|
&app,
|
|
server_id.as_deref(),
|
|
);
|
|
let high = crate::analysis_dispatch::high_priority_for_app(&app, &track_id, None);
|
|
if let Err(e) = crate::analysis_dispatch::dispatch_track_analysis_bytes(
|
|
&app,
|
|
crate::analysis_dispatch::TrackAnalysisOrigin::StreamDownloadComplete,
|
|
&sid,
|
|
&track_id,
|
|
capture.clone(),
|
|
high,
|
|
)
|
|
.await
|
|
{
|
|
crate::app_eprintln!("[analysis] track seed failed for {track_id}: {e}");
|
|
}
|
|
}
|
|
if gen_arc.load(Ordering::SeqCst) != gen {
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
*promote_cache_slot.lock().unwrap() = Some(PreloadedTrack {
|
|
url: url.clone(),
|
|
data: capture,
|
|
});
|
|
}
|
|
playback_armed.store(true, Ordering::SeqCst);
|
|
done.store(true, Ordering::SeqCst);
|
|
return;
|
|
}
|
|
}
|