@@ -18,11 +18,17 @@
{{ episode.subtitle }}
-
+
+
+
+
+
@@ -63,9 +69,6 @@ export default {
}
},
computed: {
- streamLibraryItem() {
- return this.$store.state.streamLibraryItem
- },
bookCoverAspectRatio() {
return this.$store.getters['libraries/getBookCoverAspectRatio']
},
@@ -78,6 +81,9 @@ export default {
streamIsPlaying() {
return this.$store.state.streamIsPlaying
},
+ isStreamingFromDifferentLibrary() {
+ return this.$store.getters['getIsStreamingFromDifferentLibrary']
+ },
episodesMapped() {
return this.recentEpisodes.map((ep) => {
return {
@@ -85,6 +91,16 @@ export default {
progress: this.$store.getters['user/getUserMediaProgress'](ep.libraryItemId, ep.id)
}
})
+ },
+ playerQueueItems() {
+ return this.$store.state.playerQueueItems || []
+ },
+ playerQueueEpisodeIdMap() {
+ const episodeIds = {}
+ this.playerQueueItems.forEach((i) => {
+ if (i.episodeId) episodeIds[i.episodeId] = true
+ })
+ return episodeIds
}
},
methods: {
@@ -124,6 +140,7 @@ export default {
if (!episode.progress || !episode.isFinished) {
queueItems.push({
libraryItemId: episode.libraryItemId,
+ libraryId: episode.libraryId,
episodeId: episode.id,
title: episode.title,
subtitle: episode.podcast.metadata.title,
@@ -152,6 +169,25 @@ export default {
this.recentEpisodes = episodePayload.episodes || []
this.totalEpisodes = episodePayload.total
this.currentPage = page
+ },
+ queueBtnClick(episode) {
+ if (this.playerQueueEpisodeIdMap[episode.id]) {
+ // Remove from queue
+ this.$store.commit('removeItemFromQueue', { libraryItemId: episode.libraryItemId, episodeId: episode.id })
+ } else {
+ // Add to queue
+ const queueItem = {
+ libraryItemId: episode.libraryItemId,
+ libraryId: episode.libraryId,
+ episodeId: episode.id,
+ title: episode.title,
+ subtitle: episode.podcast.metadata.title,
+ caption: episode.publishedAt ? `Published ${this.$formatDate(episode.publishedAt, 'MMM do, yyyy')}` : 'Unknown publish date',
+ duration: episode.duration || null,
+ coverPath: episode.podcast.coverPath || null
+ }
+ this.$store.commit('addItemToQueue', queueItem)
+ }
}
},
mounted() {
diff --git a/client/store/index.js b/client/store/index.js
index 1feb094d..4ddb5a3c 100644
--- a/client/store/index.js
+++ b/client/store/index.js
@@ -41,11 +41,21 @@ export const getters = {
getLibraryItemIdStreaming: state => {
return state.streamLibraryItem ? state.streamLibraryItem.id : null
},
+ getIsStreamingFromDifferentLibrary: (state, getters, rootState) => {
+ if (!state.streamLibraryItem) return false
+ return state.streamLibraryItem.libraryId !== rootState.libraries.currentLibraryId
+ },
getIsMediaStreaming: state => (libraryItemId, episodeId) => {
if (!state.streamLibraryItem) return null
if (!episodeId) return state.streamLibraryItem.id == libraryItemId
return state.streamLibraryItem.id == libraryItemId && state.streamEpisodeId == episodeId
},
+ getIsMediaQueued: state => (libraryItemId, episodeId) => {
+ return state.playerQueueItems.some(i => {
+ if (!episodeId) return i.libraryItemId === libraryItemId
+ return i.libraryItemId === libraryItemId && i.episodeId === episodeId
+ })
+ },
getBookshelfView: state => {
if (!state.serverSettings || isNaN(state.serverSettings.bookshelfView)) return Constants.BookshelfView.STANDARD
return state.serverSettings.bookshelfView
@@ -159,6 +169,21 @@ export const mutations = {
setPlayerQueueItems(state, items) {
state.playerQueueItems = items || []
},
+ removeItemFromQueue(state, item) {
+ state.playerQueueItems = state.playerQueueItems.filter((i) => {
+ if (!i.episodeId) return i.libraryItemId !== item.libraryItemId
+ return i.libraryItemId !== item.libraryItemId || i.episodeId !== item.episodeId
+ })
+ },
+ addItemToQueue(state, item) {
+ const exists = state.playerQueueItems.some(i => {
+ if (!i.episodeId) return i.libraryItemId === item.libraryItemId
+ return i.libraryItemId === item.libraryItemId && i.episodeId === item.episodeId
+ })
+ if (!exists) {
+ state.playerQueueItems.push(item)
+ }
+ },
setPlayerQueueAutoPlay(state, autoPlay) {
state.playerQueueAutoPlay = !!autoPlay
localStorage.setItem('playerQueueAutoPlay', !!autoPlay ? '1' : '0')
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 5c4083d7..9753c340 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -42,6 +42,8 @@
"ButtonPurgeAllCache": "Purge All Cache",
"ButtonPurgeItemsCache": "Purge Items Cache",
"ButtonPurgeMediaProgress": "Purge Media Progress",
+ "ButtonQueueAddItem": "Add to queue",
+ "ButtonQueueRemoveItem": "Remove from queue",
"ButtonQuickMatch": "Quick Match",
"ButtonRead": "Read",
"ButtonRemove": "Remove",
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index 3feac044..dd818db5 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -602,6 +602,7 @@ class LibraryController {
const ep = _ep.toJSONExpanded()
ep.podcast = libraryItem.media.toJSONMinified()
ep.libraryItemId = libraryItem.id
+ ep.libraryId = libraryItem.libraryId
return ep
})
allUnfinishedEpisodes.push(...unfinishedEpisodes)