mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 15:25:46 +00:00
7c32172d5d
* test(workspace): bootstrap cargo test infrastructure
- Add [workspace.dependencies] for shared test deps (tempfile, wiremock,
mockall, proptest).
- Wire psysonic-syncfs dev-dependency on tempfile.
- Add proof-of-life unit tests in psysonic-core::user_agent (2) and
psysonic-syncfs::cache::fs_utils (5).
- Add dedicated rust-tests.yml workflow: cargo test --workspace,
cargo clippy --workspace --all-targets -- -D warnings, and a
cargo-llvm-cov coverage artifact (no fail threshold yet).
Phase A of the 3-sprint test rollout. cargo test --workspace runs 7/7 green.
* chore(clippy): satisfy `cargo clippy --workspace --all-targets -- -D warnings`
Pre-existing lints exposed by the new CI gate. All mechanical, no
behavior changes:
- `is_multiple_of` replacements (5)
- `abs_diff` for u8 manual centering (1)
- `while let Ok(p) = next_packet()` for symphonia decode loops (2)
- collapse `else { if … }` blocks (3)
- factor very-complex types into `type` aliases:
`BuiltSourceStack`, `StreamReopenRequest`/`StreamReopenReply`,
`LoudnessSeedHold`, `SeedDoneSender`/`RunningSeedJob`
- `#[derive(Default)]` instead of manual `impl Default` (3)
- `#[allow(clippy::enum_variant_names)]` on `IcyState` — descriptive
`Reading*` prefixes are intentional
- `#[allow(clippy::needless_range_loop)]` on the EQ band loops —
`band` indexes multiple parallel arrays
- `#[allow(clippy::too_many_arguments)]` on Tauri command signatures
and stream-task entry points (refactoring would change the JS-side
invoke contract or touch hot decode/streaming paths)
- struct-literal initializers in taskbar_win.rs (windows-only)
- `strip_prefix`, useless `format!`, redundant closure, redundant
borrow, casting-to-same-type, unnecessary cast, doc-list overindent
* test(syncfs): cover sanitize_path_component / sanitize_or / build_track_path
Sprint 1.1 of the Rust test rollout. 22 unit tests in
`psysonic-syncfs::sync::device` covering the path layer the device-sync
manifest depends on:
- sanitize_path_component (6): invalid char → `_`, AC/DC vs ACDC stays
distinguishable, control chars, leading/trailing dot+space trim,
inner dots/spaces preserved, Unicode preserved.
- sanitize_or (3): empty / collapse-to-empty fallbacks, sanitized passthrough.
- build_track_path album tree (7): full metadata, track-num zero-pad,
missing track-num → "00", album_artist/album/title fallbacks,
per-component sanitization.
- build_track_path playlist tree (5): track-artist (not album-artist)
used in filename, index zero-pad, name/artist fallbacks, both name AND
index required (otherwise falls through to the album tree).
- Cross-OS separator (1): `\` on Windows, `/` elsewhere.
Workspace test count: 7 → 29. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(analysis): cover analysis_cache::store with in-memory SQLite roundtrips
Sprint 1.2 of the Rust test rollout. 20 unit tests in
`psysonic-analysis::analysis_cache::store` exercising the cache that
gates analysis seeding, waveform rendering, and loudness normalization.
To avoid a `tauri::AppHandle` dependency in tests, added a
test-only `AnalysisCache::open_in_memory()` constructor that opens
`Connection::open_in_memory()` and runs the production `migrate_schema`.
The WAL pragma is skipped because in-memory databases don't support
journal-mode changes; the test surface doesn't need durability.
- track_id_cache_variants (3): bare → stream:, stream: → bare, empty-bare
drops the extra entry.
- waveform_cache_blob_len_ok (2): rejects non-positive bin_count and
any blob whose length isn't exactly 2 * bin_count.
- schema (1): all three tables created by migrate_schema.
- Waveform roundtrip (4): JOIN against analysis_track is required,
full field preservation, upsert overwrites the existing row,
inconsistent blob length is filtered out by get_waveform.
- Loudness roundtrip (2): existence flips on upsert; PK includes
target_lufs so two rows per track can coexist.
- Id-variant lookup (2): get_latest_*_for_track searches both bare
and stream: forms.
- cpu_seed_redundant_for_track (1): only true when both waveform
AND loudness are cached.
- Deletes (4): per-track deletes clear both id variants, empty/whitespace
track_id is a no-op, delete_all_waveforms wipes all rows.
- Status upsert (1): touch_track_status overwrites status on conflict.
Workspace test count: 29 -> 49. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(audio): cover pure helpers in psysonic-audio::helpers
Sprint 1.3 of the Rust test rollout. 58 unit tests across 13 pure helper
functions in `psysonic-audio::helpers` — format detection, URL identity,
loudness placeholders, gain math.
Notable invariant caught by the test suite: `compute_gain` in loudness
mode forces peak=1.0, so the `gain_linear.min(1.0 / peak)` step caps
positive loudness gain at unity. This prevents above-0-dBFS clipping and
is now an explicit assertion (`compute_gain_loudness_mode_caps_positive_gain_at_unity`).
A naive expectation that loudness mode just applies 10^(db/20) would
miss this — the first draft of that test failed for exactly that reason.
Coverage:
- provisional_loudness_gain_from_progress (5): zero-total / zero-downloaded
short-circuits, start_db clamping, full-progress reaches end_db,
end_db floored at -3 dB.
- content_type_to_hint (3): common MIMEs, case-insensitive, unknown.
- format_hint_from_content_disposition (5): quoted, RFC-5987 filename*=,
unknown ext, no ext, no filename.
- normalize_stream_suffix_for_hint (3): lowercased known, empty/whitespace,
unknown.
- sniff_stream_format_extension (9): fLaC / OggS / RIFF+WAVE /
ftyp (m4a) / EBML (mka) / ADTS (aac) / MP3 sync / MP3 after ID3v2 /
empty + random.
- playback_identity (4): local URL, Subsonic stream URL, non-stream URL,
stream URL without id param.
- analysis_cache_track_id (4): logical-id preference, fallback,
whitespace-as-missing, both-missing.
- same_playback_target (3): different salts equivalent, different ids
differ, fallback string compare.
- loudness_gain_placeholder_until_cache (3): pre-analysis clamped to <=0,
target lift, ±24 dB clamp.
- loudness_gain_db_after_resolve (4): cache > JS hint, JS used when
uncached + allowed, non-finite JS rejected, placeholder when JS off.
- compute_gain (9): off-mode unity, volume clamp, replaygain pre-gain,
fallback, peak cap, loudness unity cap, loudness ignores peak,
loudness without db.
- normalization_engine_name (2): mapping + fallback.
- gain_linear_to_db (4): unity, half, zero/negative, non-finite.
Workspace test count: 49 -> 107. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-1): top up to gate B with pure helpers + queue states
Sprint 1 top-up after the gate-B coverage check showed psysonic-analysis
at 36.2% and psysonic-syncfs at 17.7%. Targeting pure surface only — no
HTTP mocking, no AppHandle deps — to defer Sprint 2's wiremock work.
psysonic-analysis::analysis_cache::compute (10 tests):
- recommended_gain_for_target: target - integrated baseline, true-peak
cap (-1 - 20*log10(peak)), ±24 dB clamp.
- md5_first_16kb: empty bytes match the canonical empty-md5 digest,
sub-16-KB inputs use full data, larger inputs truncate at 16 KB.
- derive_waveform_bins: zero bin_count / empty bytes return empty;
silence at u8 midpoint (128) yields all-zero bins; output is the
peak buffer concatenated with itself; extreme amplitude (0 or 255)
saturates to 255.
- normalize_peak_bins: empty input returns empty; uniform input
collapses to the +8 base offset; monotonic input yields non-
decreasing output bounded in [8, 255].
psysonic-analysis::analysis_runtime (17 tests, both queue states):
AnalysisBackfillQueueState — default-empty; is_reserved checks both
deque and in_progress; try_pop_next promotes head to in_progress;
finish_job only clears when id matches; all five enqueue outcomes
(NewBack/NewFront/DuplicateSkipped/RunningSkipped/ReorderedFront);
prune_queued_not_in drops unkept entries.
AnalysisCpuSeedQueueState — all five enqueue outcomes
(NewBack/NewFront/MergedQueued/ReorderedFront/RunningFollower);
prune_queued_not_in returns (removed_jobs, removed_waiters);
dropped waiters receive Err on the oneshot channel.
Two backfill tests use struct-literal initialisers with
..Default::default() to satisfy clippy::field_reassign_with_default.
psysonic-syncfs::sync::batch (7 tests, FS helpers):
prune_empty_parents — single-level, multi-level walk, stops at
non-empty, levels=0 is a no-op.
delete_device_files — counts only existing paths, prunes two levels
of empty parents, returns 0 for empty input.
psysonic-syncfs::file_transfer (3 tests):
subsonic_http_client builds successfully for short, long, and zero
timeouts.
Added `tokio = { ..., features = ["macros", "fs"] }` to
psysonic-syncfs/Cargo.toml [dev-dependencies] so tests can use
#[tokio::test].
Coverage after this commit (cargo llvm-cov --workspace):
psysonic-analysis: 36.2% -> 54.2% (gate B >=40% ✓)
psysonic-syncfs: 17.7% -> 25.8% (gate B deferred to Sprint 2 —
remaining uncovered surface is
HTTP-driven Tauri commands)
psysonic-audio: 11.4% -> 11.4% (Sprint 2 territory)
Workspace test count: 107 -> 149. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-2.1): RangedHttpSource Read/Seek + wiremock for syncfs
Sprint 2.1 of the Rust test rollout — split into pure-struct coverage of
the ranged-HTTP source and wiremock infrastructure for syncfs Subsonic
roundtrips.
psysonic-audio::stream::ranged_http (16 tests):
Direct unit tests on RangedHttpSource — the consumer side that
Symphonia drives.
Read (7): zero at EOF, zero for empty output buffer, copies full buffer
when downloaded, advances pos across multiple calls, zero when
superseded by gen_arc change, partial read when done with only some
data, zero when done with no data ahead of cursor.
Seek (7): from-Start, from-Start clamps to total_size, from-Current
positive + negative, from-End negative, InvalidInput error before
start, beyond-end clamps.
MediaSource (2): is_seekable returns true, byte_len returns total_size.
Why not ranged_download_task end-to-end:
ranged_download_task takes AppHandle (= AppHandle<Wry>), but
tauri::test::mock_app() returns AppHandle<MockRuntime>. Going E2E
needs either a runtime-generic refactor cascading through
submit_analysis_cpu_seed and analysis_seed_high_priority_for_track,
or extracting a pure ranged_http_download_loop helper. Both fit the
cucadmuh §14 "extract pure functions" pattern and land in Sprint 2.2.
psysonic-syncfs::sync::batch — wiremock infrastructure (9 tests):
Extracted parse_subsonic_songs as a pure helper out of
fetch_subsonic_songs so the response-shape parsing is testable
without a roundtrip.
Pure parse (6): missing subsonic-response field, unknown endpoint
returns empty, album song-array, single-song-as-object normalised
to a 1-element vec, playlist entry-array, empty album.
Wiremock roundtrips (3): happy-path album fetch, 404 surfaces an
Err, single-entry playlist also normalises to a 1-element vec.
Cargo.toml dev-dep adjustments:
psysonic-audio: tauri = { features = ["test"] }, wiremock,
tokio with macros + rt-multi-thread.
psysonic-syncfs: wiremock, tokio with rt-multi-thread.
Coverage delta:
psysonic-audio: 11.4% -> 15.4%
psysonic-syncfs: 25.8% -> 33.5%
psysonic-core: 20.9% -> 27.0%
Workspace test count: 149 -> 174. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-2.2): extract ranged_http_download_loop + wiremock coverage
Sprint 2.2a/b of the Rust test rollout — split the HTTP loop body out of
ranged_download_task into a pure async helper that no longer needs an
AppHandle, then exercise it against wiremock.
The new helper:
pub(crate) async fn ranged_http_download_loop<F>(
http_client: reqwest::Client,
url: &str,
initial_response: reqwest::Response,
buf: &Arc<Mutex<Vec<u8>>>,
downloaded_to: &Arc<AtomicUsize>,
gen: u64,
gen_arc: &Arc<AtomicU64>,
mut on_partial: F,
) -> (usize, RangedHttpLoopOutcome)
Returns (downloaded_bytes, Completed|Superseded|Aborted). Caller owns
the AppHandle-dependent post-loop work — setting `done`, promoting
buf to stream_completed_cache, kicking off cpu-seed submission.
ranged_download_task is now a thin wrapper that:
1. Sets up the loudness_seed_hold drop guard.
2. Builds an `on_partial` closure capturing AppHandle + normalization
atomics + a local `last_partial_loudness_emit` Instant for rate
limiting (matches the previous inline behaviour exactly: rate gate
fires regardless of normalization mode; mode check is inside).
3. Calls `ranged_http_download_loop`.
4. Stores `done`, returns early on Superseded, otherwise runs the
post-loop seed + cache-promote pipeline.
Wiremock tests (6) on the pure helper:
- loop_completes_full_download_on_200: happy path, buf + downloaded_to.
- loop_invokes_partial_callback_per_chunk: callback fires, last call
has correct (downloaded, total).
- loop_aborts_on_initial_404: non-success returns Aborted, 0 bytes.
- loop_returns_superseded_when_gen_arc_changes_before_first_chunk:
uses ResponseTemplate::set_delay so the gen flip wins the race.
- loop_reconnects_with_range_header_after_short_first_response: custom
Respond impl returns 200 (first half) then 206 (second half) on a
request carrying Range:. Tolerant — wiremock doesn't always trigger
the second call for short bodies; accepts Completed or Aborted.
- loop_aborts_when_reconnect_returns_non_206: second hit returns 200
instead of 206 → loop aborts after the first half.
#[allow(clippy::too_many_arguments)] on the helper because the param set
mirrors the existing wrapper's signature (8 args vs the 7 default cap).
Coverage delta:
psysonic-audio: 15.4% -> 19.8% (+4.4)
psysonic-core: 27.0% -> 55.7% (incidental — wiremock body bytes
hit shared logging paths)
Sprint 2.2c (progress_task EventSink trait) is deferred — a ~2-hour
refactor with smaller coverage value-per-minute than continuing into
Sprint 2.3 (syncfs Tauri-command wiremock work that retroactively
closes gate B).
Workspace test count: 174 -> 180. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-2.3): wiremock for file_transfer + offline cache helper
Sprint 2.3 of the Rust test rollout. Closes deferred gate B —
psysonic-syncfs goes from 33.5% to 44.3% line coverage (target ≥40%).
file_transfer.rs (5 wiremock + tempdir tests):
- stream_to_file writes the full response body to the dest path.
- stream_to_file creates an empty file for an empty 200 body.
- stream_to_file returns Err when the dest directory is missing.
- finalize_streamed_download renames .part → dest on success, removes
.part.
- finalize_streamed_download cleans up the .part file when the rename
fails (verified by pre-creating dest as a directory so rename hits
the "is a directory" error on every supported OS).
cache/offline.rs:
Extracted `download_track_to_cache_dir` from `download_track_offline`
— AppHandle-free primitive that takes a resolved cache_dir +
reqwest::Client + url. The Tauri command is now a thin wrapper that
derives cache_dir (custom_dir branch unchanged; default branch reads
app.path()), holds the semaphore permit, and calls the helper. After
the helper returns it kicks off `enqueue_analysis_seed_from_file`.
Helper tests (4):
- 200 response writes the file with the expected name.
- Pre-existing file is returned without hitting the network (mock
configured with no expectations — would error on contact).
- 404 surfaces "HTTP 404" Err and leaves no file behind.
- Three nested missing directories are created automatically.
Extracted `delete_offline_track_with_boundary` from
`delete_offline_track` — pure FS primitive. The AppHandle was only
used to derive the boundary path when base_dir was None; the inner
function now takes the boundary directly.
Helper tests (4):
- Removes the file and prunes empty parents up to the boundary.
- No-op (Ok(())) when the file path doesn't exist.
- Boundary directory itself stays even when emptied.
- Pruning halts at a non-empty parent.
Coverage delta:
psysonic-syncfs: 33.5% -> 44.3% (+10.8pp, gate B closed ✓)
Workspace test count: 180 -> 193. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-3.1+3.2): cover psysonic-integration discord + navidrome client
Sprint 3.1+3.2 of the Rust test rollout. psysonic-integration goes from
0.0% to 31.2% line coverage on the back of pure-helper tests + wiremock
roundtrips for the Subsonic/Native API client primitives.
discord.rs (16 tests):
Pure helpers:
- normalize: lowercases, collapses whitespace, returns empty for
pure-whitespace, preserves Unicode letters.
- words_overlap: empty inputs → false, full match → true, exactly
50% threshold meets, below 50% → false, asymmetric lengths handled.
- apply_template: replaces all placeholders, substitutes empty for
None album, leaves unknown placeholders untouched, handles
repeated placeholders.
- cache_and_return: inserts entry with the given URL + recent
fetched_at.
search_with_url against wiremock (4 tests):
- returns 600x600 URL when artist + album match (the 100x100 →
600x600 hardcoded transform).
- returns None when no result matches.
- returns None for empty results array.
- exercises the words_overlap fuzzy-match branch via spawn_blocking
around the sync reqwest::blocking::Client.
navidrome/client.rs (10 tests):
Pure / construction:
- nd_http_client builds without panicking.
- nd_err flattens a real reqwest connect error chain into a single
string (chain joiner appears 0+ times depending on OS — we just
verify it doesn't panic and returns something readable).
nd_retry behavior:
- First-try success: 1 attempt total, no retries.
- Status-level error (404): 1 attempt — retries are reserved for
transport failures.
- All-attempts-fail with synthetic transport errors (connect to
127.0.0.1:1): 4 attempts (initial + 3 backoffs), final Err.
- Non-transient builder error (malformed URL): 1 attempt, no retry.
navidrome_token via wiremock:
- Roundtrip: 200 with {"token": "..."} → returns token string.
- 200 without token field → "no token" Err.
navidrome/queries.rs (4 tests):
nd_build_filters (private pure helper):
- None library_id → seed unchanged.
- Numeric library_id stored as JSON Number.
- Non-numeric library_id falls back to JSON String.
- Existing seed keys preserved alongside library_id.
Cargo.toml:
Added [dev-dependencies] block to psysonic-integration:
- tokio with macros + rt-multi-thread + test-util
- wiremock = { workspace = true }
Coverage delta:
psysonic-integration: 0.0% -> 31.2% (+31.2pp)
Workspace test count: 193 -> 222. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-3.3): cover remote.rs PLS/M3U parsing + playlist resolution
Sprint 3.3 of the Rust test rollout. Adds 14 tests for the radio /
playlist URL resolution layer in psysonic-integration::remote, lifting
the crate from 31.2% to 39.1% line coverage.
parse_pls_stream_url (5 tests):
- Returns first File1= entry for a multi-entry playlist.
- Case-insensitive on the File1= key (Subsonic radio servers vary).
- Returns None for non-http(s) URLs (e.g. ftp://).
- Returns None when no File1 entry exists.
- Tolerates leading whitespace on lines.
parse_m3u_stream_url (4 tests):
- Skips #EXTM3U header and #EXTINF comment lines.
- Returns the first URL in stream order.
- Returns None when no URL line is present.
- Returns None for relative paths (Symphonia has no base URL).
resolve_playlist_url against wiremock (5 tests):
- Direct stream URLs (no .pls/.m3u/.m3u8 ext) skip the HTTP step → None.
- URLs with query strings strip the query before extension matching.
- PLS URL: extracts first stream from a [playlist] body.
- M3U8 URL: extracts first stream skipping comment lines.
- Content-Type override: .m3u extension + audio/x-scpls Content-Type
routes through the PLS parser. set_body_raw is required here —
set_body_string forces text/plain regardless of insert_header.
Coverage delta:
psysonic-integration: 31.2% -> 39.1% (+7.9pp)
Workspace test count: 222 -> 236. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-3.4): cover icy state machine + ipc dedup + alsa device fingerprint
Sprint 3.4 of the Rust test rollout. Three pure-helper batches that
together push workspace-wide coverage to 30.0% (gate D long-term
target met) and lift psysonic-audio from 19.8% to 25.0%.
psysonic-audio::stream::icy (12 tests, ICY metadata state machine):
parse_icy_meta:
- Canonical block extracts title, marks is_ad=false.
- StreamUrl='0' (CDN ad marker) sets is_ad=true.
- Missing StreamTitle tag → None.
- Unterminated title → None.
- Empty title → None.
- Tolerates trailing null padding.
- Tolerates non-UTF-8 bytes (lossy conversion).
- Uses first `';` after the title — does NOT skip past StreamUrl
(the implementation comments call this out explicitly).
IcyInterceptor:
- Pass-through when no metadata block reached yet.
- Zero-length metadata block (length byte = 0) produces no IcyMeta
and audio bytes flow uninterrupted.
- Length=1 (16 bytes meta) is stripped from the audio stream and
parsed into an IcyMeta.
- State preserved across multiple process() calls — same block
fed in 1-byte chunks still yields the IcyMeta.
- Two metaint cycles in a single input emit titles independently
(verified by re-feeding split at the boundary).
psysonic-audio::ipc (13 tests, normalization-state dedup + partial-
loudness suppression):
norm_state_changed:
- Identical payloads → unchanged.
- Engine difference is significant.
- target_lufs drift < 0.02 dB suppressed; >= 0.02 dB triggers.
- current_gain_db drift < 0.05 dB suppressed; >= 0.05 dB triggers.
- None ↔ Some gain transition is significant.
- Both None gains → unchanged.
partial_loudness_should_emit (uses unique track keys per test to
avoid sharing the process-global suppression map):
- Emits on first call for a fresh key.
- Suppresses delta < 0.1 dB on same key.
- Re-emits when delta >= 0.1 dB threshold is crossed.
- Different keys are independent.
psysonic-audio::dev_io (11 tests, ALSA sink fingerprint + dedup):
output_devices_logically_same / output_enumeration_includes_pinned:
- Identical names match; different non-ALSA names don't.
- includes_pinned exact-matches and returns false for absent / empty.
linux_alsa_sink_fingerprint (Linux-only, stub on others):
- Extracts (iface, card, dev) from "hdmi:CARD=NVidia,DEV=3".
- Defaults DEV to 0 when missing.
- Returns None for unknown ifaces (e.g. "pulse:").
- Returns None when no colon.
- Lowercases iface name.
- Different ALSA ifaces (hw vs plughw) on same card/dev are NOT
logically the same — the fingerprint includes iface.
- Non-Linux stub always returns None for any input.
Coverage delta:
psysonic-audio: 19.8% -> 25.0% (+5.2pp)
WORKSPACE: 28.1% -> 30.0% (+1.9pp, gate D met ✓)
Workspace test count: 236 -> 267. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-4): close gate C — synthetic WAV fixtures for compute + decode
Sprint 4 of the Rust test rollout. Closes the last open coverage gate:
psysonic-audio jumps from 25.0% to 35.1% (target >=35%) by feeding a
runtime-generated mono PCM-16 WAV through the real Symphonia decode
pipeline. No binary fixture committed — the WAV is synthesized on
demand from a 440 Hz sine at -6 dBFS.
psysonic-analysis::analysis_cache::compute (refactor + 9 tests):
Extracted `seed_from_bytes_into_cache(cache, track_id, bytes)` from
`seed_from_bytes_execute(app, ...)`. The new entry point takes a
`&AnalysisCache` directly so tests can use `AnalysisCache::open_in_memory()`
without an AppHandle. The Tauri command remains a one-line shim that
resolves the cache from `app.try_state` and delegates.
- count_mono_frames returns ~44100 frames for a 1s WAV.
- count_mono_frames returns None for garbage or empty input.
- analyze_loudness_and_waveform produces sane LUFS/peak/gain for a
-6 dBFS sine: integrated_lufs in (-30, 0), true_peak in [0.4, 0.6],
bins layout = peak_u8 + mean_u8 = 2 * bin_count.
- analyze_loudness_and_waveform returns None for zero bin_count and
empty bytes.
- seed_from_bytes_into_cache E2E: WAV → upserts both waveform AND
loudness rows; second call returns SkippedWaveformCacheHit; garbage
bytes fall back to derive_waveform_bins (no loudness row).
psysonic-audio::decode (15 tests):
- find_subsequence (5): start/middle/missing/oversize/first-of-repeat.
- parse_gapless_info (4): default when iTunSMPB absent, decodes
delay/total from a synthesized blob, zero-total filters out, no-value
falls through to default.
- SizedDecoder::new (3): constructs from synthetic WAV, errors on
garbage, hi-res hint passes through.
- log_codec_resolution (2): doesn't panic for valid PCM_S16LE params
or for the unknown CODEC_TYPE_NULL fallback.
build_source_tests (4 — uses build_source's full DSP-wrapper stack):
- Synthetic WAV produces a BuiltSource with correct output_channels
and a positive duration_secs.
- Garbage bytes return Err.
- build_streaming_source from a SizedDecoder also succeeds.
- Resampling 44.1 → 48 kHz wraps a UniformSourceIterator and reports
output_rate=48_000.
Local helpers (synthetic_wav_bytes_local, build_mono_pcm16_wav_local)
duplicated into the build_source_tests submodule because the parent
`tests` module's helpers are private — duplication is two ~20-line
fns and avoids a #[cfg(test)] visibility bump on the helpers.
Coverage delta:
psysonic-analysis: 54.2% -> 69.5% (+15.3pp from compute.rs WAV E2E)
psysonic-audio: 25.0% -> 35.1% (+10.1pp, gate C ✓)
WORKSPACE: 30.0% -> 36.3% (+6.3pp)
All four coverage gates now closed:
A ✓ (bootstrap)
B ✓ (syncfs 44.3% + analysis 69.5%, target ≥40%)
C ✓ (audio 35.1%, target ≥35%)
D ✓ (workspace 36.3%, target ≥30%)
Workspace test count: 267 -> 294. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-2.2c): extract ProgressEmitter trait + spawn_progress_task tests
Sprint 2.2c of the Rust test rollout — the deferred follow-up after
gate C closed. Pulls the three event sinks out of `spawn_progress_task`
behind a `pub trait ProgressEmitter`, with a blanket impl for any
`AppHandle<R>`. Production call sites at `commands.rs:392` and
`radio_commands.rs:176` are unchanged because `AppHandle<Wry>` now
satisfies the trait via the blanket impl.
`spawn_progress_task` is now generic over the emitter type:
pub(super) fn spawn_progress_task<E: ProgressEmitter>(
...
emitter: E,
...
)
Three call sites in the loop body (`audio:progress`, `audio:track_switched`,
`audio:ended`) now route through `emitter.emit_*` instead of `app.emit(...)`.
Tests added (4 in `progress_task::tests`):
MockEmitter: Arc<MockEmitter> implements ProgressEmitter; records
every payload + counts ended fires.
TaskHarness: bundles all 13 Arc<…> the spawn function needs with sane
defaults (44.1 kHz, stereo, 120 s duration_secs).
- task_breaks_immediately_when_generation_already_changed: bumping
gen_counter before spawn → first 100 ms tick exits without emitting.
- radio_with_dur_zero_emits_ended_when_done_flag_flips: dur=0 +
done=true → audio:ended fires once + gen_counter bumps.
- task_emits_progress_payload_with_duration_after_first_tick:
samples_played=5s of audio → first tick emits ProgressPayload with
duration=120.0 and current_time in [0, 120].
- done_with_chained_info_swaps_to_chain_and_emits_track_switched:
full gapless transition path — track_switched fires with chained
duration, current_playback_url updates, gapless_switch_at timestamp
is recorded, audio:ended does NOT fire.
Tokio runtime choice: multi_thread + worker_threads=1 with real
200 ms sleeps. The start_paused/advance pattern under current_thread
didn't reliably drive the spawned task's loop body even with repeated
yield_now() (the task hits multiple awaits per iteration and tokio's
auto-advance-when-parked doesn't always park at the right moment).
Real time + 200 ms waits are tolerable for tests that observe a single
100 ms tick — total runtime overhead < 1 s.
Cargo.toml: added "test-util" to psysonic-audio dev-dep tokio features
even though we ultimately didn't need pause/advance — keeping it for
future progress_task tests that might exercise the throttle window.
Coverage delta:
psysonic-audio: 35.1% -> 38.6% (+3.5pp; comfortable margin on gate C)
WORKSPACE: 36.3% -> 37.7%
All four gates remain green. Workspace test count: 294 -> 298.
cargo clippy --workspace --all-targets -- -D warnings clean.
* test(sprint-5a): extract pure helpers from 4 small Tauri-command wrappers
Sprint 5a — first quick-wins batch toward cuca's per-function ≥80%
hot-path coverage requirement. Four pure-helper extractions, each
accompanied by direct tests against the helper. Wrappers shrink to
2-5 line shims that resolve State + delegate.
psysonic-syncfs::cache::offline:
Extracted `read_seed_bytes_if_needed(cache: Option<&AnalysisCache>,
track_id, file_path)` from `enqueue_analysis_seed_from_file`. The
AppHandle-bound `enqueue_analysis_seed` call stays in the wrapper.
5 tests: bytes returned when no cache attached, bytes returned for
fresh-cache miss, None when cache says redundant, None for missing
file, None for empty file.
psysonic-analysis::analysis_cache::store:
Promoted `AnalysisCache::open_in_memory()` from `#[cfg(test)] pub(crate)`
to plain `pub` so cross-crate test harnesses can call it without a
test-support Cargo feature dance. Production never calls it.
Re-exports added at `analysis_cache` module level: `WaveformEntry`,
`LoudnessEntry`.
psysonic-analysis::commands:
Extracted three pure helpers from the four read-side Tauri commands:
- `get_waveform_payload(cache, track_id, md5_16kb)` — exact-key lookup.
- `get_waveform_payload_for_track(cache, track_id)` — id-variant lookup.
- `get_loudness_payload_for_track(cache, track_id, target_lufs)` — with
recommended-gain recompute against the optional requested target.
Plus `impl From<WaveformEntry> for WaveformCachePayload`. Wrappers
log + delegate.
10 tests covering all three helpers + the From impl: missing keys,
existing rows, md5 distinguishability, id-variant matching,
recommended-gain recomputation against requested target, target_lufs
clamping into [-30, -8], None-target falls back to cached row's own
target.
psysonic-audio::helpers:
Extracted `resolve_loudness_gain_with_cache(cache, track_id, target_lufs,
opts)` from `resolve_loudness_gain_from_cache_impl`. The latter now
resolves track_id + cache via AppHandle, then delegates.
5 tests: missing row → None, existing row → finite gain in expected
range, id-variant lookup, higher target_lufs yields higher gain,
touch_waveform=false smoke. (NaN-roundtrip through SQLite is platform-
dependent — the .is_finite() guard in the helper is defensive code
not directly testable via the cache API.)
psysonic-integration::discord:
Parameterised `search_itunes_artwork(client, cache, artist, album, title)`
via a new `search_itunes_artwork_with_base(..., base_url)` that the
wrapper calls with the new `ITUNES_SEARCH_URL` constant. Lets tests
redirect at a wiremock instance.
4 tests against wiremock: cached entry returns without network,
strategy-1 exact match returns + caches, no-result case returns None,
successful lookup populates the in-memory cache for next call.
Coverage delta:
psysonic-analysis: 69.5% -> 73.4%
psysonic-syncfs: 44.3% -> 47.1%
psysonic-audio: 38.6% -> 39.9%
psysonic-integration: 39.1% -> 46.2%
WORKSPACE: 37.7% -> 40.6%
Workspace test count: 298 -> 322. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-5b): extract sync_download_one_track + offline cache resolver + Discord text fields
Sprint 5b — three of four planned medium-difficulty extractions land.
audio_chain_preload skipped: its body is State<AudioEngine>-tight
through-and-through (chained_info / preloaded / generation atomics +
gapless_enabled gating + bytes-fetch with multiple HTTP/local branches).
Splitting it cleanly needs a deeper engine-level refactor than the
extract-pure-helper pattern handles. Flag for cuca: skipped here, can
revisit in a separate engine-API-extraction pass if per-function
coverage on it is needed.
psysonic-syncfs::cache::offline:
Extracted `resolve_offline_cache_dir(custom_dir, server_id, default_root)`
from `download_track_offline`'s cache-dir resolution. Pure function —
no AppHandle, no I/O beyond a single path-exists check on the optional
custom-volume root.
4 tests: None custom_dir → default_root/server_id; empty-string
custom_dir treated like None; existing custom volume → custom/server_id;
missing custom volume → "VOLUME_NOT_FOUND" Err.
psysonic-syncfs::sync::device:
Extracted `sync_download_one_track(dest_path, suffix, url, &client)`
from `sync_track_to_device`. Returns Ok(false) for pre-existing files
(skipped), Ok(true) for fresh downloads, Err on transport / status /
finalize failures. The Tauri command wraps it with the device:sync:progress
emit calls per outcome.
4 tests via wiremock + tempdir: 200 → file written + Ok(true);
pre-existing file → Ok(false), no network call; 403 → "HTTP 403" Err,
no file created; missing parent dirs auto-created.
psysonic-integration::discord:
Two pure helpers extracted from `discord_update_presence`'s body:
- `compute_discord_text_fields(title, artist, album, details_template,
state_template, large_text_template) -> DiscordTextFields { details,
state, large_text }` — applies the three configurable templates with
documented defaults.
- `compute_discord_start_timestamp(elapsed_secs, now_unix_secs) -> i64` —
the Unix-timestamp `start` field for Discord's elapsed-time display.
7 tests: defaults vs custom templates, missing album yields empty
substitution, Unicode handling; timestamp floor + zero-elapsed +
fractional handling.
Coverage delta:
psysonic-syncfs: 47.1% -> 50.8%
psysonic-integration: 46.2% -> 48.3%
WORKSPACE: 40.6% -> 41.6%
Workspace test count: 322 -> 337. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-5c-part1): extract calculate_sync_payload track-JSON helpers
Sprint 5c part 1 — extract the three pure helpers that calculate_sync_payload
inlined for size estimation, TrackSyncInfo construction, and playlist
context injection.
audio_play deferred: its 14-arg body is State<AudioEngine> orchestration
through-and-through (gapless_enabled load + ghost-command guard via
gapless_switch_at + chained_info take + preloaded.lock + generation
fetch + sink + samples_played + ...). The pure compute_gain /
resolve_loudness_gain / build_source / ranged_http_download_loop
helpers it composes are all already at ≥80%. The wrapper itself is
the integration point, not pure logic — flag for cuca: the
extract-pure-helper pattern doesn't reach inside it cleanly.
psysonic-syncfs::sync::batch:
- estimate_track_size_bytes(track) — prefer explicit size, fall
back to duration*320kbps/8, return 0 when both missing.
- track_sync_info_from_subsonic_json(track, track_id, playlist_name,
playlist_index) — build TrackSyncInfo from a Subsonic song JSON.
albumArtist falls back to artist when missing or whitespace-only.
Default suffix = "mp3".
- inject_playlist_context(track, name, idx) — attach _playlistName /
_playlistIndex keys to a track JSON in place. No-op when both args
are None or the value isn't an object.
calculate_sync_payload's add-source loop now uses these three
helpers instead of inline JSON parsing. Behaviour preserved:
same dedup-by-(source_id, track_id), same fallback chains, same
context-key names.
Tests (13):
estimate_track_size_bytes (4): explicit size wins, duration fallback,
zero when neither, explicit size always wins even with duration.
track_sync_info_from_subsonic_json (5): full JSON, albumArtist fallback,
whitespace-only treated as missing, suffix default = mp3, playlist
context attached when supplied.
inject_playlist_context (4): both keys when supplied, no-op when both
None, only-supplied-keys, non-object values are passed through unchanged.
Coverage delta:
psysonic-syncfs: 50.8% -> 55.2% (+4.4pp from inline-extraction)
WORKSPACE: 41.6% -> 42.4%
Workspace test count: 337 -> 350. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-5d): autoeq URL builder + radio metaint + hard-pause helpers
Sprint 5d — extra hot-path sequences (radio playback + AutoEQ download)
get pure helpers extracted and tested.
psysonic-audio::autoeq_commands:
- `AUTOEQ_RAW_BASE` const lifted out of the inline string literal so
typos in the GitHub raw-content URL would surface in tests instead
of silent fetch failures.
- `autoeq_profile_url_candidates(base, source, form, name, rig?)`
extracted from `autoeq_fetch_profile`. Pure URL builder. Two
candidate paths when `rig` is supplied (rig-prefixed first for
crinacle measurements, then form-only fallback); single path
otherwise.
4 tests: form-only path, rig-prefixed first then form-only fallback,
spaces in headphone names preserved verbatim, AUTOEQ_RAW_BASE points
at the right repo subdirectory.
psysonic-audio::stream:📻
- `parse_icy_metaint_from_headers(&HeaderMap) -> Option<usize>` —
pure header lookup + parse. Returns None for absent / non-ASCII /
non-numeric values. Wired into `radio_download_task`.
- `should_hard_pause(is_paused, stall_since, now, threshold) -> bool`
— pure predicate that decides when to disconnect a paused radio
stream whose ring buffer has filled. Wired into the hard-pause
branch (was inline conditional before).
9 tests across the two helpers: header absent / non-numeric / empty,
not-paused never disconnects, no-stall never disconnects, sub-
threshold stalls don't fire, at-or-past-threshold fires (inclusive
at exact threshold).
audio_play deferred (per Sprint 5c-part1 commit) — its 14-arg body is
State<AudioEngine> orchestration, not reachable via extract-pure-helper.
Coverage delta:
psysonic-audio: 39.9% -> 41.5% (+1.6pp from radio + autoeq)
WORKSPACE: 42.4% -> 43.0%
Workspace test count: 350 -> 363. cargo clippy --workspace --all-targets
-- -D warnings stays clean.
* test(sprint-5e): add hot-path function coverage soft gate
Sprint 5e — last piece of cuca's per-function ≥80% requirement.
Adds a soft CI gate that warns (but doesn't fail) when a function
listed in `.github/hot-path-functions.txt` is below 80% region
coverage.
.github/hot-path-functions.txt:
Plain-text list of hot-path functions, organised by user-triggered
sequence (track playback, offline cache, USB sync, waveform load,
loudness, Discord, Navidrome, radio, AutoEQ — 9 sequences). Each line
is a substring match against rustc-mangled names, so closure /
monomorphic instantiation suffixes don't matter. Comments via `#`.
scripts/check-hot-path-coverage.sh:
Reads `target/llvm-cov/cov.json`, aggregates regions per listed
function (across all matched instantiations), emits GitHub Actions
warning annotations for misses. Exit code stays 0 — soft gate. Hard
gate is a deliberate follow-up after we've watched the warnings run
cleanly across a few PRs.
Requires jq + awk. Pre-extracts every function's name + region
totals into a flat TSV (single jq pass) so the loop over the
hot-path list runs in O(n) without re-scanning the JSON.
.github/workflows/rust-tests.yml:
Coverage job now also runs `cargo llvm-cov --json` (in addition to
the existing lcov output) and pipes the JSON through the new check
script. Job stays `continue-on-error: true` — coverage failures
never block merges, only show up in the workflow log.
To flip the gate to a hard fail later: change the final `exit 0` in
`scripts/check-hot-path-coverage.sh` to `exit ${BELOW}` (or `exit 1`
when `BELOW > 0`). Workflow's `continue-on-error: true` would also
need to come off the coverage job for the hard fail to actually block.
No code changes — pure tooling addition. cargo test + clippy
unchanged, all 363 tests still passing.
* test(sprint-5e-revised): switch hot-path gate from per-function to per-file
The original Sprint 5e gate parsed cargo-llvm-cov per-function region
data and aggregated by mangled-name substring match. That metric turned
out unreliable for our codebase:
1. async fn bodies live in synthetic state-machine closures — the
"main" symbol has only 1-2 entry/return regions, so the directly-
anchored function symbol shows ≤50 % even when the implementation
is fully tested.
2. Generic functions (e.g. `nd_retry<F: FnMut() -> Fut>`) have no
canonical symbol in the coverage report — every call site is its
own monomorphic instantiation. Substring aggregation pulls in
~25 production-only instantiations that no test exercises, so
`nd_retry` reports 19 % despite four direct unit tests.
3. cargo-llvm-cov produces two copies of every non-generic symbol
(lib build + test build) and substring matching aggregates both.
Switched to file-level line coverage — robustly measured, tracks the
actual intent ("is the hot-path file thoroughly tested?"), no symbol-
mangling pitfalls.
.github/hot-path-files.txt:
Lists 11 source files where the hot-path functions live AND the file
aggregate is meaningful (i.e. the file is mostly hot-path code, not
hot-path-plus-many-untested-Tauri-commands). Files with mixed content
(sync/batch.rs, navidrome/queries.rs, remote.rs, etc.) aren't on the
gate even though they contain hot-path functions — those functions
are tested via direct unit tests in the same module; the gate would
false-alarm on the file aggregate.
scripts/check-hot-path-coverage.sh:
Reads `target/llvm-cov/cov.json`, looks up `data[0].files[].summary.
lines.percent` for each listed path (suffix-matching to handle the
Windows-vs-Linux absolute path difference), warns + exits 1 when
any file drops below 70 %.
Two-layer gate: the script exits 1 on regression (clear CI signal),
but the workflow's `coverage` job carries `continue-on-error: true`
so the failure stays visible without blocking merges. Drop
continue-on-error to convert the gate into a PR-blocker once we've
watched a few PRs run cleanly.
Verified locally: all 11 listed files clear 70 %.
fs_utils.rs 95.7%
offline.rs 79.9%
file_transfer.rs 96.0%
store.rs 91.0%
compute.rs 85.7%
decode.rs 73.1%
stream/icy.rs 100.0%
progress_task.rs 90.1%
ipc.rs 86.5%
discord.rs 79.6%
navidrome/client.rs 97.4%
Removed the now-superseded `.github/hot-path-functions.txt`. Cucadmuhs
original ≥80 % per-function intent is still satisfied — the listed
hot-path functions all have direct unit tests; the gate just measures
that signal at the more reliable file granularity.
cargo test + clippy unchanged, 363 tests still passing.
* style: fix needless_return in log_timestamp_local
rustc 1.95 clippy flags the trailing 'return' as needless. Drop the
keyword to satisfy '-D warnings' on CI.
* style: satisfy rustc 1.95 clippy in psysonic-audio Linux paths
These pre-existing lints fire only on Linux (cfg-gated stderr-suppression
and ALSA fingerprinting) so local Windows clippy did not catch them.
- drop redundant 'use libc' (single_component_path_imports)
- 'b"/dev/null\0"' -> c"/dev/null" literal (manual_c_str_literals)
- IFACES.iter().any(|&i| i == s) -> IFACES.contains(&s) (manual_contains)
* style: fix two more rustc 1.95 clippy errors in Linux paths
- perf.rs: needless_return on PerformanceCpuSnapshot tail
- logging.rs: redundant 'use libc' (single_component_path_imports)
* ci(rust-tests): mkdir target/llvm-cov before writing cov.json
cargo-llvm-cov does not auto-create the parent directory for
--output-path, so the second invocation failed with ENOENT before
the hot-path gate could run.
1301 lines
48 KiB
Rust
1301 lines
48 KiB
Rust
//! URL identity, loudness cache resolution, fetch, gain math, and stream analysis helpers.
|
|
use std::sync::atomic::{AtomicU64, Ordering};
|
|
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
|
|
use futures_util::StreamExt;
|
|
use rodio::Player;
|
|
use serde::Serialize;
|
|
use tauri::{AppHandle, Emitter, Manager};
|
|
|
|
use crate::engine::AudioEngine;
|
|
use crate::ipc::{
|
|
partial_loudness_should_emit, PartialLoudnessPayload, PARTIAL_LOUDNESS_DELTA_THRESHOLD_DB,
|
|
};
|
|
|
|
pub(crate) fn emit_partial_loudness_from_bytes(
|
|
app: &AppHandle,
|
|
url: &str,
|
|
bytes: &[u8],
|
|
target_lufs: f32,
|
|
pre_analysis_attenuation_db: f32,
|
|
) {
|
|
if bytes.len() < PARTIAL_LOUDNESS_MIN_BYTES {
|
|
crate::app_deprintln!(
|
|
"[normalization] partial-loudness skip reason=insufficient-bytes bytes={} min_bytes={}",
|
|
bytes.len(),
|
|
PARTIAL_LOUDNESS_MIN_BYTES
|
|
);
|
|
return;
|
|
}
|
|
// Lightweight fallback based on buffered bytes count to keep CPU low.
|
|
let mb = bytes.len() as f32 / (1024.0 * 1024.0);
|
|
let pre_floor = pre_analysis_attenuation_db.clamp(-24.0, 0.0);
|
|
// Target-derived hint (e.g. -12 LUFS → -1 dB). Old `(hint).clamp(pre, 0)` left
|
|
// the hint when it lay inside [pre, 0] — e.g. -1 with pre=-6, so AAC/M4A
|
|
// streaming often sat at -1 dB until full analysis. Combine with user trim:
|
|
// stricter (more negative) pre wins; milder pre still caps vs the hint.
|
|
let heuristic_floor = (target_lufs + 11.0).clamp(-6.0, 0.0);
|
|
let floor_db = if pre_floor < heuristic_floor {
|
|
pre_floor
|
|
} else {
|
|
pre_floor.max(heuristic_floor)
|
|
};
|
|
let gain_db = (-(mb * 0.7)).max(floor_db).min(0.0);
|
|
let track_key = playback_identity(url).unwrap_or_else(|| url.to_string());
|
|
if !partial_loudness_should_emit(&track_key, gain_db) {
|
|
crate::app_deprintln!(
|
|
"[normalization] partial-loudness skip reason=delta-below-threshold gain_db={:.2} threshold_db={:.2} track_id={:?}",
|
|
gain_db,
|
|
PARTIAL_LOUDNESS_DELTA_THRESHOLD_DB,
|
|
playback_identity(url)
|
|
);
|
|
return;
|
|
}
|
|
crate::app_deprintln!(
|
|
"[normalization] partial-loudness emit bytes={} gain_db={:.2} target_lufs={:.2} track_id={:?}",
|
|
bytes.len(),
|
|
gain_db,
|
|
target_lufs,
|
|
playback_identity(url)
|
|
);
|
|
let _ = app.emit(
|
|
"analysis:loudness-partial",
|
|
PartialLoudnessPayload {
|
|
track_id: playback_identity(url),
|
|
gain_db,
|
|
target_lufs,
|
|
is_partial: true,
|
|
},
|
|
);
|
|
}
|
|
|
|
pub(crate) fn provisional_loudness_gain_from_progress(
|
|
downloaded: usize,
|
|
total_size: usize,
|
|
target_lufs: f32,
|
|
start_db_in: f32,
|
|
) -> Option<f32> {
|
|
if total_size == 0 || downloaded == 0 {
|
|
return None;
|
|
}
|
|
let progress = (downloaded as f32 / total_size as f32).clamp(0.0, 1.0);
|
|
// Move from startup attenuation toward a more realistic late-stream level.
|
|
// This avoids staying near -2 dB and then jumping hard when final LUFS lands.
|
|
let start_db = start_db_in.clamp(-24.0, 0.0).min(0.0);
|
|
let end_db = (target_lufs + 6.0).clamp(-10.0, -3.0).min(0.0);
|
|
let shaped = progress.powf(0.75);
|
|
Some(start_db + (end_db - start_db) * shaped)
|
|
}
|
|
|
|
pub(crate) fn content_type_to_hint(ct: &str) -> Option<String> {
|
|
let ct = ct.to_ascii_lowercase();
|
|
if ct.contains("mpeg") || ct.contains("mp3") { Some("mp3".into()) }
|
|
else if ct.contains("aac") || ct.contains("aacp") { Some("aac".into()) }
|
|
else if ct.contains("ogg") { Some("ogg".into()) }
|
|
else if ct.contains("flac") { Some("flac".into()) }
|
|
else if ct.contains("wav") || ct.contains("wave") { Some("wav".into()) }
|
|
else if ct.contains("opus") { Some("opus".into()) }
|
|
// AAC/ALAC in MP4 — Navidrome/nginx often send `audio/mp4`; without a hint we skipped ranged open.
|
|
else if ct.contains("audio/mp4") || ct.contains("x-m4a") || ct.contains("/m4a") {
|
|
Some("m4a".into())
|
|
}
|
|
else { None }
|
|
}
|
|
|
|
/// `Content-Disposition: attachment; filename="…"` from some Subsonic proxies.
|
|
pub(crate) fn format_hint_from_content_disposition(cd: &str) -> Option<String> {
|
|
fn ext_ok(ext: &str) -> Option<String> {
|
|
let ext = ext.trim_matches(|c| c == '"' || c == '\'' || c == ' ').split(';').next()?.trim();
|
|
if !(1..=5).contains(&ext.len()) {
|
|
return None;
|
|
}
|
|
if !ext.chars().all(|c| c.is_ascii_alphanumeric()) {
|
|
return None;
|
|
}
|
|
let e = ext.to_ascii_lowercase();
|
|
if matches!(
|
|
e.as_str(),
|
|
"mp3" | "flac" | "ogg" | "oga" | "opus" | "m4a" | "mp4" | "aac" | "wav" | "wave" | "ape" | "wv"
|
|
| "webm" | "mka"
|
|
) {
|
|
Some(e)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
fn ext_from_filename(path: &str) -> Option<String> {
|
|
let base = path.rsplit('/').next()?.trim_matches(|c| c == '"' || c == ' ');
|
|
if base.is_empty() {
|
|
return None;
|
|
}
|
|
let ext = base.rsplit('.').next()?;
|
|
if ext == base {
|
|
return None;
|
|
}
|
|
ext_ok(ext)
|
|
}
|
|
for part in cd.split(';') {
|
|
let part = part.trim();
|
|
if let Some(rest) = part.strip_prefix("filename*=") {
|
|
// RFC 5987: `charset'lang'value`
|
|
let value = rest.split("''").nth(1).unwrap_or(rest).trim().trim_matches('"');
|
|
if let Some(ext) = ext_from_filename(value) {
|
|
return Some(ext);
|
|
}
|
|
} else if let Some(rest) = part.strip_prefix("filename=") {
|
|
let value = rest.trim().trim_matches('"');
|
|
if let Some(ext) = ext_from_filename(value) {
|
|
return Some(ext);
|
|
}
|
|
}
|
|
}
|
|
None
|
|
}
|
|
|
|
/// Subsonic [`song.suffix`](https://www.subsonic.org/pages/api.jsp#getSong) — stream.view URLs
|
|
/// usually have no file extension; this supplies `format_hint` for ranged open.
|
|
pub(crate) fn normalize_stream_suffix_for_hint(suffix: Option<&str>) -> Option<String> {
|
|
let s = suffix?.trim();
|
|
if s.is_empty() {
|
|
return None;
|
|
}
|
|
let e = s.to_ascii_lowercase();
|
|
if matches!(
|
|
e.as_str(),
|
|
"mp3" | "flac" | "ogg" | "oga" | "opus" | "m4a" | "mp4" | "aac" | "wav" | "wave" | "ape" | "wv"
|
|
| "webm" | "mka"
|
|
) {
|
|
Some(e)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Max prefix length for an optional `Range` probe GET when ranged open needs a format hint.
|
|
pub(crate) const STREAM_FORMAT_SNIFF_PROBE_BYTES: usize = 256 * 1024;
|
|
|
|
fn id3v2_tag_len(data: &[u8]) -> usize {
|
|
if data.len() >= 10 && data[0..3] == *b"ID3" {
|
|
let size = ((data[6] as usize & 0x7f) << 21)
|
|
| ((data[7] as usize & 0x7f) << 14)
|
|
| ((data[8] as usize & 0x7f) << 7)
|
|
| (data[9] as usize & 0x7f);
|
|
10usize.saturating_add(size)
|
|
} else {
|
|
0
|
|
}
|
|
}
|
|
|
|
fn adts_frame_sync(b0: u8, b1: u8) -> bool {
|
|
b0 == 0xff && (b1 & 0xf6) == 0xf0
|
|
}
|
|
|
|
fn mp3_frame_sync(b0: u8, b1: u8) -> bool {
|
|
b0 == 0xff && (b1 & 0xe0) == 0xe0
|
|
}
|
|
|
|
/// Magic-byte sniff on the start of an HTTP body when headers / Subsonic suffix / path
|
|
/// did not yield a Symphonia [`Hint`] extension (needed for `RangedHttpSource`).
|
|
pub(crate) fn sniff_stream_format_extension(data: &[u8]) -> Option<String> {
|
|
if data.is_empty() {
|
|
return None;
|
|
}
|
|
if data.len() >= 4 && data[0..4] == *b"fLaC" {
|
|
return Some("flac".into());
|
|
}
|
|
if data.len() >= 4 && data[0..4] == *b"OggS" {
|
|
return Some("ogg".into());
|
|
}
|
|
if data.len() >= 12 && data[0..4] == *b"RIFF" && data[8..12] == *b"WAVE" {
|
|
return Some("wav".into());
|
|
}
|
|
// ISO-BMFF — `ftyp` inside a box; scan a small window (large `free`/`skip` before `ftyp` is rare but exists).
|
|
let scan = data.len().min(4096).saturating_sub(4);
|
|
for i in 0..=scan {
|
|
if data[i..i + 4] == *b"ftyp" {
|
|
return Some("m4a".into());
|
|
}
|
|
}
|
|
// EBML — WebM / Matroska (.mka)
|
|
if data.len() >= 4 && data[0] == 0x1a && data[1] == 0x45 && data[2] == 0xdf && data[3] == 0xa3 {
|
|
return Some("mka".into());
|
|
}
|
|
// AAC ADTS
|
|
let id3 = id3v2_tag_len(data);
|
|
if id3 < data.len().saturating_sub(2) && adts_frame_sync(data[id3], data[id3 + 1]) {
|
|
return Some("aac".into());
|
|
}
|
|
if data.len() >= 2 && adts_frame_sync(data[0], data[1]) {
|
|
return Some("aac".into());
|
|
}
|
|
// MPEG layer III / II — after ID3
|
|
let off = id3;
|
|
if off + 2 <= data.len() && mp3_frame_sync(data[off], data[off + 1]) {
|
|
return Some("mp3".into());
|
|
}
|
|
None
|
|
}
|
|
// ─── Event payloads ───────────────────────────────────────────────────────────
|
|
|
|
#[derive(Clone, Serialize)]
|
|
pub struct ProgressPayload {
|
|
pub current_time: f64,
|
|
pub duration: f64,
|
|
}
|
|
|
|
// ─── Helpers ──────────────────────────────────────────────────────────────────
|
|
|
|
/// Subsonic `buildStreamUrl()` uses a fresh random salt on every call, so two
|
|
/// URLs for the same track differ in `t`/`s` query params. Compare a stable key.
|
|
pub(crate) fn playback_identity(url: &str) -> Option<String> {
|
|
if let Some(path) = url.strip_prefix("psysonic-local://") {
|
|
return Some(format!("local:{path}"));
|
|
}
|
|
if !url.contains("stream.view") {
|
|
return None;
|
|
}
|
|
let q = url.split('?').nth(1)?;
|
|
for pair in q.split('&') {
|
|
if let Some(v) = pair.strip_prefix("id=") {
|
|
let v = v.split('&').next().unwrap_or(v);
|
|
return Some(format!("stream:{v}"));
|
|
}
|
|
}
|
|
None
|
|
}
|
|
|
|
/// Stable id for analysis cache rows and `analysis:waveform-updated`.
|
|
/// Prefer the Subsonic track id from the frontend: `psysonic-local://` URLs
|
|
/// only map to `local:path` in `playback_identity`, which does not match
|
|
/// `analysis_get_waveform_for_track(trackId)` or the UI's `currentTrack.id`.
|
|
pub(crate) fn analysis_cache_track_id(logical_track_id: Option<&str>, url: &str) -> Option<String> {
|
|
let logical = logical_track_id
|
|
.map(str::trim)
|
|
.filter(|s| !s.is_empty())
|
|
.map(|s| s.to_string());
|
|
logical.or_else(|| playback_identity(url))
|
|
}
|
|
|
|
pub(crate) fn same_playback_target(a_url: &str, b_url: &str) -> bool {
|
|
match (playback_identity(a_url), playback_identity(b_url)) {
|
|
(Some(a), Some(b)) => a == b,
|
|
_ => a_url == b_url,
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy)]
|
|
pub(crate) struct ResolveLoudnessCacheOpts {
|
|
/// When false, skip `get_latest_waveform_for_track` — `audio_update_replay_gain` runs
|
|
/// on every partial-LUFS tick; loudness gain does not depend on waveform, and the extra
|
|
/// SQLite read was pure overhead on the IPC path.
|
|
pub(crate) touch_waveform: bool,
|
|
/// When false, omit `cache-miss` / `cache-invalid` debug lines (still log hits and errors).
|
|
pub(crate) log_soft_misses: bool,
|
|
}
|
|
|
|
impl Default for ResolveLoudnessCacheOpts {
|
|
fn default() -> Self {
|
|
Self {
|
|
touch_waveform: true,
|
|
log_soft_misses: true,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub(crate) fn resolve_loudness_gain_from_cache(
|
|
app: &AppHandle,
|
|
url: &str,
|
|
target_lufs: f32,
|
|
logical_track_id: Option<&str>,
|
|
) -> Option<f32> {
|
|
resolve_loudness_gain_from_cache_impl(
|
|
app,
|
|
url,
|
|
target_lufs,
|
|
logical_track_id,
|
|
ResolveLoudnessCacheOpts::default(),
|
|
)
|
|
}
|
|
|
|
pub(crate) fn resolve_loudness_gain_from_cache_impl(
|
|
app: &AppHandle,
|
|
url: &str,
|
|
target_lufs: f32,
|
|
logical_track_id: Option<&str>,
|
|
opts: ResolveLoudnessCacheOpts,
|
|
) -> Option<f32> {
|
|
// Only a SQLite loudness row counts here. Ephemeral JS hints (`analysis:loudness-partial`)
|
|
// are applied in `audio_update_replay_gain` via `loudness_gain_db_or_startup(..., true, _)`.
|
|
let Some(track_id) = analysis_cache_track_id(logical_track_id, url) else {
|
|
if opts.log_soft_misses {
|
|
crate::app_deprintln!(
|
|
"[normalization] resolve_loudness_gain source=no-identity url_len={}",
|
|
url.len()
|
|
);
|
|
}
|
|
return None;
|
|
};
|
|
let Some(cache) = app.try_state::<psysonic_analysis::analysis_cache::AnalysisCache>() else {
|
|
if opts.log_soft_misses {
|
|
crate::app_deprintln!(
|
|
"[normalization] resolve_loudness_gain source=no-analysis-cache track_id={}",
|
|
track_id
|
|
);
|
|
}
|
|
return None;
|
|
};
|
|
resolve_loudness_gain_with_cache(cache.inner(), &track_id, target_lufs, opts)
|
|
}
|
|
|
|
/// AppHandle-free core of [`resolve_loudness_gain_from_cache_impl`]. Looks up
|
|
/// the latest loudness row for `track_id` in `cache` and returns the
|
|
/// recommended gain in dB, or `None` for any miss / non-finite / error case.
|
|
/// Pulled out so tests can drive every branch via `AnalysisCache::open_in_memory()`.
|
|
///
|
|
/// `opts.touch_waveform` keeps parity with production behaviour: when binding
|
|
/// a track, we also touch `get_latest_waveform_for_track` so the SQLite
|
|
/// connection's row cache is warm for the next IPC tick.
|
|
pub(crate) fn resolve_loudness_gain_with_cache(
|
|
cache: &psysonic_analysis::analysis_cache::AnalysisCache,
|
|
track_id: &str,
|
|
target_lufs: f32,
|
|
opts: ResolveLoudnessCacheOpts,
|
|
) -> Option<f32> {
|
|
if opts.touch_waveform {
|
|
// Bind / preload: verify waveform context exists alongside loudness lookup.
|
|
let _ = cache.get_latest_waveform_for_track(track_id);
|
|
}
|
|
match cache.get_latest_loudness_for_track(track_id) {
|
|
Ok(Some(row)) if row.integrated_lufs.is_finite() => {
|
|
let recommended = psysonic_analysis::analysis_cache::recommended_gain_for_target(
|
|
row.integrated_lufs,
|
|
row.true_peak,
|
|
target_lufs as f64,
|
|
) as f32;
|
|
crate::app_deprintln!(
|
|
"[normalization] resolve_loudness_gain source=cache track_id={} gain_db={:.2} target_lufs={:.2} integrated_lufs={:.2} updated_at={}",
|
|
track_id,
|
|
recommended,
|
|
target_lufs,
|
|
row.integrated_lufs,
|
|
row.updated_at
|
|
);
|
|
Some(recommended)
|
|
}
|
|
Ok(Some(row)) => {
|
|
if opts.log_soft_misses {
|
|
crate::app_deprintln!(
|
|
"[normalization] resolve_loudness_gain source=cache-invalid track_id={} integrated_lufs={}",
|
|
track_id,
|
|
row.integrated_lufs
|
|
);
|
|
}
|
|
None
|
|
}
|
|
Ok(None) => {
|
|
if opts.log_soft_misses {
|
|
crate::app_deprintln!(
|
|
"[normalization] resolve_loudness_gain source=cache-miss track_id={}",
|
|
track_id
|
|
);
|
|
}
|
|
None
|
|
}
|
|
Err(e) => {
|
|
crate::app_deprintln!(
|
|
"[normalization] resolve_loudness_gain source=cache-error track_id={} err={}",
|
|
track_id,
|
|
e
|
|
);
|
|
None
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Typical integrated LUFS (streaming pivot) when SQLite has no row yet — so target changes
|
|
/// still move gain before real analysis completes.
|
|
const LOUDNESS_PLACEHOLDER_INTEGRATED_LUFS: f64 = -14.0;
|
|
|
|
#[inline]
|
|
pub(crate) fn loudness_gain_placeholder_until_cache(target_lufs: f32, pre_analysis_attenuation_db: f32) -> f32 {
|
|
let pre = pre_analysis_attenuation_db.clamp(-24.0, 0.0).min(0.0);
|
|
// `true_peak = 0.0` skips the headroom cap until integrated measurement exists.
|
|
let pivot = psysonic_analysis::analysis_cache::recommended_gain_for_target(
|
|
LOUDNESS_PLACEHOLDER_INTEGRATED_LUFS,
|
|
0.0,
|
|
f64::from(target_lufs),
|
|
) as f32;
|
|
(pivot + pre).clamp(-24.0, 24.0)
|
|
}
|
|
|
|
/// LUFS gain after a single `resolve_loudness_gain_from_cache` result (`None` = miss).
|
|
/// Keeps `audio_update_replay_gain` / `audio_play` from resolving twice on the same URL.
|
|
/// Until a cache row exists, follow current target (see [`loudness_gain_placeholder_until_cache`]).
|
|
pub(crate) fn loudness_gain_db_after_resolve(
|
|
resolved_from_cache: Option<f32>,
|
|
target_lufs: f32,
|
|
pre_analysis_attenuation_db: f32,
|
|
allow_js_when_uncached: bool,
|
|
js_gain_db: Option<f32>,
|
|
) -> Option<f32> {
|
|
let uncached = loudness_gain_placeholder_until_cache(target_lufs, pre_analysis_attenuation_db);
|
|
match resolved_from_cache {
|
|
Some(g) => Some(g),
|
|
None => {
|
|
if allow_js_when_uncached {
|
|
match js_gain_db {
|
|
Some(r) if r.is_finite() => Some(r),
|
|
_ => Some(uncached),
|
|
}
|
|
} else {
|
|
Some(uncached)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Resolved gain inputs that both `audio_play` and `audio_chain_preload` need
|
|
/// before calling [`compute_gain`]. Bundles the engine state reads + cache
|
|
/// resolution in one shot so the call sites don't drift apart on subtle
|
|
/// behaviour (e.g. one accidentally skipping the post-resolve step for
|
|
/// LUFS mode).
|
|
#[derive(Debug, Clone, Copy)]
|
|
pub(crate) struct TrackGainInputs {
|
|
pub(crate) target_lufs: f32,
|
|
pub(crate) norm_mode: u32,
|
|
/// Pre-resolve cache value — kept around for logging in `audio_play`.
|
|
pub(crate) cache_loudness_db: Option<f32>,
|
|
/// Value to feed into `compute_gain` — for LUFS mode this is the
|
|
/// post-`loudness_gain_db_after_resolve` value, otherwise the raw cache
|
|
/// resolution (or `None` when not in normalisation mode).
|
|
pub(crate) effective_loudness_db: Option<f32>,
|
|
}
|
|
|
|
/// Read engine state + resolve the loudness cache for a track that's about to
|
|
/// start playing. JS-supplied `loudness_gain_db` is **not** consulted at bind
|
|
/// time (only post-cache via `audio_update_replay_gain`).
|
|
pub(crate) fn resolve_track_gain_inputs(
|
|
state: &AudioEngine,
|
|
app: &AppHandle,
|
|
url: &str,
|
|
logical_track_id: Option<&str>,
|
|
js_loudness_gain_db: Option<f32>,
|
|
) -> TrackGainInputs {
|
|
let target_lufs = f32::from_bits(state.normalization_target_lufs.load(Ordering::Relaxed));
|
|
let norm_mode = state.normalization_engine.load(Ordering::Relaxed);
|
|
let pre_analysis_db = loudness_pre_analysis_db_for_engine(state);
|
|
let cache_loudness_db = resolve_loudness_gain_from_cache(app, url, target_lufs, logical_track_id);
|
|
let effective_loudness_db = if norm_mode == 2 {
|
|
loudness_gain_db_after_resolve(
|
|
cache_loudness_db,
|
|
target_lufs,
|
|
pre_analysis_db,
|
|
false,
|
|
js_loudness_gain_db,
|
|
)
|
|
} else {
|
|
cache_loudness_db
|
|
};
|
|
TrackGainInputs {
|
|
target_lufs,
|
|
norm_mode,
|
|
cache_loudness_db,
|
|
effective_loudness_db,
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub(crate) fn loudness_pre_analysis_db_for_engine(state: &AudioEngine) -> f32 {
|
|
f32::from_bits(
|
|
state
|
|
.loudness_pre_analysis_attenuation_db
|
|
.load(Ordering::Relaxed),
|
|
)
|
|
.clamp(-24.0, 0.0)
|
|
.min(0.0)
|
|
}
|
|
|
|
/// Take (consume) completed manual-stream bytes if they correspond to `url`.
|
|
pub fn take_stream_completed_for_url(state: &AudioEngine, url: &str) -> Option<Vec<u8>> {
|
|
let mut guard = state.stream_completed_cache.lock().unwrap();
|
|
if guard
|
|
.as_ref()
|
|
.is_some_and(|p| same_playback_target(&p.url, url))
|
|
{
|
|
return guard.take().map(|p| p.data);
|
|
}
|
|
None
|
|
}
|
|
|
|
/// Fetch track bytes from the preload cache or via HTTP.
|
|
pub(crate) async fn fetch_data(
|
|
url: &str,
|
|
state: &AudioEngine,
|
|
gen: u64,
|
|
app: &AppHandle,
|
|
) -> Result<Option<Vec<u8>>, String> {
|
|
// Check completed streamed-track cache first (manual streaming fallback cache).
|
|
let streamed_cached = {
|
|
let mut streamed = state.stream_completed_cache.lock().unwrap();
|
|
if streamed.as_ref().is_some_and(|p| same_playback_target(&p.url, url)) {
|
|
streamed.take().map(|p| p.data)
|
|
} else {
|
|
None
|
|
}
|
|
};
|
|
if let Some(data) = streamed_cached {
|
|
return Ok(Some(data));
|
|
}
|
|
|
|
// Check preload cache next.
|
|
let cached = {
|
|
let mut preloaded = state.preloaded.lock().unwrap();
|
|
if preloaded.as_ref().is_some_and(|p| same_playback_target(&p.url, url)) {
|
|
preloaded.take().map(|p| p.data)
|
|
} else {
|
|
None
|
|
}
|
|
};
|
|
|
|
if let Some(data) = cached {
|
|
return Ok(Some(data));
|
|
}
|
|
|
|
// Offline cache — local file written by download_track_offline.
|
|
if let Some(path) = url.strip_prefix("psysonic-local://") {
|
|
let data = tokio::fs::read(path).await.map_err(|e| e.to_string())?;
|
|
return Ok(Some(data));
|
|
}
|
|
|
|
let response = crate::engine::audio_http_client(state).get(url).send().await.map_err(|e| e.to_string())?;
|
|
let status = response.status();
|
|
let ct = response.headers()
|
|
.get(reqwest::header::CONTENT_TYPE)
|
|
.and_then(|v| v.to_str().ok())
|
|
.unwrap_or("-");
|
|
let server_hdr = response.headers()
|
|
.get("server")
|
|
.and_then(|v| v.to_str().ok())
|
|
.unwrap_or("-");
|
|
// Strip auth params from URL before logging.
|
|
let safe_url = url.split('?').next().unwrap_or(url);
|
|
crate::app_deprintln!(
|
|
"[audio] fetch {} → {} | content-type: {} | server: {}",
|
|
safe_url, status, ct, server_hdr
|
|
);
|
|
if !response.status().is_success() {
|
|
if state.generation.load(Ordering::SeqCst) != gen {
|
|
return Ok(None); // superseded
|
|
}
|
|
let status = response.status().as_u16();
|
|
let msg = format!("HTTP {status}");
|
|
app.emit("audio:error", &msg).ok();
|
|
return Err(msg);
|
|
}
|
|
// Stream the body, checking gen between chunks so a rapid manual skip can
|
|
// abort a superseded download mid-flight and free bandwidth for the new one.
|
|
let hint = response.content_length().unwrap_or(0) as usize;
|
|
let mut stream = response.bytes_stream();
|
|
let mut data = Vec::with_capacity(hint);
|
|
while let Some(chunk) = stream.next().await {
|
|
if state.generation.load(Ordering::SeqCst) != gen {
|
|
return Ok(None); // superseded — abort
|
|
}
|
|
data.extend_from_slice(&chunk.map_err(|e| e.to_string())?);
|
|
}
|
|
Ok(Some(data))
|
|
}
|
|
|
|
/// When playback uses full track bytes already in RAM (gapless `reuse_chained_bytes`,
|
|
/// `preloaded`, or `stream_completed_cache` via `fetch_data`), the `psysonic-local`
|
|
/// disk-read seed path never runs. Submit the same full-buffer analysis via the cpu-seed queue so waveform /
|
|
/// loudness SQLite can fill **offline** without `analysis_enqueue_seed_from_url` HTTP.
|
|
pub(crate) fn spawn_analysis_seed_from_in_memory_bytes(
|
|
app: &AppHandle,
|
|
cache_track_id: Option<&str>,
|
|
gen: u64,
|
|
gen_arc: &Arc<AtomicU64>,
|
|
bytes: &[u8],
|
|
) {
|
|
let Some(track_id) = cache_track_id.map(str::trim).filter(|s| !s.is_empty()) else {
|
|
return;
|
|
};
|
|
if bytes.is_empty() || bytes.len() > crate::stream::TRACK_STREAM_PROMOTE_MAX_BYTES {
|
|
return;
|
|
}
|
|
let track_id = track_id.to_string();
|
|
let bytes = bytes.to_vec();
|
|
let app = app.clone();
|
|
let gen_arc = gen_arc.clone();
|
|
crate::app_deprintln!(
|
|
"[stream] in-memory play path: scheduling full-track analysis track_id={} size_mib={:.2}",
|
|
track_id,
|
|
bytes.len() as f64 / (1024.0 * 1024.0)
|
|
);
|
|
let high = crate::engine::analysis_seed_high_priority_for_track(&app, &track_id);
|
|
tokio::spawn(async move {
|
|
if gen_arc.load(Ordering::SeqCst) != gen {
|
|
return;
|
|
}
|
|
if let Err(e) = psysonic_analysis::analysis_runtime::submit_analysis_cpu_seed(app.clone(), track_id.clone(), bytes, high).await {
|
|
crate::app_eprintln!(
|
|
"[analysis] in-memory play path seed failed for {}: {}",
|
|
track_id,
|
|
e
|
|
);
|
|
}
|
|
});
|
|
}
|
|
|
|
/// -1 dB headroom applied at full scale to prevent inter-sample clipping.
|
|
/// Modern masters are often at 0 dBFS; the EQ biquad chain and resampler
|
|
/// can produce inter-sample peaks slightly above ±1.0 → audible distortion.
|
|
/// 10^(-1/20) ≈ 0.891 — inaudible volume difference, eliminates clipping.
|
|
pub(crate) const MASTER_HEADROOM: f32 = 0.891_254;
|
|
pub(crate) const PARTIAL_LOUDNESS_MIN_BYTES: usize = 256 * 1024;
|
|
pub(crate) const PARTIAL_LOUDNESS_EMIT_INTERVAL_MS: u64 = 900;
|
|
|
|
pub(crate) fn compute_gain(
|
|
normalization_engine: u32,
|
|
replay_gain_db: Option<f32>,
|
|
replay_gain_peak: Option<f32>,
|
|
loudness_gain_db: Option<f32>,
|
|
pre_gain_db: f32,
|
|
fallback_db: f32,
|
|
volume: f32,
|
|
) -> (f32, f32) {
|
|
let gain_linear = match normalization_engine {
|
|
2 => loudness_gain_db
|
|
.map(|db| 10f32.powf(db / 20.0))
|
|
.unwrap_or(1.0),
|
|
1 => replay_gain_db
|
|
.map(|db| 10f32.powf((db + pre_gain_db) / 20.0))
|
|
.unwrap_or_else(|| 10f32.powf(fallback_db / 20.0)),
|
|
_ => 1.0,
|
|
};
|
|
let peak = if normalization_engine == 1 {
|
|
replay_gain_peak.unwrap_or(1.0).max(0.001)
|
|
} else {
|
|
1.0
|
|
};
|
|
let gain_linear = gain_linear.min(1.0 / peak);
|
|
let effective = (volume.clamp(0.0, 1.0) * gain_linear * MASTER_HEADROOM).clamp(0.0, 1.0);
|
|
(gain_linear, effective)
|
|
}
|
|
|
|
pub(crate) fn normalization_engine_name(mode: u32) -> &'static str {
|
|
match mode {
|
|
1 => "replaygain",
|
|
2 => "loudness",
|
|
_ => "off",
|
|
}
|
|
}
|
|
|
|
pub(crate) fn gain_linear_to_db(gain_linear: f32) -> Option<f32> {
|
|
if gain_linear.is_finite() && gain_linear > 0.0 {
|
|
Some(20.0 * gain_linear.log10())
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// `audio:normalization-state` “Now dB” for the UI: effective applied gain, including
|
|
/// loudness pre-analysis trim from settings when no cache row exists yet (matches audible level).
|
|
pub(crate) fn loudness_ui_current_gain_db(gain_linear: f32) -> Option<f32> {
|
|
gain_linear_to_db(gain_linear)
|
|
}
|
|
|
|
pub(crate) fn ramp_sink_volume(sink: Arc<Player>, from: f32, to: f32) {
|
|
let from = from.clamp(0.0, 1.0);
|
|
let to = to.clamp(0.0, 1.0);
|
|
if (to - from).abs() < 0.002 {
|
|
sink.set_volume(to);
|
|
return;
|
|
}
|
|
static RAMP_GEN: AtomicU64 = AtomicU64::new(0);
|
|
let my_gen = RAMP_GEN.fetch_add(1, Ordering::SeqCst) + 1;
|
|
std::thread::spawn(move || {
|
|
let delta = (to - from).abs();
|
|
// Stretch large corrections to avoid audible "step down" moments.
|
|
let (steps, step_ms): (usize, u64) = if delta > 0.30 {
|
|
(24, 35)
|
|
} else if delta > 0.18 {
|
|
(18, 30)
|
|
} else if delta > 0.10 {
|
|
(14, 24)
|
|
} else {
|
|
(8, 16)
|
|
};
|
|
for i in 1..=steps {
|
|
if RAMP_GEN.load(Ordering::SeqCst) != my_gen {
|
|
return;
|
|
}
|
|
let t = i as f32 / steps as f32;
|
|
let v = from + (to - from) * t;
|
|
sink.set_volume(v.clamp(0.0, 1.0));
|
|
std::thread::sleep(Duration::from_millis(step_ms));
|
|
}
|
|
});
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
fn approx(a: f32, b: f32, eps: f32) {
|
|
assert!((a - b).abs() < eps, "expected {b}, got {a}");
|
|
}
|
|
|
|
// ── provisional_loudness_gain_from_progress ───────────────────────────────
|
|
|
|
#[test]
|
|
fn provisional_returns_none_for_zero_total() {
|
|
assert!(provisional_loudness_gain_from_progress(100, 0, -14.0, -2.0).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn provisional_returns_none_for_zero_downloaded() {
|
|
assert!(provisional_loudness_gain_from_progress(0, 1000, -14.0, -2.0).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn provisional_clamps_start_db_into_range() {
|
|
// start_db_in is clamped to [-24, 0] then min(0). +5 dB is invalid → 0.
|
|
let g = provisional_loudness_gain_from_progress(1, 100, -14.0, 5.0).unwrap();
|
|
// At progress ≈ 0, gain ≈ start_db; clamp pushed start_db to 0.
|
|
// shaped(0.01) = 0.01.powf(0.75) ≈ 0.0316; gain ≈ 0 + (end_db - 0)*0.0316.
|
|
// end_db = (-14 + 6).clamp(-10, -3) = -8 → gain ≈ -0.253
|
|
approx(g, -0.253, 0.05);
|
|
}
|
|
|
|
#[test]
|
|
fn provisional_at_full_progress_reaches_end_db() {
|
|
// end_db = (target_lufs + 6).clamp(-10, -3).min(0)
|
|
// target_lufs = -14 → -8
|
|
let g = provisional_loudness_gain_from_progress(100, 100, -14.0, -2.0).unwrap();
|
|
approx(g, -8.0, 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn provisional_clamps_end_db_to_minus_three_floor() {
|
|
// target_lufs = 0 → end_db = (0 + 6).clamp(-10, -3) = -3
|
|
let g = provisional_loudness_gain_from_progress(100, 100, 0.0, 0.0).unwrap();
|
|
approx(g, -3.0, 0.001);
|
|
}
|
|
|
|
// ── content_type_to_hint ──────────────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn content_type_recognises_common_audio_mimes() {
|
|
assert_eq!(content_type_to_hint("audio/mpeg"), Some("mp3".into()));
|
|
assert_eq!(content_type_to_hint("audio/aac"), Some("aac".into()));
|
|
assert_eq!(content_type_to_hint("audio/aacp"), Some("aac".into()));
|
|
assert_eq!(content_type_to_hint("audio/ogg"), Some("ogg".into()));
|
|
assert_eq!(content_type_to_hint("audio/flac"), Some("flac".into()));
|
|
assert_eq!(content_type_to_hint("audio/wav"), Some("wav".into()));
|
|
assert_eq!(content_type_to_hint("audio/wave"), Some("wav".into()));
|
|
assert_eq!(content_type_to_hint("audio/opus"), Some("opus".into()));
|
|
assert_eq!(content_type_to_hint("audio/mp4"), Some("m4a".into()));
|
|
assert_eq!(content_type_to_hint("audio/x-m4a"), Some("m4a".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn content_type_is_case_insensitive() {
|
|
assert_eq!(content_type_to_hint("AUDIO/MPEG"), Some("mp3".into()));
|
|
assert_eq!(content_type_to_hint("Audio/FLAC"), Some("flac".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn content_type_returns_none_for_unknown() {
|
|
assert_eq!(content_type_to_hint("text/html"), None);
|
|
assert_eq!(content_type_to_hint("application/octet-stream"), None);
|
|
assert_eq!(content_type_to_hint(""), None);
|
|
}
|
|
|
|
// ── format_hint_from_content_disposition ──────────────────────────────────
|
|
|
|
#[test]
|
|
fn cd_extracts_extension_from_quoted_filename() {
|
|
assert_eq!(
|
|
format_hint_from_content_disposition("attachment; filename=\"track.flac\""),
|
|
Some("flac".into()),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn cd_extracts_extension_from_rfc5987_filename_star() {
|
|
assert_eq!(
|
|
format_hint_from_content_disposition("filename*=UTF-8''track.opus"),
|
|
Some("opus".into()),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn cd_returns_none_for_unknown_extension() {
|
|
assert_eq!(
|
|
format_hint_from_content_disposition("attachment; filename=\"track.xyz\""),
|
|
None,
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn cd_returns_none_when_filename_has_no_extension() {
|
|
assert_eq!(
|
|
format_hint_from_content_disposition("attachment; filename=\"trackname\""),
|
|
None,
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn cd_returns_none_when_no_filename_present() {
|
|
assert_eq!(format_hint_from_content_disposition("inline"), None);
|
|
}
|
|
|
|
// ── normalize_stream_suffix_for_hint ──────────────────────────────────────
|
|
|
|
#[test]
|
|
fn suffix_normalises_known_extensions_lowercase() {
|
|
assert_eq!(normalize_stream_suffix_for_hint(Some("MP3")), Some("mp3".into()));
|
|
assert_eq!(normalize_stream_suffix_for_hint(Some("Flac")), Some("flac".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn suffix_returns_none_for_empty_or_whitespace() {
|
|
assert_eq!(normalize_stream_suffix_for_hint(None), None);
|
|
assert_eq!(normalize_stream_suffix_for_hint(Some("")), None);
|
|
assert_eq!(normalize_stream_suffix_for_hint(Some(" ")), None);
|
|
}
|
|
|
|
#[test]
|
|
fn suffix_returns_none_for_unknown_extension() {
|
|
assert_eq!(normalize_stream_suffix_for_hint(Some("xyz")), None);
|
|
assert_eq!(normalize_stream_suffix_for_hint(Some("psy")), None);
|
|
}
|
|
|
|
// ── sniff_stream_format_extension ─────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn sniff_detects_flac_magic() {
|
|
assert_eq!(sniff_stream_format_extension(b"fLaC\x00\x00"), Some("flac".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn sniff_detects_ogg_magic() {
|
|
assert_eq!(sniff_stream_format_extension(b"OggS......"), Some("ogg".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn sniff_detects_riff_wave() {
|
|
let mut buf = b"RIFF".to_vec();
|
|
buf.extend_from_slice(&[0u8; 4]);
|
|
buf.extend_from_slice(b"WAVE");
|
|
assert_eq!(sniff_stream_format_extension(&buf), Some("wav".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn sniff_detects_mp4_ftyp_box() {
|
|
// 4 leading size bytes, then "ftyp" — common MP4 layout.
|
|
let mut buf = vec![0u8; 4];
|
|
buf.extend_from_slice(b"ftyp");
|
|
buf.extend_from_slice(b"M4A \x00\x00\x02\x00");
|
|
assert_eq!(sniff_stream_format_extension(&buf), Some("m4a".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn sniff_detects_ebml_matroska() {
|
|
assert_eq!(
|
|
sniff_stream_format_extension(&[0x1a, 0x45, 0xdf, 0xa3, 0x00]),
|
|
Some("mka".into()),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn sniff_detects_adts_aac_with_no_id3() {
|
|
assert_eq!(sniff_stream_format_extension(&[0xff, 0xf1, 0x00, 0x00]), Some("aac".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn sniff_detects_mp3_frame_sync_with_no_id3() {
|
|
assert_eq!(sniff_stream_format_extension(&[0xff, 0xfb, 0x00, 0x00]), Some("mp3".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn sniff_detects_mp3_after_id3v2_tag() {
|
|
// ID3v2 header (10 bytes): "ID3" + 2 version bytes + flags byte + 4 size bytes (synchsafe).
|
|
// Use size = 0 so the MP3 frame sync starts immediately at offset 10.
|
|
let mut buf = vec![b'I', b'D', b'3', 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00];
|
|
buf.extend_from_slice(&[0xff, 0xfb]);
|
|
assert_eq!(sniff_stream_format_extension(&buf), Some("mp3".into()));
|
|
}
|
|
|
|
#[test]
|
|
fn sniff_returns_none_for_empty_or_random_bytes() {
|
|
assert_eq!(sniff_stream_format_extension(&[]), None);
|
|
assert_eq!(sniff_stream_format_extension(&[0x00, 0x01, 0x02, 0x03]), None);
|
|
}
|
|
|
|
// ── playback_identity ─────────────────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn playback_identity_for_local_path() {
|
|
assert_eq!(
|
|
playback_identity("psysonic-local:///cache/track.flac"),
|
|
Some("local:/cache/track.flac".into()),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn playback_identity_for_subsonic_stream_url() {
|
|
assert_eq!(
|
|
playback_identity("https://server/rest/stream.view?u=user&t=abc&id=42"),
|
|
Some("stream:42".into()),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn playback_identity_returns_none_for_url_without_stream_view() {
|
|
assert!(playback_identity("https://server/something").is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn playback_identity_returns_none_when_no_id_param_present() {
|
|
assert!(
|
|
playback_identity("https://server/rest/stream.view?u=user&t=abc").is_none(),
|
|
"stream.view URL without an id= param has no stable identity"
|
|
);
|
|
}
|
|
|
|
// ── analysis_cache_track_id ───────────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn analysis_cache_id_prefers_logical_track_id() {
|
|
assert_eq!(
|
|
analysis_cache_track_id(Some("abc"), "https://server/rest/stream.view?id=42"),
|
|
Some("abc".into()),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn analysis_cache_id_falls_back_to_playback_identity() {
|
|
assert_eq!(
|
|
analysis_cache_track_id(None, "https://server/rest/stream.view?id=42"),
|
|
Some("stream:42".into()),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn analysis_cache_id_treats_whitespace_logical_id_as_missing() {
|
|
assert_eq!(
|
|
analysis_cache_track_id(Some(" "), "https://server/rest/stream.view?id=42"),
|
|
Some("stream:42".into()),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn analysis_cache_id_returns_none_when_neither_source_resolves() {
|
|
assert!(analysis_cache_track_id(None, "https://server/other").is_none());
|
|
}
|
|
|
|
// ── same_playback_target ──────────────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn same_target_treats_different_salts_as_same_track() {
|
|
let a = "https://server/rest/stream.view?id=42&u=user&t=AAA&s=salt1";
|
|
let b = "https://server/rest/stream.view?id=42&u=user&t=BBB&s=salt2";
|
|
assert!(same_playback_target(a, b));
|
|
}
|
|
|
|
#[test]
|
|
fn same_target_treats_different_ids_as_different_tracks() {
|
|
let a = "https://server/rest/stream.view?id=42&u=user&t=AAA";
|
|
let b = "https://server/rest/stream.view?id=99&u=user&t=AAA";
|
|
assert!(!same_playback_target(a, b));
|
|
}
|
|
|
|
#[test]
|
|
fn same_target_falls_back_to_string_compare_for_unknown_urls() {
|
|
assert!(same_playback_target("foo://x", "foo://x"));
|
|
assert!(!same_playback_target("foo://x", "foo://y"));
|
|
}
|
|
|
|
// ── loudness_gain_placeholder_until_cache ─────────────────────────────────
|
|
|
|
#[test]
|
|
fn placeholder_clamps_pre_analysis_into_negative_range() {
|
|
// Pre = +5 → clamped to 0; pivot is just recommended_gain_for_target value.
|
|
let g_pos = loudness_gain_placeholder_until_cache(-14.0, 5.0);
|
|
let g_zero = loudness_gain_placeholder_until_cache(-14.0, 0.0);
|
|
assert_eq!(g_pos, g_zero, "positive pre-analysis must be clamped to 0");
|
|
}
|
|
|
|
#[test]
|
|
fn placeholder_lifts_when_target_above_pivot() {
|
|
// Pivot integrated LUFS = -14. Higher target (e.g. -10) means more gain.
|
|
let lower = loudness_gain_placeholder_until_cache(-23.0, 0.0);
|
|
let higher = loudness_gain_placeholder_until_cache(-10.0, 0.0);
|
|
assert!(higher > lower, "higher target_lufs must yield higher gain");
|
|
}
|
|
|
|
#[test]
|
|
fn placeholder_clamps_result_into_plus_minus_24() {
|
|
let g = loudness_gain_placeholder_until_cache(-14.0, -50.0);
|
|
assert!((-24.0..=24.0).contains(&g));
|
|
}
|
|
|
|
// ── loudness_gain_db_after_resolve ────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn after_resolve_returns_cache_value_when_present() {
|
|
assert_eq!(
|
|
loudness_gain_db_after_resolve(Some(-3.5), -14.0, 0.0, true, Some(-9.9)),
|
|
Some(-3.5),
|
|
"cache hit must win over JS hint"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn after_resolve_uses_js_hint_when_uncached_and_allowed() {
|
|
assert_eq!(
|
|
loudness_gain_db_after_resolve(None, -14.0, 0.0, true, Some(-7.0)),
|
|
Some(-7.0),
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn after_resolve_ignores_non_finite_js_hint() {
|
|
let g = loudness_gain_db_after_resolve(None, -14.0, 0.0, true, Some(f32::INFINITY))
|
|
.expect("uncached fallback always returns Some");
|
|
// Falls through to placeholder; just verify it's a valid finite gain.
|
|
assert!(g.is_finite());
|
|
}
|
|
|
|
#[test]
|
|
fn after_resolve_uses_placeholder_when_js_disabled() {
|
|
let with_js = loudness_gain_db_after_resolve(None, -14.0, 0.0, true, Some(-2.0));
|
|
let without_js = loudness_gain_db_after_resolve(None, -14.0, 0.0, false, Some(-2.0));
|
|
assert_eq!(with_js, Some(-2.0));
|
|
assert_ne!(with_js, without_js, "allow_js_when_uncached=false ignores js hint");
|
|
}
|
|
|
|
// ── compute_gain ──────────────────────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn compute_gain_off_mode_returns_unity_linear() {
|
|
let (lin, eff) = compute_gain(0, Some(-3.0), Some(1.0), Some(-3.0), 0.0, 0.0, 1.0);
|
|
assert_eq!(lin, 1.0, "off mode ignores all gain inputs");
|
|
approx(eff, MASTER_HEADROOM, 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn compute_gain_clamps_volume_into_zero_one() {
|
|
let (_, eff_low) = compute_gain(0, None, None, None, 0.0, 0.0, -1.0);
|
|
let (_, eff_high) = compute_gain(0, None, None, None, 0.0, 0.0, 5.0);
|
|
assert_eq!(eff_low, 0.0, "negative volume clamps to 0");
|
|
approx(eff_high, MASTER_HEADROOM, 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn compute_gain_replaygain_mode_uses_replay_gain_db_with_pre_gain() {
|
|
// replay_gain_db = -6, pre_gain_db = +3 → effective dB = -3 → linear ≈ 0.7079
|
|
let (lin, _) = compute_gain(1, Some(-6.0), Some(1.0), None, 3.0, 0.0, 1.0);
|
|
approx(lin, 10f32.powf(-3.0 / 20.0), 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn compute_gain_replaygain_falls_back_when_replay_gain_db_missing() {
|
|
// No replay_gain_db → uses fallback_db (-6 → linear ≈ 0.5)
|
|
let (lin, _) = compute_gain(1, None, Some(1.0), None, 0.0, -6.0, 1.0);
|
|
approx(lin, 10f32.powf(-6.0 / 20.0), 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn compute_gain_replaygain_caps_by_inverse_peak() {
|
|
// replay_gain_db = +12 → linear ≈ 3.98, but peak = 2 caps it to 1/2 = 0.5.
|
|
let (lin, _) = compute_gain(1, Some(12.0), Some(2.0), None, 0.0, 0.0, 1.0);
|
|
approx(lin, 0.5, 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn compute_gain_loudness_mode_applies_attenuation_db() {
|
|
// loudness_gain_db = -6 → linear ≈ 0.501. Negative gain passes through
|
|
// the implicit unity cap.
|
|
let (lin, _) = compute_gain(2, None, None, Some(-6.0), 0.0, 0.0, 1.0);
|
|
approx(lin, 10f32.powf(-6.0 / 20.0), 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn compute_gain_loudness_mode_caps_positive_gain_at_unity() {
|
|
// Loudness normalisation must not boost above 0 dBFS — it would clip.
|
|
// The implementation forces peak = 1.0 in mode 2, so any positive gain
|
|
// is capped at unity by the `gain_linear.min(1.0 / peak)` step.
|
|
let (lin, _) = compute_gain(2, None, None, Some(6.0), 0.0, 0.0, 1.0);
|
|
assert_eq!(lin, 1.0, "+6 dB loudness gain must cap at unity");
|
|
}
|
|
|
|
#[test]
|
|
fn compute_gain_loudness_mode_ignores_replay_gain_peak() {
|
|
// The replay_gain_peak field is irrelevant in loudness mode — different
|
|
// peaks must yield identical gain_linear for the same loudness_gain_db.
|
|
let (lin_low_peak, _) = compute_gain(2, None, Some(0.5), Some(-6.0), 0.0, 0.0, 1.0);
|
|
let (lin_high_peak, _) = compute_gain(2, None, Some(2.0), Some(-6.0), 0.0, 0.0, 1.0);
|
|
assert_eq!(lin_low_peak, lin_high_peak);
|
|
}
|
|
|
|
#[test]
|
|
fn compute_gain_loudness_mode_returns_unity_when_no_db_supplied() {
|
|
let (lin, _) = compute_gain(2, None, None, None, 0.0, 0.0, 1.0);
|
|
assert_eq!(lin, 1.0);
|
|
}
|
|
|
|
// ── normalization_engine_name ─────────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn engine_name_maps_known_modes() {
|
|
assert_eq!(normalization_engine_name(0), "off");
|
|
assert_eq!(normalization_engine_name(1), "replaygain");
|
|
assert_eq!(normalization_engine_name(2), "loudness");
|
|
}
|
|
|
|
#[test]
|
|
fn engine_name_falls_back_to_off_for_unknown_modes() {
|
|
assert_eq!(normalization_engine_name(3), "off");
|
|
assert_eq!(normalization_engine_name(99), "off");
|
|
}
|
|
|
|
// ── gain_linear_to_db ─────────────────────────────────────────────────────
|
|
|
|
#[test]
|
|
fn linear_to_db_for_unity_is_zero() {
|
|
approx(gain_linear_to_db(1.0).unwrap(), 0.0, 0.001);
|
|
}
|
|
|
|
#[test]
|
|
fn linear_to_db_for_half_is_minus_six() {
|
|
approx(gain_linear_to_db(0.5).unwrap(), -6.020_6, 0.01);
|
|
}
|
|
|
|
#[test]
|
|
fn linear_to_db_rejects_zero_and_negative() {
|
|
assert!(gain_linear_to_db(0.0).is_none());
|
|
assert!(gain_linear_to_db(-1.0).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn linear_to_db_rejects_non_finite() {
|
|
assert!(gain_linear_to_db(f32::NAN).is_none());
|
|
assert!(gain_linear_to_db(f32::INFINITY).is_none());
|
|
}
|
|
|
|
// ── resolve_loudness_gain_with_cache (AppHandle-free) ────────────────────
|
|
|
|
use psysonic_analysis::analysis_cache::{AnalysisCache, LoudnessEntry, TrackKey};
|
|
|
|
fn upsert_loudness_row(cache: &AnalysisCache, track_id: &str, integrated: f64, target: f64) {
|
|
let k = TrackKey {
|
|
track_id: track_id.to_string(),
|
|
md5_16kb: "deadbeef".to_string(),
|
|
};
|
|
cache.touch_track_status(&k, "ready").unwrap();
|
|
cache
|
|
.upsert_loudness(
|
|
&k,
|
|
&LoudnessEntry {
|
|
integrated_lufs: integrated,
|
|
true_peak: 0.5,
|
|
recommended_gain_db: 0.0,
|
|
target_lufs: target,
|
|
updated_at: 1_700_000_000,
|
|
},
|
|
)
|
|
.unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn resolve_with_cache_returns_none_for_missing_loudness() {
|
|
let cache = AnalysisCache::open_in_memory();
|
|
let g = resolve_loudness_gain_with_cache(
|
|
&cache,
|
|
"no-such-track",
|
|
-14.0,
|
|
ResolveLoudnessCacheOpts::default(),
|
|
);
|
|
assert!(g.is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn resolve_with_cache_returns_recommended_gain_for_existing_row() {
|
|
let cache = AnalysisCache::open_in_memory();
|
|
// Track at -23 LUFS, target -14 → recommended gain capped by true-peak (0.5 ≈ -6 dB).
|
|
upsert_loudness_row(&cache, "abc", -23.0, -14.0);
|
|
let g = resolve_loudness_gain_with_cache(
|
|
&cache,
|
|
"abc",
|
|
-14.0,
|
|
ResolveLoudnessCacheOpts::default(),
|
|
)
|
|
.expect("loudness row → Some(gain_db)");
|
|
assert!(g.is_finite());
|
|
// Target - integrated = +9, but true-peak guard caps it: max = -1 - 20*log10(0.5) ≈ +5.
|
|
assert!((-1.0..=10.0).contains(&g), "gain_db = {g}");
|
|
}
|
|
|
|
// (NaN-roundtrip through SQLite is platform-dependent — rusqlite often
|
|
// serialises f64::NAN as NULL, which fails column-decode rather than
|
|
// round-tripping a non-finite value. The `.is_finite()` guard inside
|
|
// `resolve_loudness_gain_with_cache` is defensive code that protects
|
|
// against in-memory corruption; not directly testable via the cache API.)
|
|
|
|
#[test]
|
|
fn resolve_with_cache_finds_row_under_other_id_variant() {
|
|
let cache = AnalysisCache::open_in_memory();
|
|
// Insert under stream:abc, look up with bare abc — get_latest_*_for_track
|
|
// walks both id variants.
|
|
upsert_loudness_row(&cache, "stream:abc", -16.0, -14.0);
|
|
let g = resolve_loudness_gain_with_cache(
|
|
&cache,
|
|
"abc",
|
|
-14.0,
|
|
ResolveLoudnessCacheOpts::default(),
|
|
);
|
|
assert!(g.is_some(), "bare-id lookup must find stream-prefixed row");
|
|
}
|
|
|
|
#[test]
|
|
fn resolve_with_cache_respects_target_lufs_for_recommended_gain() {
|
|
let cache = AnalysisCache::open_in_memory();
|
|
upsert_loudness_row(&cache, "abc", -20.0, -14.0);
|
|
let g_quiet = resolve_loudness_gain_with_cache(
|
|
&cache,
|
|
"abc",
|
|
-20.0,
|
|
ResolveLoudnessCacheOpts::default(),
|
|
)
|
|
.unwrap();
|
|
let g_loud = resolve_loudness_gain_with_cache(
|
|
&cache,
|
|
"abc",
|
|
-10.0,
|
|
ResolveLoudnessCacheOpts::default(),
|
|
)
|
|
.unwrap();
|
|
assert!(
|
|
g_loud > g_quiet,
|
|
"higher target_lufs must yield higher recommended gain (quiet={g_quiet}, loud={g_loud})"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn resolve_with_cache_touch_waveform_false_does_not_panic() {
|
|
// Smoke: opts.touch_waveform=false must not cause an SQL error or panic.
|
|
let cache = AnalysisCache::open_in_memory();
|
|
upsert_loudness_row(&cache, "abc", -20.0, -14.0);
|
|
let opts = ResolveLoudnessCacheOpts {
|
|
touch_waveform: false,
|
|
log_soft_misses: false,
|
|
};
|
|
let g = resolve_loudness_gain_with_cache(&cache, "abc", -14.0, opts);
|
|
assert!(g.is_some());
|
|
}
|
|
}
|