Commit e40587e1 converted player.queue from a string to an object to
accommodate the new stop-after / remove-after keys. That broke five
call sites that read $t('player.queue') expecting the localized
"Queue" string (QueuePanel, ImmersiveHeader, ExpandedPlayer,
NowPlayingBar, immersive QueuePanel).
Restore player.queue to its original string form in all 5 locales,
and add a new top-level queue namespace for the four action keys
(stopAfterThis, cancelStopAfter, removeAllAfter, tracksRemoved).
This matches the plan's intended key paths: queue.stopAfterThis etc.
Refs #356.
cc
Per code review on commit ec6c99dd: the reset() function (called on
logout / user switch) was clearing all other queue state but missed
the new stopAfterTrackId writable, leaking marker state into a fresh
user session. Add the explicit clear.
Refs #356.
cc
Derived store stopAfterTrackId reads from queueState (single source
of truth). Actions: setStopAfter / clearStopAfter / toggleStopAfter
mutate via v2_queue_* commands. consumeStopAfterIf is for the
natural-end handler. removeAfter wraps v2_queue_remove_after and
returns count for toast display.
Refs #356.
cc
Per code review on commit 97b5bd79:
- consume_stop_after_if mutates inner state on match (clears the
marker), so use write().await for semantic consistency with the
other mutating commands. The inner Mutex made read() work today
but the intent is mutation.
- Demote the per-call log to debug — this fires on every natural
track-end and would spam info-level logs during normal listening.
Refs #356.
cc
v2_queue_set_stop_after / v2_queue_clear_stop_after / v2_queue_consume_stop_after_if
/ v2_queue_remove_after — thin wrappers over QueueManager via CoreBridge. The
consume command is what the frontend's natural-end handler calls before
advancing; manual skip paths do not call it.
Refs #356.
cc
The marker becomes part of the queue state snapshot the frontend
already consumes via syncQueueState(). Single source of truth — no
parallel event channel, no separate store on the frontend.
Refs #356.
cc
Removes all tracks at indices > pivot, preserving the pivot itself.
Returns the count removed. Updates shuffle_order and history to
drop dangling indices. Auto-invalidates the stop-after marker if it
referenced any removed track.
Refs #356.
cc
set_queue, set_queue_with_order, and clear unconditionally drop the
marker (queue replaced/emptied → marked track may not exist anymore).
remove_track and remove_upcoming_track conditionally clear the marker
when the removed track matches it. move_track and add_* are unchanged
— a moved track is still the same track ID, and adding doesn't touch
existing tracks.
Refs #356.
cc
Auto-advance drivers (frontend natural-end handlers) call this with
the just-finished track ID. If it matches the marker, returns true
and clears the marker; the caller pauses instead of advancing.
Otherwise returns false — caller proceeds with normal advance.
Manual skip paths must NOT call this method.
Refs #356.
cc
Add `stop_after_track_id: Option<u64>` to InternalState plus three
methods on QueueManager: `set_stop_after(id)`, `clear_stop_after()`,
`get_stop_after()`. Setting on an ID not present in the queue is a
silent no-op so the marker can never reference a phantom track.
Refs #356.
cc
The metadata fix from #360 wired formatTrackTitle() into the UI and
MPRIS so remix tracks display as "Title (Version)", but the Last.fm
and ListenBrainz scrobble paths in playbackService.ts were still
sending track.title raw. Result: a remix played in qbz scrobbled as
the original song to both services.
Apply formatTrackTitle() at the caller of updateLastfmNowPlaying,
updateListenBrainzNowPlaying, and showTrackNotification. Both the
immediate now_playing and the deferred scrobble (plus the offline
queue) capture the title from the same closure variable, so a single
change at the caller covers all paths going forward. Refs #360.
cc
The snapcraft.yaml `version:` field was bumped to 1.2.8 but
`source-tag:` under parts.qbz still pointed to v1.2.0. The Snap
Store build farm clones the repo and runs `git checkout v1.2.0`,
so every revision since 1.2.1 was published with metadata "1.2.X"
but a binary compiled from v1.2.0 source — silent regression
visible only when the user opens the app and sees the wrong
version reported.
Affects 8 releases (1.2.1 through 1.2.8). Fixes#361.
cc
Returning an empty `icon_name` in `tray_linux_ksni.rs` forces SNI
panels (e.g., KDE Plasma) to render the explicit `IconPixmap` data.
This prevents panels from incorrectly resolving the full-color app icon
from the system theme instead of the intended monochrome tray glyph.
Also updates `src-tauri/icons/icon-symbolic.svg` and regenerates
all `tray-dark-*.png` and `tray-light-*.png` assets.
Adds `static/logo.svg` as the main application logo.
The previous tray-light.png / tray-dark.png were 128x128 RGBA glyphs with a
black radial background. GNOME's StatusNotifierItem path expects monochrome
silhouettes around 22px base size and was rendering ours as the "three dots"
fallback.
Regenerate from icons/icon-symbolic.svg using Inkscape with a corrected
square viewBox (149 1 944 944, centred on the path bbox) and emit four
sizes per theme (22/32/44/64). decode_tray_icons() now returns Vec<Icon>
so ksni can offer the panel the best match for its bar height and HiDPI.
cc
Adds a separate "Resume playback position" toggle in Settings >
Playback. Default is OFF — opening qbz the next morning lands on a
clean 0:00 of the saved track, which is the common preference. Users
who do want bookmark-style resume turn the toggle on.
Independent of "Restore session on startup" in the UI (top-level
toggle, not a sub-setting). The seek only applies when both are on:
without persistSession there's no saved track to resume to, so the
flag is inert. Keeping the toggles separate matches the Settings UX
elsewhere and lets users flip persistence on without inheriting the
old #317 behavior we never had.
Backend
-------
- New `PlaybackPreferences::resume_playback_position: bool` (default
false). Migration adds the column to the existing
`playback_preferences.db` and the default row gets 0; existing
installs upgrade transparently.
- Setter `set_resume_playback_position(bool)` on both
`PlaybackPreferencesStore` and the wrapping `State`.
- Tauri command `v2_set_resume_playback_position` registered in
lib.rs invoke handler. Get-side already reads the new field via
the existing `v2_get_playback_preferences`.
Frontend
--------
- `playbackPreferencesStore.ts` — new field on the type and cache,
new `setResumePlaybackPosition()` exported.
- `SettingsView.svelte` — separate toggle row right below
"Restore session on startup" (matches the existing Settings rhythm).
- `playerStore.ts` — `pendingSessionRestore` extended with optional
`positionSecs`. When present, after the restored track loads, the
position is queued through the existing `pendingSeekPosition` /
`flushPendingSeek` path so the seek runs against an already-loaded
stream and respects the in-flight guard. Skip the queue when the
saved position is at or near 0 (the load already starts there).
- `routes/+page.svelte` — at session restore, reads
`getCachedPreferences().resume_playback_position` and forwards
`session.current_position_secs` only when the user opted in. The
field has been persisted in the schema since v1.2.5 — what changes
is whether we read it back.
i18n
----
- New keys in 5 locales: `settings.playback.resumePlaybackPosition` /
`…Desc`.
- `persistSessionDesc` updated everywhere — it used to claim the
feature restored playback position, which was always misleading
(the code restored the track but paused at 0:00). The text now
matches what the toggle does on its own: queue + view, paused at
0:00. Resume-to-position becomes the explicit ask of the new toggle.
Tests
-----
- Backend: 196 tests pass. Frontend: 0 TS errors.
cc
Eleven selectors had been left behind after various refactors when the
markup migrated to other classes. Vite-plugin-svelte logs them as
"Unused CSS selector" on every dev reload, drowning useful warnings
in noise.
Removed:
src/lib/components/Sidebar.svelte
.section-header-btn, .section-header-btn:hover,
.section-header-btn .section-header
src/lib/components/views/HomeView.svelte
.section, .section-header, .section-header h2,
.track-list, .track-list.compact,
.track-list.compact :global(.track-row.compact)
src/lib/components/views/ForYouTab.svelte
.track-list, .track-list.compact
Each removal was verified against the template — none of the removed
selectors had a corresponding `class="..."` reference in the file.
npm run check: 41 → 30 warnings (the remaining ones are unrelated:
line-clamp / app-region / ARIA hints).
cc
The previous two commits added the version field but several builder
helpers in routes/+page.svelte, miniplayer/+page.svelte, and view-
specific local Track interfaces still dropped it on the way to the
backend, so the on-screen rendering went back to the bare title for
queues built from anywhere except album/playlist detail.
Builders updated to pass version
--------------------------------
~50 inline `title: trk.title` / `title: track.title` assignments where
the destination is a BackendQueueTrack (sent to v2_replace_queue,
v2_add_to_queue_*, mixtape enqueue paths, infinite-radio start, etc.)
across:
- src/routes/+page.svelte (album play, mixtape, search-result play,
favorites/playlist play, history mapping, queue-from-session
restore, infinite-radio resolution, dynamic suggest, etc.)
- src/routes/miniplayer/+page.svelte (queue snapshot)
- AlbumDetailView, ArtistDetailView, FavoritesView, FavQView,
TopQView, LabelView, PurchasesView, PurchaseAlbumDetailView,
SearchView, DynamicSuggestView, WeeklySuggestView
- playbackService.ts (cast metadata, MPRIS metadata - via
formatTrackTitle so MPRIS shows the full title with edition)
- lyricsStore.ts (track context for lyrics queries)
- immersive/panels/CoverflowPanel.svelte (rendered title in
coverflow card uses formatTrackTitle directly)
Local Track interfaces extended with `version?: string | null`
--------------------------------------------------------------
- ArtistDetailView: Track and DisplayTrack interfaces
- LabelView: Track interface
- SearchView: Track interface
- FavoritesView: FavoriteTrack interface
- FavQView: FavTrack interface
- DynamicSuggestTrack (in src/lib/types/dynamicSuggest.ts)
- PurchasedTrack (in src/lib/types/purchases.ts)
Reverted (the auto-insert script touched these but the destination
type is not a track):
- AddToMixtapeItem: it's a wrapper for both album and track ops; the
underlying track keeps version through other paths
- v2_set_media_metadata invoke and v2_cache_track_for_offline invoke:
the backend command shapes don't have a version arg; can be added
later if MPRIS/cache need to surface it independently
- Album-level constructions in some search paths: those build an
Album (no edition concept at album-level for the search row)
Frontend npm run check: 0 errors. Backend cargo test: 196 passed.
cc
Second batch of formatTrackTitle adoption — covers all the components
that were rendering bare {track.title} after the core renderers in the
previous commit:
Modals
- TrackInfoModal: heading
- TrackReplacementModal: track-title row
- AlbumCreditsModal: track-title cell
Views
- HomeView, ForYouTab: TrackRow title prop + version propagation in
toDisplayTrack()/buildContinueQueueTracks()
- ArtistDetailView, LabelView, PurchasesView, PurchaseAlbumDetailView:
track-title row in their list renderings
- WeeklySuggestView, DynamicSuggestView, FavQView, TopQView,
LocalLibraryView: TrackRow title prop
- FavoritesView: getFavoriteTrackTitle accessor passed to
VirtualizedTrackList
Immersive
- immersive/panels/QueuePanel: now-playing + upcoming track titles
- immersive/panels/TrackInfoPanel: heading
Search
- PlaylistSuggestions: track-title row
Each file gains an `import { formatTrackTitle } from '$lib/utils/trackTitle'`
and the renderer that used to emit {track.title} now calls
{formatTrackTitle(track)} so remix/reissue editions show their subtitle
parenthesized, matching the mobile app.
Frontend npm run check: 0 errors. Backend cargo test: 196 passed.
The remaining `title: track.title,` assignments in builder helpers
(routes/+page.svelte, miniplayer/+page.svelte, favorites builders,
etc.) where version is not yet appended will be cleaned up separately;
they construct BackendQueueTrack from sources that may or may not
carry version, and adding the field requires per-call inspection of
the source type. The on-screen rendering bug from #360 is fixed for
all the views and modals listed above.
cc
Qobuz returns a separate `version` field for tracks belonging to remix
albums, reissues, and deluxe editions (e.g. "Player's Ball Mix",
"Nine Inch Noize Version", "Remastered 2024"). The mobile app shows it
parenthesized after the title so remix albums are distinguishable from
originals; qbz only showed the bare title, making remix albums
impossible to navigate (issue #360).
Backend
-------
- Add `version: Option<String>` to qbz_models::Track (the V2 model
consumed by qbz-qobuz/qbz-library) and to api::models::Track (the
legacy struct still used by some V2 command paths).
- Add `version: Option<String>` to qbz_models::QueueTrack so the field
travels through the local queue, persistence, QConnect remote queue,
and frontend snapshots without being lost in conversion.
- Propagate `version` in every Track→QueueTrack converter:
qconnect::model_track_to_core_queue_track,
link_resolver::track_to_queue_track_from_api,
mixtape::enqueue::track_to_queue_track_from_api and the inline
builders. Plex/local builders set version=None (no edition concept
outside Qobuz).
- V2QueueTrack (the wire shape exposed to the frontend) gains the
field with serde default so older clients keep deserializing.
Frontend
--------
- New `formatTrackTitle(track)` helper in src/lib/utils/trackTitle.ts:
returns `title` when version is empty, else `title (version)`.
- Add `version?: string | null` to QobuzTrack, Track (UI), PlaylistTrack,
DisplayTrack, BackendQueueTrack, QueueTrack (UI), and PlayingTrack
so the field flows from the wire to the renderer.
- Propagate `version` through the four buildQueueTrackFrom* builders
in trackActions.ts and through the QobuzAlbum→AlbumDetail adapter.
- Use formatTrackTitle in the high-traffic renderers:
- NowPlayingBar (currentTrack derived in routes/+page.svelte)
- QueuePanel: now-playing label, upcoming-track rows, history rows
- VirtualizedTrackList: default getTrackTitle accessor
- AlbumDetailView: TrackRow title binding
- PlaylistDetailView: TrackRow title binding
- SearchView: popular-track card label and the two track-list
rows (Tracks tab + cross-search "All" view)
Tests
-----
- 196 lib tests pass (no behavior change for the no-version path).
- npm run check: 0 errors.
Follow-up: more views still pass `{track.title}` directly (HomeView,
ArtistDetailView, FavoritesView, ForYouTab, MixtapeCollectionDetailView,
LocalLibraryView, the various Suggest/Top/Label views, the immersive
panels, the miniplayer surface, and the Track*Modal stack). They all
render UI Track-shaped objects that now carry version, so each is a
mechanical "import formatTrackTitle + replace {track.title} with
{formatTrackTitle(track)}". Doing them in a follow-up commit to keep
this one reviewable.
cc
The final extraction of Alcance A. Move the public service facade
(QconnectServiceState struct + impl + Default impl, plus the spawned
event-loop task, the renderer/queue snapshot queries, the controller-
handoff helpers, send_command/send_renderer_report, the deferred
renderer-join plumbing, and the bootstrap_remote_presence pending-
action machinery) from mod.rs into a dedicated service submodule.
Items moved:
- struct QconnectRuntime, QconnectServiceInner
- pub struct QconnectServiceState (re-exported via `pub use`)
- impl QconnectServiceState (~50 methods) and impl Default
- bootstrap_remote_presence, deferred_renderer_join,
clear_pending_if_matches
- queue_payload_track_preview, update_lifecycle_state_if_running,
emit_qconnect_diagnostic (private helpers used only by the service)
- Constants: JOIN_SESSION_REASON_CONTROLLER_REQUEST,
QCONNECT_PLAY_TRACK_HANDOFF_WAIT_MS,
QCONNECT_PLAY_TRACK_HANDOFF_POLL_MS
All methods on QconnectServiceState are pub(super) so the commands
submodule (which was already extracted) can dispatch through them.
The Default impl uses plain `fn default()` (visibility qualifiers are
not permitted in trait impls).
mod.rs now contains only the cross-submodule glue (~140 lines):
shared constants (PLAYING_STATE_*, AUDIO_QUALITY_*, BUFFER_STATE_OK,
DEFAULT_QCONNECT_CHANNEL_COUNT, QCONNECT_REMOTE_QUEUE_SOURCE), the
QconnectRemoteSyncState accumulator, qconnect_now_ms,
qconnect_repeat_mode_from_loop_mode, normalize_volume_to_fraction,
model_track_to_core_queue_track, and the module declarations.
session.rs and commands.rs imports re-pathed to point at submodules
directly (super::transport::*, super::queue_resolution::*,
super::session::*, super::service::*) instead of going through
re-exports in mod.rs.
mod.rs: 1820 → 142 lines (-92%). service.rs: 1689 lines.
Final layout:
src-tauri/src/qconnect/
├── mod.rs ( 142) module glue
├── types.rs ( 273) wire types, payloads
├── session.rs ( 374) topology, renderer snapshots
├── queue_resolution.rs ( 481) cursors, shuffle order
├── corebridge.rs ( 566) apply_renderer_command, materialize
├── track_loading.rs ( 337) streaming, FLAC probe, dedup
├── event_sink.rs ( 461) QconnectEventSink + dispatch
├── transport.rs ( 386) credentials, device identity
├── service.rs (1689) QconnectServiceState facade
├── commands.rs ( 849) Tauri invoke handlers
└── tests.rs (1044) 37 unit tests
From 6371 lines in 1 monolith → 6602 lines across 11 focused files,
each with a single clear responsibility. mod.rs went 6371 → 142 lines
(-98%). All 37 tests pass. Alcance A complete; the codebase is ready
for unified-binary Phase 0 to resume.
cc
Move the 37 unit tests (1044 lines, all #[cfg(test)] inside the old
mod tests {} block in mod.rs) into a dedicated tests.rs submodule.
mod.rs keeps only the declaration `#[cfg(test)] mod tests;`.
Test imports are unchanged — they still use `super::*` paths into the
focused submodules established in steps 2-9, which is exactly the
intended layout.
This concludes Alcance A of the qconnect refactor. Full layout:
src-tauri/src/qconnect/
├── mod.rs (1820 lines) — QconnectServiceState impl,
│ glue, internal structs
├── types.rs ( 273 lines) — wire types, request payloads
├── session.rs ( 374 lines) — topology, renderer snapshots
├── queue_resolution.rs ( 481 lines) — cursors, indices, shuffle order
├── corebridge.rs ( 566 lines) — apply_renderer_command,
│ materialize, projection
├── track_loading.rs ( 337 lines) — streaming, FLAC probe, dedup
├── event_sink.rs ( 461 lines) — QconnectEventSink + dispatch
├── transport.rs ( 386 lines) — credentials, device identity
├── commands.rs ( 849 lines) — Tauri invoke handlers + report
│ helpers
└── tests.rs (1044 lines) — 37 unit tests
From 6371 lines in 1 monolith → 7591 lines across 10 focused files
with clear responsibility boundaries. mod.rs went 6371 → 1820 (-71%).
Each submodule is independently navigable; visibility is constrained
via pub(super) so re-exports stay intentional. All 37 tests pass.
cc
Move all 30 #[tauri::command] handlers (registered in lib.rs's
invoke_handler!) plus the renderer-report helpers they own into a
dedicated commands submodule:
Tauri commands (re-exported via `pub use commands::*` so lib.rs and
external callers keep their import paths unchanged):
- v2_qconnect_connect, _disconnect, _status, _send_command
- v2_qconnect_evaluate_queue_admission,
_send_command_with_admission, _join_session, _set_player_state
- v2_qconnect_toggle_play_if_remote, _play_track_if_remote,
_skip_next_if_remote, _skip_previous_if_remote,
_set_volume_if_remote, _mute_if_remote, _stop_if_remote,
_toggle_shuffle_if_remote, _cycle_repeat_if_remote,
_set_autoplay_mode_if_remote, _autoplay_load_tracks_if_remote
- v2_qconnect_set_active_renderer, _set_volume, _set_loop_mode,
_mute_volume, _set_max_audio_quality, _ask_for_renderer_state
- v2_qconnect_queue_snapshot, _renderer_snapshot, _session_snapshot
- v2_qconnect_report_playback_state, _report_volume
- v2_qconnect_get_device_name, _set_device_name
- v2_get_hostname
Renderer-report helpers moved alongside the report command:
- classify_qconnect_audio_quality,
build_qconnect_file_audio_quality_snapshot,
resolve_active_playback_audio_quality
- should_skip_renderer_report_due_to_stale_snapshot,
determine_queue_lookup_report_strategy,
should_report_queue_item_ids_for_renderer_state
mod.rs deps that commands.rs reaches via super:: are now pub(super):
- BUFFER_STATE_OK, DEFAULT_QCONNECT_CHANNEL_COUNT
- AUDIO_QUALITY_UNKNOWN/CD/HIRES_LEVEL1/LEVEL3 (the rest were
already pub(super))
- QconnectServiceState.custom_device_name field
Test imports re-pathed to super::commands::* for the helpers that
moved with the report command.
Pure relocation. mod.rs: 3673 → 2865 lines. commands.rs: 847 lines.
All 37 qconnect tests pass.
cc
Steps 4-8 moved items into focused submodules but only verified `cargo
check` (lib only) — tests under #[cfg(test)] in mod.rs continued
referring to items via plain `super::FunctionName`, which only resolved
when the items were still in mod.rs.
This commit re-paths the test imports to point at their actual
submodules:
- decode_hex_channel, parse_subscribe_channels, default_qconnect_device_info
→ super::transport::*
- find_unique_renderer_id, refresh_local_renderer_id,
QconnectFileAudioQualitySnapshot → super::session::*
- resolve_controller_queue_item_from_snapshots,
resolve_queue_item_ids_from_queue_state, QconnectRemoteSkipDirection,
resolve_core_shuffle_order, QconnectControllerQueueItemResolution
→ super::queue_resolution::*
- build_session_renderer_snapshot → super::session::*
- should_reload_remote_track → super::track_loading::*
- queue_state_needs_materialization → super::corebridge::*
Promoted decode_hex_channel and parse_subscribe_channels to pub(super)
in transport.rs, and should_reload_remote_track to pub(super) in
track_loading.rs so the tests can reach them across the submodule
boundary.
All 37 qconnect tests pass.
cc
Move the Tauri-side event sink (struct TauriQconnectEventSink + the
QconnectEventSink trait impl + the apply_session_management_event
dispatcher) into a dedicated event_sink submodule.
This is the seam between the qconnect-app crate's event stream and
qbz's local state — every WS-driven event (renderer updated, queue
updated, command applied, session-management messages) flows through
on_event. Splitting it out makes the dispatch graph navigable
without scrolling through 4000+ unrelated lines.
apply_session_management_event handles 9 message types:
SESSION_STATE, ADD_RENDERER, UPDATE_RENDERER, REMOVE_RENDERER,
ACTIVE_RENDERER_CHANGED, RENDERER_STATE_UPDATED, VOLUME_CHANGED,
VOLUME_MUTED, MAX_AUDIO_QUALITY_CHANGED, LOOP_MODE_SET — plus three
post-dispatch hooks (apply_remote_loop_mode_to_corebridge,
sync_local_playback_for_renderer_ownership, sync_active_renderer_
projection).
mod.rs:
- TauriQconnectEventSink moved to event_sink module
- qconnect_now_ms marked pub(super) for cross-module access
- async_trait, qconnect_app::{QconnectAppEvent, QconnectEventSink}
imports removed (now confined to event_sink.rs)
- The session/queue_resolution imports trimmed to only what mod.rs
itself still references
Pure relocation. mod.rs: 4460 → 4022 lines. event_sink.rs: 425 lines.
Total qconnect/ submodules now: 7 (types, session, queue_resolution,
corebridge, track_loading, event_sink, plus the residual mod.rs).
cc
Move 6 functions that bridge cloud-emitted QConnect events to the
local CoreBridge audio engine into a dedicated corebridge submodule:
- queue_state_needs_materialization (dedup comparator)
- apply_remote_loop_mode_to_corebridge
- apply_renderer_command_to_corebridge (SetState/SetVolume/MuteVolume/
SetLoopMode/SetActive handler — ~180 lines, the busiest function)
- sync_corebridge_remote_shuffle_projection (shuffle projection with
identity-shuffle deferral; remains private to corebridge)
- materialize_remote_queue_to_corebridge (queue replication, ~210 lines)
- align_corebridge_queue_cursor
mod.rs deps that corebridge.rs reaches via super:: are now pub(super):
- PLAYING_STATE_PLAYING/PAUSED/STOPPED/UNKNOWN constants
- normalize_volume_to_fraction, qconnect_repeat_mode_from_loop_mode,
model_track_to_core_queue_track
- ensure_remote_track_loaded (still in mod.rs, will move to
track_loading.rs in a follow-up step)
corebridge.rs imports queue_resolution::* directly for the cursor and
order helpers, and session::is_peer_renderer_active for the echo-reset
gate.
Pure relocation. mod.rs: 5304 → 4777 lines. corebridge.rs: 565 lines.
cc
Move 22 public types (QconnectConnectOptions, QconnectLifecycleState,
QconnectConnectionStatus, QconnectVisibleQueueProjection, the 20-variant
QconnectOutboundCommandType + 5 request payload structs, the 4 admission/
handoff types, the 8 device/session/queue payloads) into a dedicated
types.rs submodule. mod.rs re-exports via `pub use types::*` so external
callers (lib.rs invoke handlers, commands_v2/queue.rs) keep their import
paths.
Pure data and enum-mapping impls only. Two helper methods on
QconnectOutboundCommandType (to_queue_command_type,
requires_remote_queue_admission) become pub(super) since they are only
used from within the qconnect module tree.
mod.rs: 6371 → 6109 lines. types.rs: 273 lines.
cc
Pure rename to enable subsequent splits into focused submodules. No
behavior change: 34 invoke handler refs in lib.rs and 2 use statements
in commands_v2/queue.rs updated from qconnect_service:: to qconnect::.
Foundation for the qconnect_service.rs → qconnect/ module split: the
file is 6371 lines and mixes 12 distinct responsibilities (types,
session topology, event sink, queue resolution, corebridge bridging,
track loading, transport, Tauri commands, etc). Splitting into focused
submodules makes the area navigable for both authors and reviewers,
enables independent reasoning per concern, and creates a clean target
for the eventual qbz-qconnect-proto crate extraction.
cc
Bundle of related fixes addressing QConnect echo handling and shuffle
authority. All four converge on the same architectural principle:
qbz must not invent state when the cloud is the source of truth.
1. Remove should_force_remote_track_restart and its echo-driven reload
The function fired whenever the cloud echoed SetState with
target_position_ms=0 for the same track currently playing. The cloud
re-emits this routinely on secondary field changes (next_track
corrections, queue_item_id refresh) — every echo triggered a
load_remote_track_into_player that interrupted in-progress audio.
Track-change cases continue to load via align_corebridge_queue_cursor
plus ensure_remote_track_loaded.
2. Reject echo seeks in apply_renderer_command_to_corebridge
Authoritative seek-to-zero is only honored when the command targets
a different track, or when local position is already near zero. If
command.current_track matches playback_state.track_id and target<=1s
while local_pos>2s, the seek is treated as echo and skipped. The
prior 2s threshold was insufficient to absorb cloud round-trip during
queue changes.
3. Drop has_loaded_audio gate from should_reload_remote_track
playback_state.track_id is updated by the audio thread only after
engine.append(source) succeeds. During the 1-3s buffer/decode window
of an initial load, has_loaded_audio is false even though loading is
in flight — the prior gate caused ensure_remote_track_loaded to
redundantly re-trigger load on every echo SetState arriving in that
window. This was the residual first-track hiccup.
4. Add load-attempt dedup across V2 play and ensure_remote_track_loaded
New sync_state.last_load_attempt: Option<(track_id, Instant)> with a
5s window. Two write sites:
- play_remote_renderer_track_if_active when active_renderer_is_local
(V2 frontend just dispatched a local play)
- ensure_remote_track_loaded when it triggers its own load
Read site: ensure_remote_track_loaded skips if last attempt for the
same track was within the window. Eliminates redundant loads when an
echo SetState arrives while a local play is still buffering.
5. Defer engine shuffle activation until cloud sends a valid order
The cloud broadcasts shuffle toggles in two stages: first a
QueueUpdated with shuffle_mode=true and shuffle_order=null, then
~400ms later a QueueUpdated with the computed shuffle_order. The
prior code applied set_queue_with_order with shuffle_enabled=true on
the first event, falling through to set_identity_shuffle_order_internal
— qbz inventing a sequence (0,1,2,...) that diverges from the order
the cloud is about to authorize. If the second event was delayed,
dropped, or raced against the first, qbz drifted from peer clients
(the long-standing "doble shuffle" symptom).
Now: effective_shuffle_enabled = shuffle_mode && core_shuffle_order.
is_some(). When the order is absent, the engine stays unshuffled and
waits for the second QueueUpdated. sync_corebridge_remote_shuffle_
projection short-circuits identically. Updated diagnostic log
surfaces remote_shuffle_mode, shuffle_order_present, and engine_
shuffle_enabled separately for future triage.
Tests: removed should_force_remote_track_restart test, simplified
should_reload_remote_track test to reflect the track-id-only contract.
cc
The isGaplessTransition predicate fired on every external track change
(QConnect renderer command, MPRIS, etc.) when qbz was the local
renderer, mis-classifying remote-driven track changes as gapless
transitions. The handler then ran onGaplessTransition every backend
tick (~1Hz) without updating currentTrack, leaving the UI stale and
spamming v2_next_track.
Added gaplessAttemptedForCurrent gate captured before the existing
null-out: only treat the event as a gapless transition when
gaplessAttemptTrackId matches the track currentTrack actually believes
is playing. External track changes fall through to the
"track changed externally" block which updates currentTrack properly.
cc
The inner `pub mod commands` block in network/mod.rs hosted three
unregistered Tauri commands (get_network_mounts_cmd,
check_mount_accessible, check_network_paths_batch) and was uncalled.
The non-command helpers in the parent module (get_network_mounts,
check_mount_accessibility, find_mount_for_path, parse_mount_info)
are also no longer referenced now that the commands are gone, but
they remain pub for potential future use without warnings.
- Remove the inner `pub mod commands { ... }` block.
- Drop the now-unused std::collections::HashMap import.
cc
src-tauri/src/commands/user_session.rs hosted three unregistered
#[tauri::command] entries (activate_user_session, deactivate_user_session,
get_last_user_id) plus two non-command helpers (init_type_alias_state,
teardown_type_alias_state) consumed only by session_lifecycle.rs.
- Move init_type_alias_state and teardown_type_alias_state into
session_lifecycle.rs (their only caller) as plain pub helpers.
- Delete src-tauri/src/commands/user_session.rs and
src-tauri/src/commands/mod.rs.
- Remove pub mod commands; from lib.rs — the legacy commands
namespace is now empty.
- Refresh the activate_session doc comment to match the new layout.
cc
The 1,375-line library/commands.rs hosted only unregistered Tauri
commands (54 of them) plus a path-compat pub use of state types.
Every #[tauri::command] in the file is V2-replaced and uncalled.
The state-types pub use was the only external surface and is
already exported canonically from library/mod.rs.
- Delete src-tauri/src/library/commands.rs entirely
- Drop pub mod commands; from library/mod.rs
- Update session_lifecycle.rs to use crate::library::LibraryState
(the canonical path) instead of crate::library::commands::LibraryState
- Refresh the doc comment in library/state.rs to reflect the
post-cleanup layout
cc
All 17 #[tauri::command] entries in offline_cache/commands.rs are
unregistered (V2 owns the live cache commands) and uncalled. The only
surviving consumer was session_lifecycle.rs reaching for
purge_all_cached_files (a non-command helper).
- Move purge_all_cached_files to a new offline_cache/purge.rs module
(drops the LibraryState path through library::commands; uses the
canonical crate::library::LibraryState directly)
- Delete offline_cache/commands.rs along with its dead siblings:
cache_track_for_offline + post_process_cached_track,
is_track_cached, get_cached_track_path, get_cached_track,
get_cached_tracks, get_offline_cache_stats, remove_cached_track,
clear_offline_cache + cleanup_empty_folder, set_offline_cache_limit
+ evict_if_needed, open_offline_cache_folder, open_album_folder,
open_track_folder, check_offline_root_mounted, validate_offline_path,
move_offline_cache_to_path, detect_legacy_cached_files (the command
shim — the helper of the same name lives in migration.rs and is
still consumed by V2), start_legacy_migration,
sync_offline_cache_to_library + SyncResult.
- Update session_lifecycle.rs to import from offline_cache::purge.
cc
The reco_store/commands.rs module no longer hosts any registered Tauri
commands. Its surviving content is purely helper logic consumed by V2
home recommendations in commands_v2/library.rs.
- Rename reco_store/commands.rs -> reco_store/helpers.rs
- Drop the unregistered/uncalled #[tauri::command] entries
(reco_log_event, reco_train_scores, get_playlist_suggestions,
reco_backfill_genres, reco_needs_genre_backfill) and their dead
scoring helpers (build_scores, build_track_entries, decay_factor,
current_timestamp, etc.) along with RecoTrainStats / RecoScoreCounts
/ BackfillStats structs that only those commands referenced.
- Update commands_v2/library.rs to import from
crate::reco_store::helpers::* (still uses get_home_seeds_internal,
resolve_albums, resolve_tracks, resolve_artists, album_to_card_meta).
cc
The Tauri commands in cast/commands.rs and cast/dlna/commands.rs are
unregistered (handler list is V2-only) and uncalled. The CastState /
DlnaState path-compat re-exports are also unused (canonical paths are
crate::cast::CastState and crate::cast::dlna::DlnaState). Remove the
files entirely and drop pub mod declarations.
cc
The last consumer (api_server REST handlers) was migrated to
commands_v2::v2_play_track / v2_seek / v2_set_volume in the previous
commit, so the file's three remaining #[tauri::command] functions
(play_track, seek, set_volume) plus the unregistered prefetch_track,
get_playback_state, and all helper symbols (parse_quality,
limit_quality_for_device, PlayTrackResult, StreamInfo, download_audio,
get_stream_info, extract_audio_format_from_header, download_and_stream,
spawn_prefetch, prefetch constants, PREFETCH_SEMAPHORE) had zero
remaining callers.
Drops the `pub mod playback;` and `pub use playback::*;` lines from
commands/mod.rs. Only user_session.rs remains in the legacy commands
module.
cc
Switches the REST endpoints serving the PWA remote control from the
legacy commands::playback::* helpers to their V2 equivalents:
- play_queue_track / play_queue_index / play_album:
commands::playback::play_track -> commands_v2::v2_play_track
- seek: commands::playback::seek -> commands_v2::v2_seek
- set_volume: commands::playback::set_volume -> commands_v2::v2_set_volume
The HTTP contract (paths, methods, payload shapes, response codes,
emit_playback_update side-effects) is unchanged. Behaviour gains the
V2 features that legacy lacked (CMAF cache hits, ALSA hardware
sample-rate guard, manual-offline-mode awareness) because the PWA
remote now flows through the same playback path as the desktop UI.
Drops the `commands` import from this module (now only `commands_v2`
is used) and adds the State acquisitions needed by v2_play_track:
CoreBridgeState, OfflineState, RuntimeManagerState.
cc
The function had zero callers across src/. Today's H2 audio rewiring
work updated the invoke names inside cmdUpdateAudioSettings but the
function itself was already unreachable. Remove it.
The remaining commandRouter exports (cmdGetAudioSettings,
cmdGetAvailableBackends, cmdGetDevicesForBackend,
cmdGetHardwareAudioStatus, plus all Playback/Queue helpers) still
have callers, so the file stays.
cc
SettingsView read qbz-fetch-artist-images with === 'true' (OFF when key
absent or unrecognised) while LocalLibraryView read with !== 'false'
(ON when key absent or unrecognised). The two files disagreed on
first-run behaviour and on any stored value other than 'true'/'false'.
Switch SettingsView to the !== 'false' convention so the toggle UI
matches what the consumer actually does at fetch time.
cc
The Show-Partial-Playlists toggle was intentionally hidden in commit
2579c1990 ("Remove offline playlist integration") because offline
playlists are not yet functional. The handler and its
setShowPartialPlaylists store import were left behind as dead code.
The store function and OfflineSettings.showPartialPlaylists field
remain because Sidebar.svelte and PlaylistManagerView.svelte still
read the setting (defaulting to true).
When offline playlist integration ships, the toggle and handler can
be re-added.
cc
Toggling Manual Token Mode only updated local $state, so on every
remount of the Settings view the toggle reverted to OFF and hid the
manual-token field. Hydrate from getUserItem and persist via
setUserItem on change, matching the pattern used by plexEnabled,
plexUiCollapsed, and plexMetadataWriteEnabled.
Storage key: qbz-plex-poc-manual-token-mode (string 'true'/'false').
cc
The RemoteControlSetupGuide modal was rendered but unreachable: nothing
ever set showRemoteControlGuide to true. Add a Setup-Guide button next
to the existing Regenerate / QR controls in the Remote Control developer
subsection so the onboarding wizard can actually be opened.
The button intentionally is not gated by remoteControlEnabled because
the guide is intended for users who have not yet enabled remote control.
Reuses the pre-existing settings.integrations.remoteControlSetupGuide
i18n key (already present in en/es/de/fr/pt).
cc
vicrodh