mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-21 22:15:40 +00:00
cucadmuh
5e977cfd49
* fix(player-stats): exclude paused time from listened duration While paused, the Rust engine stops feeding active progress ticks to the listen session, so the tick baseline (`lastTickMs`) stayed frozen at the pause point. The first progress tick after resume then computed its wall-clock delta against that stale timestamp and billed the entire paused span as listened time, inflating Player stats. Settle the partial segment played up to the pause and mark the session paused; the first resumed progress tick rebaselines instead of counting the gap. Wire the freeze into the single `pause()` transport action. * docs(changelog): note paused-time player-stats fix (#942)
90 lines
3.0 KiB
TypeScript
90 lines
3.0 KiB
TypeScript
import { invoke } from '@tauri-apps/api/core';
|
|
import { setIsAudioPaused } from './engineState';
|
|
import type { PlayerState } from './playerStoreTypes';
|
|
import { flushQueueSyncToServer } from './queueSync';
|
|
import { playListenSessionFinalize, playListenSessionOnPause } from './playListenSession';
|
|
import { pauseRadio, stopRadio } from './radioPlayer';
|
|
import { clearAllPlaybackScheduleTimers } from './scheduleTimers';
|
|
import { clearSeekDebounce } from './seekDebounce';
|
|
import { clearSeekFallbackRetry } from './seekFallbackState';
|
|
import { clearSeekTarget } from './seekTargetState';
|
|
import { tryAcquireTogglePlayLock } from './togglePlayLock';
|
|
|
|
type SetState = (
|
|
partial: Partial<PlayerState> | ((state: PlayerState) => Partial<PlayerState>),
|
|
) => void;
|
|
type GetState = () => PlayerState;
|
|
|
|
/**
|
|
* Light transport actions — everything except `resume` (own module,
|
|
* see `resumeAction.ts`) and scheduled timers (`scheduleActions.ts`).
|
|
* `togglePlay` is guarded so a double media-key tap can't race
|
|
* pause + resume into a stuck state. `resetAudioPause` flips the
|
|
* engine-paused flag without touching the UI `isPlaying`, used by
|
|
* `audio:ended` paths.
|
|
*/
|
|
export function createTransportLightActions(set: SetState, get: GetState): Pick<
|
|
PlayerState,
|
|
'stop' | 'pause' | 'resetAudioPause' | 'togglePlay'
|
|
> {
|
|
return {
|
|
stop: () => {
|
|
void playListenSessionFinalize('stop');
|
|
clearAllPlaybackScheduleTimers();
|
|
if (get().currentRadio) {
|
|
stopRadio();
|
|
} else {
|
|
invoke('audio_stop').catch(console.error);
|
|
}
|
|
setIsAudioPaused(false);
|
|
clearSeekFallbackRetry();
|
|
clearSeekDebounce(); clearSeekTarget();
|
|
set({
|
|
isPlaying: false,
|
|
progress: 0,
|
|
buffered: 0,
|
|
currentTime: 0,
|
|
currentRadio: null,
|
|
waveformBins: null,
|
|
normalizationNowDb: null,
|
|
normalizationTargetLufs: null,
|
|
normalizationEngineLive: 'off',
|
|
currentPlaybackSource: null,
|
|
enginePreloadedTrackId: null,
|
|
scheduledPauseAtMs: null,
|
|
scheduledPauseStartMs: null,
|
|
scheduledResumeAtMs: null,
|
|
scheduledResumeStartMs: null,
|
|
});
|
|
},
|
|
|
|
pause: () => {
|
|
clearAllPlaybackScheduleTimers();
|
|
playListenSessionOnPause();
|
|
if (get().currentRadio) {
|
|
pauseRadio();
|
|
} else {
|
|
invoke('audio_pause').catch(console.error);
|
|
setIsAudioPaused(true);
|
|
// Flush position so a quick close after pause still leaves the
|
|
// server with the right resume point for other devices.
|
|
const s = get();
|
|
if (s.currentTrack) {
|
|
void flushQueueSyncToServer(s.queueItems, s.currentTrack, s.currentTime);
|
|
}
|
|
}
|
|
set({ isPlaying: false, scheduledPauseAtMs: null, scheduledPauseStartMs: null, scheduledResumeAtMs: null, scheduledResumeStartMs: null });
|
|
},
|
|
|
|
resetAudioPause: () => {
|
|
setIsAudioPaused(false);
|
|
},
|
|
|
|
togglePlay: () => {
|
|
if (!tryAcquireTogglePlayLock()) return;
|
|
const { isPlaying } = get();
|
|
isPlaying ? get().pause() : get().resume();
|
|
},
|
|
};
|
|
}
|