! Fix navigation in user playlist between entries of same video

PikachuEXE · Sep 12, 2023 · 6e7a627 · 6e7a627
1 parent 2462099
commit 6e7a627
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 3 deletions.
diff --git a/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js
@@ -35,6 +35,10 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
+    uniqueId: {
+      type: String,
+      default: null,
+    },
     forceListType: {
       type: String,
       default: null

diff --git a/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.vue b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.vue
@@ -14,6 +14,7 @@
       :playlist-reverse="playlistReverse"
       :playlist-shuffle="playlistShuffle"
       :playlist-loop="playlistLoop"
+      :unique-id="uniqueId"
       :force-list-type="forceListType"
       :appearance="appearance"
       :always-show-add-to-playlist-button="alwaysShowAddToPlaylistButton"

diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -30,6 +30,10 @@ export default defineComponent({
       type: String,
       default: null
     },
+    uniqueId: {
+      type: String,
+      default: null
+    },
     playlistIndex: {
       type: Number,
       default: null
@@ -348,6 +352,7 @@ export default defineComponent({
         return {
           playlistId: this.playlistId,
           playlistType: null,
+          uniqueId: this.uniqueId,
         }
       }
 
@@ -368,15 +373,18 @@ export default defineComponent({
     playlistIdFinal: function () {
       return this.playlistIdTypePairFinal?.playlistId
     },
-
     playlistTypeFinal: function () {
       return this.playlistIdTypePairFinal?.playlistType
     },
+    uniqueIdFinal: function () {
+      return this.playlistIdTypePairFinal?.uniqueId
+    },
 
     watchPageLinkQuery() {
       const query = {}
       if (this.playlistIdFinal) { query.playlistId = this.playlistIdFinal }
       if (this.playlistTypeFinal) { query.playlistType = this.playlistTypeFinal }
+      if (this.uniqueIdFinal) { query.uniqueId = this.uniqueIdFinal }
       return query
     },
 

diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
@@ -27,6 +27,10 @@ export default defineComponent({
       type: String,
       required: true,
     },
+    firstVideoUniqueId: {
+      type: String,
+      required: true,
+    },
     playlistThumbnail: {
       type: String,
       required: true,

diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue
@@ -6,7 +6,10 @@
       <router-link
         :to="{
           path: `/watch/${firstVideoId}`,
-          query: { playlistId: id }
+          query: {
+            playlistId: id,
+            uniqueId: firstVideoUniqueId,
+          },
         }"
         tabindex="-1"
       >

diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
@@ -139,6 +139,7 @@
             :playlist-reverse="reversePlaylist"
             :playlist-shuffle="shuffleEnabled"
             :playlist-loop="loopEnabled"
+            :unique-id="item.uniqueId"
             appearance="watchPlaylistItem"
             force-list-type="list"
             :initial-visible-state="index < ((currentVideoIndex - 1) + 4) && index > ((currentVideoIndex - 1) - 4)"

diff --git a/src/renderer/store/modules/playlists.js b/src/renderer/store/modules/playlists.js
@@ -379,7 +379,7 @@ const mutations = {
   removeVideo(state, payload) {
     const playlist = state.playlists.find(playlist => playlist._id === payload._id)
     if (playlist) {
-      playlist.videos = playlist.videos.filter(video => video.videoId !== payload.videoId || video.uniqueId !== payload.uniqueId)
+      playlist.videos = playlist.videos.filter(video => video.uniqueId !== payload.uniqueId)
     }
   },
 

diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
@@ -40,6 +40,7 @@ export default defineComponent({
       playlistTitle: '',
       playlistDescription: '',
       firstVideoId: '',
+      firstVideoUniqueId: '',
       playlistThumbnail: '',
       viewCount: 0,
       videoCount: 0,
@@ -268,8 +269,10 @@ export default defineComponent({
 
       if (playlist.videos.length > 0) {
         this.firstVideoId = playlist.videos[0].videoId
+        this.firstVideoUniqueId = playlist.videos[0].uniqueId
       } else {
         this.firstVideoId = ''
+        this.firstVideoUniqueId = ''
       }
       this.viewCount = 0
       this.videoCount = playlist.videos.length

diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue
@@ -9,6 +9,7 @@
       v-if="!isLoading"
       :id="playlistId"
       :first-video-id="firstVideoId"
+      :first-video-unique-id="firstVideoUniqueId"
       :playlist-thumbnail="playlistThumbnail"
       :title="playlistTitle"
       :channel-name="channelName"
@@ -52,6 +53,7 @@
               :playlist-id="playlistId"
               :playlist-type="infoSource"
               :playlist-index="index"
+              :unique-id="item.uniqueId"
               appearance="result"
               force-list-type="list"
               :always-show-add-to-playlist-button="true"

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
@@ -116,6 +116,7 @@ export default defineComponent({
       watchingPlaylist: false,
       playlistId: '',
       playlistType: '',
+      uniqueId: null,
       timestamp: null,
       playNextTimeout: null,
       playNextCountDownIntervalId: null,
@@ -1098,6 +1099,7 @@ export default defineComponent({
       }
 
       this.playlistId = this.$route.query.playlistId
+      this.uniqueId = this.$route.query.uniqueId
 
       if (this.playlistId == null || this.playlistId.length === 0) {
         this.playlistType = ''

diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
@@ -173,6 +173,7 @@
         :watch-view-loading="isLoading"
         :playlist-id="playlistId"
         :video-id="videoId"
+        :unique-id="uniqueId"
         class="watchVideoSideBar watchVideoPlaylist"
         :class="{ theatrePlaylist: useTheatreMode }"
         @pause-player="pausePlayer"