Fix track counter

Author: dylanjeffers

packages/common/src/store/player/selectors.ts

@@ -18,6 +18,8 @@ export const getBuffering = (state: CommonState) => state.player.buffering
 export const getSeek = (state: CommonState) => state.player.seek
 export const getSeekCounter = (state: CommonState) => state.player.seekCounter
 export const getPlaybackRate = (state: CommonState) => state.player.playbackRate
+export const getPlayerBehavior = (state: CommonState) =>
+  state.player.playerBehavior
 
 export const getCurrentTrack = (state: CommonState) =>
   getTrack(state, { id: getTrackId(state) })

packages/common/src/store/player/slice.ts

@@ -36,6 +36,8 @@ export type PlayerState = {
 
   // Counter to track seek calls for times where we seek to the same position multiple times
   seekCounter: number
+
+  playerBehavior?: PlayerBehavior
 }
 
 export const initialState: PlayerState = {
@@ -121,7 +123,9 @@ const slice = createSlice({
   name: 'player',
   initialState,
   reducers: {
-    play: (_state, _action: PayloadAction<PlayPayload>) => {},
+    play: (state, action: PayloadAction<PlayPayload>) => {
+      state.playerBehavior = action.payload?.playerBehavior
+    },
     playSucceeded: (state, action: PayloadAction<PlaySucceededPayload>) => {
       const { uid, trackId } = action.payload
       state.playing = true

packages/web/src/common/store/queue/sagas.ts

@@ -38,7 +38,6 @@ import { getLocation } from 'store/routing/selectors'
 const {
   getCollectible,
   getId: getQueueTrackId,
-  getPlayerBehavior,
   getIndex,
   getLength,
   getOvershot,
@@ -50,7 +49,11 @@ const {
   getCurrentArtist
 } = queueSelectors
 
-const { getTrackId: getPlayerTrackId, getUid: getPlayerUid } = playerSelectors
+const {
+  getTrackId: getPlayerTrackId,
+  getUid: getPlayerUid,
+  getPlayerBehavior
+} = playerSelectors
 
 const { add, clear, next, pause, play, queueAutoplay, previous, remove } =
   queueActions
@@ -158,6 +161,7 @@ export function* watchPlay() {
     // Play a specific uid
     const playerUid = yield* select(getPlayerUid)
     const playerTrackId = yield* select(getPlayerTrackId)
+    const playerPlayerBehavior = yield* select(getPlayerBehavior)
 
     if (uid || trackId) {
       const playActionTrack = yield* select(
@@ -200,7 +204,15 @@ export function* watchPlay() {
       const trackIsDifferent = playerTrackId !== playActionTrack.track_id
       const trackIsSameButDifferentUid =
         playerTrackId === playActionTrack.track_id && uid !== playerUid
-      if (noTrackPlaying || trackIsDifferent || trackIsSameButDifferentUid) {
+      const trackIsSameButDifferentPlayerBehavior =
+        playerTrackId === playActionTrack.track_id &&
+        playerPlayerBehavior !== playerBehavior
+      if (
+        noTrackPlaying ||
+        trackIsDifferent ||
+        trackIsSameButDifferentUid ||
+        trackIsSameButDifferentPlayerBehavior
+      ) {
         yield* put(
           playerActions.play({
             uid,