(Multiple) Local Playlist (instead of saving video in one hidden list)

src/constants.js

@@ -44,7 +44,7 @@ const DBActions = {
 
   PLAYLISTS: {
     UPSERT_VIDEO: 'db-action-playlists-upsert-video-by-playlist-name',
-    UPSERT_VIDEO_IDS: 'db-action-playlists-upsert-video-ids-by-playlist-id',
+    UPSERT_VIDEOS: 'db-action-playlists-upsert-videos-by-playlist-name',
     DELETE_VIDEO_ID: 'db-action-playlists-delete-video-by-playlist-name',
     DELETE_VIDEO_IDS: 'db-action-playlists-delete-video-ids',
     DELETE_ALL_VIDEOS: 'db-action-playlists-delete-all-videos'

src/datastores/handlers/base.js

@@ -64,8 +64,8 @@ class History {
     return db.history.updateAsync({ videoId }, { $set: { watchProgress } }, { upsert: true })
   }
 
-  static updateLastViewedPlaylist(videoId, lastViewedPlaylistId) {
-    return db.history.updateAsync({ videoId }, { $set: { lastViewedPlaylistId } }, { upsert: true })
+  static updateLastViewedPlaylist(videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId) {
+    return db.history.updateAsync({ videoId }, { $set: { lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId } }, { upsert: true })
   }
 
   static delete(videoId) {
@@ -112,18 +112,22 @@ class Playlists {
     return db.playlists.findAsync({})
   }
 
-  static upsertVideoByPlaylistName(playlistName, videoData) {
+  static upsert(playlist) {
+    return db.playlists.updateAsync({ _id: playlist._id }, { $set: playlist }, { upsert: true })
+  }
+
+  static upsertVideoByPlaylistId(_id, videoData) {
     return db.playlists.updateAsync(
-      { playlistName },
+      { _id },
       { $push: { videos: videoData } },
       { upsert: true }
     )
   }
 
-  static upsertVideoIdsByPlaylistId(_id, videoIds) {
+  static upsertVideosByPlaylistId(_id, videos) {
     return db.playlists.updateAsync(
       { _id },
-      { $push: { videos: { $each: videoIds } } },
+      { $push: { videos: { $each: videos } } },
       { upsert: true }
     )
   }
@@ -132,25 +136,25 @@ class Playlists {
     return db.playlists.removeAsync({ _id, protected: { $ne: true } })
   }
 
-  static deleteVideoIdByPlaylistName(playlistName, videoId) {
+  static deleteVideoIdByPlaylistId(_id, playlistItemId) {
     return db.playlists.updateAsync(
-      { playlistName },
-      { $pull: { videos: { videoId } } },
+      { _id },
+      { $pull: { videos: { playlistItemId } } },
       { upsert: true }
     )
   }
 
-  static deleteVideoIdsByPlaylistName(playlistName, videoIds) {
+  static deleteVideoIdsByPlaylistId(_id, videoIds) {
     return db.playlists.updateAsync(
-      { playlistName },
+      { _id },
       { $pull: { videos: { $in: videoIds } } },
       { upsert: true }
     )
   }
 
-  static deleteAllVideosByPlaylistName(playlistName) {
+  static deleteAllVideosByPlaylistId(_id) {
     return db.playlists.updateAsync(
-      { playlistName },
+      { _id },
       { $set: { videos: [] } },
       { upsert: true }
     )
@@ -161,7 +165,7 @@ class Playlists {
   }
 
   static deleteAll() {
-    return db.playlists.removeAsync({ protected: { $ne: true } })
+    return db.playlists.removeAsync({}, { multi: true })
   }
 
   static persist() {
@@ -174,7 +178,7 @@ function compactAllDatastores() {
     Settings.persist(),
     History.persist(),
     Profiles.persist(),
-    Playlists.persist()
+    Playlists.persist(),
   ])
 }
 
@@ -184,7 +188,7 @@ const baseHandlers = {
   profiles: Profiles,
   playlists: Playlists,
 
-  compactAllDatastores
+  compactAllDatastores,
 }
 
 export default baseHandlers

src/datastores/handlers/electron.js

@@ -42,12 +42,12 @@ class History {
     )
   }
 
-  static updateLastViewedPlaylist(videoId, lastViewedPlaylistId) {
+  static updateLastViewedPlaylist(videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId) {
     return ipcRenderer.invoke(
       IpcChannels.DB_HISTORY,
       {
         action: DBActions.HISTORY.UPDATE_PLAYLIST,
-        data: { videoId, lastViewedPlaylistId }
+        data: { videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId }
       }
     )
   }
@@ -126,22 +126,29 @@ class Playlists {
     )
   }
 
-  static upsertVideoByPlaylistName(playlistName, videoData) {
+  static upsert(playlist) {
+    return ipcRenderer.invoke(
+      IpcChannels.DB_PLAYLISTS,
+      { action: DBActions.GENERAL.UPSERT, data: playlist }
+    )
+  }
+
+  static upsertVideoByPlaylistId(_id, videoData) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PLAYLISTS,
       {
         action: DBActions.PLAYLISTS.UPSERT_VIDEO,
-        data: { playlistName, videoData }
+        data: { _id, videoData }
       }
     )
   }
 
-  static upsertVideoIdsByPlaylistId(_id, videoIds) {
+  static upsertVideosByPlaylistId(_id, videos) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PLAYLISTS,
       {
-        action: DBActions.PLAYLISTS.UPSERT_VIDEO_IDS,
-        data: { _id, videoIds }
+        action: DBActions.PLAYLISTS.UPSERT_VIDEOS,
+        data: { _id, videos }
       }
     )
   }
@@ -153,32 +160,32 @@ class Playlists {
     )
   }
 
-  static deleteVideoIdByPlaylistName(playlistName, videoId) {
+  static deleteVideoIdByPlaylistId(_id, playlistItemId) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PLAYLISTS,
       {
         action: DBActions.PLAYLISTS.DELETE_VIDEO_ID,
-        data: { playlistName, videoId }
+        data: { _id, playlistItemId }
       }
     )
   }
 
-  static deleteVideoIdsByPlaylistName(playlistName, videoIds) {
+  static deleteVideoIdsByPlaylistId(_id, videoIds) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PLAYLISTS,
       {
         action: DBActions.PLAYLISTS.DELETE_VIDEO_IDS,
-        data: { playlistName, videoIds }
+        data: { _id, videoIds }
       }
     )
   }
 
-  static deleteAllVideosByPlaylistName(playlistName) {
+  static deleteAllVideosByPlaylistId(_id) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PLAYLISTS,
       {
         action: DBActions.PLAYLISTS.DELETE_ALL_VIDEOS,
-        data: playlistName
+        data: _id
       }
     )
   }

src/datastores/handlers/web.js

@@ -33,8 +33,8 @@ class History {
     return baseHandlers.history.updateWatchProgress(videoId, watchProgress)
   }
 
-  static updateLastViewedPlaylist(videoId, lastViewedPlaylistId) {
-    return baseHandlers.history.updateLastViewedPlaylist(videoId, lastViewedPlaylistId)
+  static updateLastViewedPlaylist(videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId) {
+    return baseHandlers.history.updateLastViewedPlaylist(videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId)
   }
 
   static delete(videoId) {
@@ -81,28 +81,32 @@ class Playlists {
     return baseHandlers.playlists.find()
   }
 
-  static upsertVideoByPlaylistName(playlistName, videoData) {
-    return baseHandlers.playlists.upsertVideoByPlaylistName(playlistName, videoData)
+  static upsert(playlist) {
+    return baseHandlers.playlists.upsert(playlist)
   }
 
-  static upsertVideoIdsByPlaylistId(_id, videoIds) {
-    return baseHandlers.playlists.upsertVideoIdsByPlaylistId(_id, videoIds)
+  static upsertVideoByPlaylistId(_id, videoData) {
+    return baseHandlers.playlists.upsertVideoByPlaylistId(_id, videoData)
+  }
+
+  static upsertVideosByPlaylistId(_id, videoData) {
+    return baseHandlers.playlists.upsertVideosByPlaylistId(_id, videoData)
   }
 
   static delete(_id) {
     return baseHandlers.playlists.delete(_id)
   }
 
-  static deleteVideoIdByPlaylistName(playlistName, videoId) {
-    return baseHandlers.playlists.deleteVideoIdByPlaylistName(playlistName, videoId)
+  static deleteVideoIdByPlaylistId(_id, playlistItemId) {
+    return baseHandlers.playlists.deleteVideoIdByPlaylistId(_id, playlistItemId)
   }
 
-  static deleteVideoIdsByPlaylistName(playlistName, videoIds) {
-    return baseHandlers.playlists.deleteVideoIdsByPlaylistName(playlistName, videoIds)
+  static deleteVideoIdsByPlaylistId(_id, videoIds) {
+    return baseHandlers.playlists.deleteVideoIdsByPlaylistId(_id, videoIds)
   }
 
-  static deleteAllVideosByPlaylistName(playlistName) {
-    return baseHandlers.playlists.deleteAllVideosByPlaylistName(playlistName)
+  static deleteAllVideosByPlaylistId(_id) {
+    return baseHandlers.playlists.deleteAllVideosByPlaylistId(_id)
   }
 
   static deleteMultiple(ids) {

src/main/index.js

@@ -847,7 +847,7 @@ function runApp() {
           return null
 
         case DBActions.HISTORY.UPDATE_PLAYLIST:
-          await baseHandlers.history.updateLastViewedPlaylist(data.videoId, data.lastViewedPlaylistId)
+          await baseHandlers.history.updateLastViewedPlaylist(data.videoId, data.lastViewedPlaylistId, data.lastViewedPlaylistType, data.lastViewedPlaylistItemId)
           syncOtherWindows(
             IpcChannels.SYNC_HISTORY,
             event,
@@ -948,36 +948,54 @@ function runApp() {
       switch (action) {
         case DBActions.GENERAL.CREATE:
           await baseHandlers.playlists.create(data)
-          // TODO: Syncing (implement only when it starts being used)
-          // syncOtherWindows(IpcChannels.SYNC_PLAYLISTS, event, { event: '_', data })
+          syncOtherWindows(
+            IpcChannels.SYNC_PLAYLISTS,
+            event,
+            { event: SyncEvents.GENERAL.CREATE, data }
+          )
           return null
 
         case DBActions.GENERAL.FIND:
           return await baseHandlers.playlists.find()
 
+        case DBActions.GENERAL.UPSERT:
+          await baseHandlers.playlists.upsert(data)
+          syncOtherWindows(
+            IpcChannels.SYNC_PLAYLISTS,
+            event,
+            { event: SyncEvents.GENERAL.UPSERT, data }
+          )
+          return null
+
         case DBActions.PLAYLISTS.UPSERT_VIDEO:
-          await baseHandlers.playlists.upsertVideoByPlaylistName(data.playlistName, data.videoData)
+          await baseHandlers.playlists.upsertVideoByPlaylistId(data._id, data.videoData)
           syncOtherWindows(
             IpcChannels.SYNC_PLAYLISTS,
             event,
             { event: SyncEvents.PLAYLISTS.UPSERT_VIDEO, data }
           )
           return null
 
-        case DBActions.PLAYLISTS.UPSERT_VIDEO_IDS:
-          await baseHandlers.playlists.upsertVideoIdsByPlaylistId(data._id, data.videoIds)
-          // TODO: Syncing (implement only when it starts being used)
-          // syncOtherWindows(IpcChannels.SYNC_PLAYLISTS, event, { event: '_', data })
+        case DBActions.PLAYLISTS.UPSERT_VIDEOS:
+          await baseHandlers.playlists.upsertVideosByPlaylistId(data._id, data.videos)
+          syncOtherWindows(
+            IpcChannels.SYNC_PLAYLISTS,
+            event,
+            { event: SyncEvents.PLAYLISTS.UPSERT_VIDEOS, data }
+          )
           return null
 
         case DBActions.GENERAL.DELETE:
           await baseHandlers.playlists.delete(data)
-          // TODO: Syncing (implement only when it starts being used)
-          // syncOtherWindows(IpcChannels.SYNC_PLAYLISTS, event, { event: '_', data })
+          syncOtherWindows(
+            IpcChannels.SYNC_PLAYLISTS,
+            event,
+            { event: SyncEvents.GENERAL.DELETE, data }
+          )
           return null
 
         case DBActions.PLAYLISTS.DELETE_VIDEO_ID:
-          await baseHandlers.playlists.deleteVideoIdByPlaylistName(data.playlistName, data.videoId)
+          await baseHandlers.playlists.deleteVideoIdByPlaylistId(data._id, data.playlistItemId)
           syncOtherWindows(
             IpcChannels.SYNC_PLAYLISTS,
             event,
@@ -986,13 +1004,13 @@ function runApp() {
           return null
 
         case DBActions.PLAYLISTS.DELETE_VIDEO_IDS:
-          await baseHandlers.playlists.deleteVideoIdsByPlaylistName(data.playlistName, data.videoIds)
+          await baseHandlers.playlists.deleteVideoIdsByPlaylistId(data._id, data.videoIds)
           // TODO: Syncing (implement only when it starts being used)
           // syncOtherWindows(IpcChannels.SYNC_PLAYLISTS, event, { event: '_', data })
           return null
 
         case DBActions.PLAYLISTS.DELETE_ALL_VIDEOS:
-          await baseHandlers.playlists.deleteAllVideosByPlaylistName(data)
+          await baseHandlers.playlists.deleteAllVideosByPlaylistId(data)
           // TODO: Syncing (implement only when it starts being used)
           // syncOtherWindows(IpcChannels.SYNC_PLAYLISTS, event, { event: '_', data })
           return null

src/renderer/App.js

@@ -9,6 +9,8 @@ import FtPrompt from './components/ft-prompt/ft-prompt.vue'
 import FtButton from './components/ft-button/ft-button.vue'
 import FtToast from './components/ft-toast/ft-toast.vue'
 import FtProgressBar from './components/ft-progress-bar/ft-progress-bar.vue'
+import FtPlaylistAddVideoPrompt from './components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.vue'
+import FtCreatePlaylistPrompt from './components/ft-create-playlist-prompt/ft-create-playlist-prompt.vue'
 import { marked } from 'marked'
 import { IpcChannels } from '../constants'
 import packageDetails from '../../package.json'
@@ -28,7 +30,9 @@ export default defineComponent({
     FtPrompt,
     FtButton,
     FtToast,
-    FtProgressBar
+    FtProgressBar,
+    FtPlaylistAddVideoPrompt,
+    FtCreatePlaylistPrompt,
   },
   data: function () {
     return {
@@ -66,6 +70,12 @@ export default defineComponent({
     checkForBlogPosts: function () {
       return this.$store.getters.getCheckForBlogPosts
     },
+    showAddToPlaylistPrompt: function () {
+      return this.$store.getters.getShowAddToPlaylistPrompt
+    },
+    showCreatePlaylistPrompt: function () {
+      return this.$store.getters.getShowCreatePlaylistPrompt
+    },
     windowTitle: function () {
       const routeTitle = this.$route.meta.title
       if (routeTitle !== 'Channel' && routeTitle !== 'Watch' && routeTitle !== 'Hashtag') {

src/renderer/App.vue

@@ -74,6 +74,12 @@
       :option-values="externalLinkOpeningPromptValues"
       @click="handleExternalLinkOpeningPromptAnswer"
     />
+    <ft-playlist-add-video-prompt
+      v-if="showAddToPlaylistPrompt"
+    />
+    <ft-create-playlist-prompt
+      v-if="showCreatePlaylistPrompt"
+    />
     <ft-toast />
     <ft-progress-bar
       v-if="showProgressBar"