Fix:Play button loading indicator when offline #990

advplyr · Dec 18, 2023 · ecf910d · ecf910d
1 parent 023c83e
commit ecf910d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/components/tables/playlist/ItemTableRow.vue b/components/tables/playlist/ItemTableRow.vue
@@ -126,6 +126,8 @@ export default {
     },
     playerIsStartingForThisMedia() {
       const mediaId = this.$store.state.playerStartingPlaybackMediaId
+      if (!mediaId) return false
+
       let thisMediaId = this.episodeId || this.libraryItem.id
       return mediaId === thisMediaId
     },

diff --git a/components/tables/podcast/EpisodeRow.vue b/components/tables/podcast/EpisodeRow.vue
@@ -127,6 +127,8 @@ export default {
     },
     playerIsStartingForThisMedia() {
       const mediaId = this.$store.state.playerStartingPlaybackMediaId
+      if (!mediaId) return false
+
       return mediaId === this.episode?.id
     },
     itemProgress() {

diff --git a/pages/item/_id/_episode/index.vue b/pages/item/_id/_episode/index.vue
@@ -215,9 +215,10 @@ export default {
       return this.$store.state.playerIsStartingPlayback
     },
     playerIsStartingForThisMedia() {
-      if (!this.serverEpisodeId) return false
       const mediaId = this.$store.state.playerStartingPlaybackMediaId
-      return mediaId === this.serverEpisodeId
+      if (!mediaId) return false
+
+      return mediaId === this.localEpisodeId || mediaId === this.serverEpisodeId
     },
     userItemProgress() {
       if (this.isLocal) return this.localItemProgress
@@ -347,7 +348,7 @@ export default {
       if (this.playerIsPlaying) {
         this.$eventBus.$emit('pause-item')
       } else {
-        this.$store.commit('setPlayerIsStartingPlayback', this.serverEpisodeId)
+        this.$store.commit('setPlayerIsStartingPlayback', this.episode.id)
 
         if (this.localEpisodeId && this.localLibraryItemId && !this.isLocal) {
           console.log('Play local episode', this.localEpisodeId, this.localLibraryItemId)

diff --git a/pages/item/_id/index.vue b/pages/item/_id/index.vue
@@ -400,11 +400,12 @@ export default {
     },
     playerIsStartingForThisMedia() {
       const mediaId = this.$store.state.playerStartingPlaybackMediaId
+      if (!mediaId) return false
+
       if (this.isPodcast) {
-        if (!this.episodeStartingPlayback) return false
         return mediaId === this.episodeStartingPlayback
       } else {
-        return mediaId === this.serverLibraryItemId
+        return mediaId === this.serverLibraryItemId || mediaId === this.localLibraryItemId
       }
     },
     tracks() {
@@ -561,7 +562,7 @@ export default {
           if (!value) return
         }
 
-        this.$store.commit('setPlayerIsStartingPlayback', this.serverLibraryItemId)
+        this.$store.commit('setPlayerIsStartingPlayback', libraryItemId)
         this.$eventBus.$emit('play-item', { libraryItemId, serverLibraryItemId: this.serverLibraryItemId, startTime })
       }
     },