Mirrors/audiobookshelf
Mirrors/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-04-02 01:16:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

New data model update MeController user progress routes

Browse Source
This commit is contained in:
advplyr 2022-03-17 13:33:22 -05:00
parent c4eeb1cfb7
commit 1cf9e85272
13 changed files with 234 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/components/app/Appbar.vue
View File

@ -47,8 +47,8 @@
<div v-show="numLibraryItemsSelected" class="absolute top-0 left-0 w-full h-full px-4 bg-primary flex items-center"> <div v-show="numLibraryItemsSelected" class="absolute top-0 left-0 w-full h-full px-4 bg-primary flex items-center">
<h1 class="text-2xl px-4">{{ numLibraryItemsSelected }} Selected</h1> <h1 class="text-2xl px-4">{{ numLibraryItemsSelected }} Selected</h1>
<div class="flex-grow" /> <div class="flex-grow" />
<ui-tooltip :text="`Mark as ${selectedIsRead ? 'Not Read' : 'Read'}`" direction="bottom"> <ui-tooltip :text="`Mark as ${selectedIsFinished ? 'Not Finished' : 'Finished'}`" direction="bottom">
<ui-read-icon-btn :disabled="processingBatch" :is-read="selectedIsRead" @click="toggleBatchRead" class="mx-1.5" /> <ui-read-icon-btn :disabled="processingBatch" :is-read="selectedIsFinished" @click="toggleBatchRead" class="mx-1.5" />
</ui-tooltip> </ui-tooltip>
<ui-tooltip v-if="userCanUpdate" text="Add to Collection" direction="bottom"> <ui-tooltip v-if="userCanUpdate" text="Add to Collection" direction="bottom">
<ui-icon-btn :disabled="processingBatch" icon="collections_bookmark" @click="batchAddToCollectionClick" class="mx-1.5" /> <ui-icon-btn :disabled="processingBatch" icon="collections_bookmark" @click="batchAddToCollectionClick" class="mx-1.5" />
@ -100,8 +100,8 @@ export default {
selectedLibraryItems() { selectedLibraryItems() {
return this.$store.state.selectedLibraryItems return this.$store.state.selectedLibraryItems
}, },
userAudiobooks() { userItemProgress() {
return this.$store.state.user.user.audiobooks || {} return this.$store.state.user.user.libraryItemProgress || []
}, },
userCanUpdate() { userCanUpdate() {
return this.$store.getters['user/getUserCanUpdate'] return this.$store.getters['user/getUserCanUpdate']
@ -112,11 +112,11 @@ export default {
userCanUpload() { userCanUpload() {
return this.$store.getters['user/getUserCanUpload'] return this.$store.getters['user/getUserCanUpload']
}, },
selectedIsRead() { selectedIsFinished() {
// Find an audiobook that is not read, if none then all audiobooks read // Find an item that is not finished, if none then all items finished
return !this.selectedLibraryItems.find((li) => { return !this.selectedLibraryItems.find((libraryItemId) => {
var userAb = this.userAudiobooks[li] var itemProgress = this.userItemProgress.find((lip) => lip.id === libraryItemId)
return !userAb || !userAb.isRead return !itemProgress || !itemProgress.isFinished
}) })
}, },
processingBatch() { processingBatch() {
@ -153,15 +153,15 @@ export default {
}, },
toggleBatchRead() { toggleBatchRead() {
this.$store.commit('setProcessingBatch', true) this.$store.commit('setProcessingBatch', true)
var newIsRead = !this.selectedIsRead var newIsFinished = !this.selectedIsFinished
var updateProgressPayloads = this.selectedLibraryItems.map((lid) => { var updateProgressPayloads = this.selectedLibraryItems.map((lid) => {
return { return {
audiobookId: lid, id: lid,
isRead: newIsRead isFinished: newIsFinished
} }
}) })
this.$axios this.$axios
.patch(`/api/me/audiobook/batch/update`, updateProgressPayloads) .patch(`/api/me/progress/batch/update`, updateProgressPayloads)
.then(() => { .then(() => {
this.$toast.success('Batch update success!') this.$toast.success('Batch update success!')
this.$store.commit('setProcessingBatch', false) this.$store.commit('setProcessingBatch', false)

17
client/components/app/BookListRow.vue
View File

@ -150,23 +150,6 @@ export default {
downloadClick() { downloadClick() {
this.$store.commit('showEditModalOnTab', { libraryItem: this.book, tab: 'download' }) this.$store.commit('showEditModalOnTab', { libraryItem: this.book, tab: 'download' })
}, },
toggleRead() {
var updatePayload = {
isRead: !this.userIsRead
}
this.isProcessingReadUpdate = true
this.$axios
.$patch(`/api/me/audiobook/${this.libraryItemId}`, updatePayload)
.then(() => {
this.isProcessingReadUpdate = false
this.$toast.success(`"${this.title}" Marked as ${updatePayload.isRead ? 'Read' : 'Not Read'}`)
})
.catch((error) => {
console.error('Failed', error)
this.isProcessingReadUpdate = false
this.$toast.error(`Failed to mark as ${updatePayload.isRead ? 'Read' : 'Not Read'}`)
})
},
startStream() { startStream() {
this.$eventBus.$emit('play-item', this.book.id) this.$eventBus.$emit('play-item', this.book.id)
}, },

13
client/components/cards/LazyBookCard.vue
View File

@ -301,8 +301,8 @@ export default {
moreMenuItems() { moreMenuItems() {
var items = [ var items = [
{ {
func: 'toggleRead', func: 'toggleFinished',
text: `Mark as ${this.itemIsFinished ? 'Not Read' : 'Read'}` text: `Mark as ${this.itemIsFinished ? 'Not Finished' : 'Finished'}`
}, },
{ {
func: 'openCollections', func: 'openCollections',
@ -398,8 +398,7 @@ export default {
editClick() { editClick() {
this.$emit('edit', this.audiobook) this.$emit('edit', this.audiobook)
}, },
toggleRead() { toggleFinished() {
// More menu func
var updatePayload = { var updatePayload = {
isFinished: !this.itemIsFinished isFinished: !this.itemIsFinished
} }
@ -407,15 +406,15 @@ export default {
var toast = this.$toast || this.$nuxt.$toast var toast = this.$toast || this.$nuxt.$toast
var axios = this.$axios || this.$nuxt.$axios var axios = this.$axios || this.$nuxt.$axios
axios axios
.$patch(`/api/me/audiobook/${this.libraryItemId}`, updatePayload) .$patch(`/api/me/progress/${this.libraryItemId}`, updatePayload)
.then(() => { .then(() => {
this.isProcessingReadUpdate = false this.isProcessingReadUpdate = false
toast.success(`"${this.title}" Marked as ${updatePayload.isFinished ? 'Read' : 'Not Read'}`) toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`)
}) })
.catch((error) => { .catch((error) => {
console.error('Failed', error) console.error('Failed', error)
this.isProcessingReadUpdate = false this.isProcessingReadUpdate = false
toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Read' : 'Not Read'}`) toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`)
}) })
}, },
itemScanComplete(result) { itemScanComplete(result) {

31
client/components/tables/collection/BookTableRow.vue
View File

@ -35,8 +35,8 @@
</div> --> </div> -->
<div class="w-40 absolute top-0 -right-24 h-full transform transition-transform" :class="!isHovering ? 'translate-x-0' : '-translate-x-24'"> <div class="w-40 absolute top-0 -right-24 h-full transform transition-transform" :class="!isHovering ? 'translate-x-0' : '-translate-x-24'">
<div class="flex h-full items-center"> <div class="flex h-full items-center">
<ui-tooltip :text="isRead ? 'Mark as Not Read' : 'Mark as Read'" direction="top"> <ui-tooltip :text="userIsFinished ? 'Mark as Not Finished' : 'Mark as Finished'" direction="top">
<ui-read-icon-btn :disabled="isProcessingReadUpdate" :is-read="isRead" borderless class="mx-1 mt-0.5" @click="toggleRead" /> <ui-read-icon-btn :disabled="isProcessingReadUpdate" :is-read="userIsFinished" borderless class="mx-1 mt-0.5" @click="toggleFinished" />
</ui-tooltip> </ui-tooltip>
<div class="mx-1" :class="isHovering ? '' : 'ml-6'"> <div class="mx-1" :class="isHovering ? '' : 'ml-6'">
<ui-icon-btn icon="edit" borderless @click="clickEdit" /> <ui-icon-btn icon="edit" borderless @click="clickEdit" />
@ -68,12 +68,6 @@ export default {
} }
}, },
watch: { watch: {
userIsRead: {
immediate: true,
handler(newVal) {
this.isRead = newVal
}
},
isDragging: { isDragging: {
handler(newVal) { handler(newVal) {
if (newVal) { if (newVal) {
@ -113,14 +107,11 @@ export default {
showPlayBtn() { showPlayBtn() {
return !this.isMissing && !this.isInvalid && !this.isStreaming && this.numTracks return !this.isMissing && !this.isInvalid && !this.isStreaming && this.numTracks
}, },
userAudiobooks() { itemProgress() {
return this.$store.state.user.user ? this.$store.state.user.user.audiobooks || {} : {} return this.$store.getters['user/getUserLibraryItemProgress'](this.book.id)
}, },
userAudiobook() { userIsFinished() {
return this.userAudiobooks[this.book.id] || null return this.itemProgress ? !!this.itemProgress.isFinished : false
},
userIsRead() {
return this.userAudiobook ? !!this.userAudiobook.isRead : false
}, },
coverWidth() { coverWidth() {
if (this.bookCoverAspectRatio === 1) return 50 * 1.6 if (this.bookCoverAspectRatio === 1) return 50 * 1.6
@ -141,21 +132,21 @@ export default {
clickEdit() { clickEdit() {
this.$emit('edit', this.book) this.$emit('edit', this.book)
}, },
toggleRead() { toggleFinished() {
var updatePayload = { var updatePayload = {
isRead: !this.isRead isFinished: !this.userIsFinished
} }
this.isProcessingReadUpdate = true this.isProcessingReadUpdate = true
this.$axios this.$axios
.$patch(`/api/me/audiobook/${this.book.id}`, updatePayload) .$patch(`/api/me/progress/${this.book.id}`, updatePayload)
.then(() => { .then(() => {
this.isProcessingReadUpdate = false this.isProcessingReadUpdate = false
this.$toast.success(`"${this.bookTitle}" Marked as ${updatePayload.isRead ? 'Read' : 'Not Read'}`) this.$toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`)
}) })
.catch((error) => { .catch((error) => {
console.error('Failed', error) console.error('Failed', error)
this.isProcessingReadUpdate = false this.isProcessingReadUpdate = false
this.$toast.error(`Failed to mark as ${updatePayload.isRead ? 'Read' : 'Not Read'}`) this.$toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`)
}) })
}, },
removeClick() { removeClick() {

7
client/layouts/default.vue
View File

@ -258,8 +258,9 @@ export default {
userStreamUpdate(user) { userStreamUpdate(user) {
this.$store.commit('users/updateUser', user) this.$store.commit('users/updateUser', user)
}, },
currentUserAudiobookUpdate(payload) { userItemProgressUpdate(payload) {
this.$store.commit('user/updateUserAudiobook', payload) console.log('User item progress update', payload)
this.$store.commit('user/updateItemProgress', payload)
}, },
collectionAdded(collection) { collectionAdded(collection) {
this.$store.commit('user/addUpdateCollection', collection) this.$store.commit('user/addUpdateCollection', collection)
@ -384,7 +385,7 @@ export default {
this.socket.on('user_online', this.userOnline) this.socket.on('user_online', this.userOnline)
this.socket.on('user_offline', this.userOffline) this.socket.on('user_offline', this.userOffline)
this.socket.on('user_stream_update', this.userStreamUpdate) this.socket.on('user_stream_update', this.userStreamUpdate)
this.socket.on('current_user_audiobook_update', this.currentUserAudiobookUpdate) this.socket.on('user_item_progress_updated', this.userItemProgressUpdate)
// User Collection Listeners // User Collection Listeners
this.socket.on('collection_added', this.collectionAdded) this.socket.on('collection_added', this.collectionAdded)

6
client/pages/config/stats.vue
View File

@ -60,7 +60,6 @@ export default {
data() { data() {
return { return {
listeningStats: null listeningStats: null
// libraryStats: null
} }
}, },
watch: { watch: {
@ -103,11 +102,6 @@ export default {
}, },
methods: { methods: {
async init() { async init() {
// this.libraryStats = await this.$axios.$get(`/api/libraries/${this.currentLibraryId}/stats`).catch((err) => {
// console.error('Failed to get library stats', err)
// var errorMsg = err.response ? err.response.data || 'Unknown Error' : 'Unknown Error'
// this.$toast.error(`Failed to get library stats: ${errorMsg}`)
// })
this.listeningStats = await this.$axios.$get(`/api/me/listening-stats`).catch((err) => { this.listeningStats = await this.$axios.$get(`/api/me/listening-stats`).catch((err) => {
console.error('Failed to load listening sesions', err) console.error('Failed to load listening sesions', err)
return [] return []

46
client/pages/item/_id/index.vue
View File

@ -7,7 +7,7 @@
<covers-book-cover :library-item="libraryItem" :width="bookCoverWidth" :book-cover-aspect-ratio="bookCoverAspectRatio" /> <covers-book-cover :library-item="libraryItem" :width="bookCoverWidth" :book-cover-aspect-ratio="bookCoverAspectRatio" />
<!-- Book Progress Bar --> <!-- Book Progress Bar -->
<div class="absolute bottom-0 left-0 h-1.5 bg-yellow-400 shadow-sm z-10" :class="userIsRead ? 'bg-success' : 'bg-yellow-400'" :style="{ width: 208 * progressPercent + 'px' }"></div> <div class="absolute bottom-0 left-0 h-1.5 bg-yellow-400 shadow-sm z-10" :class="userIsFinished ? 'bg-success' : 'bg-yellow-400'" :style="{ width: 208 * progressPercent + 'px' }"></div>
<!-- Book Cover Overlay --> <!-- Book Cover Overlay -->
<div class="absolute top-0 left-0 w-full h-full z-10 bg-black bg-opacity-30 opacity-0 hover:opacity-100 transition-opacity" @mousedown.prevent @mouseup.prevent> <div class="absolute top-0 left-0 w-full h-full z-10 bg-black bg-opacity-30 opacity-0 hover:opacity-100 transition-opacity" @mousedown.prevent @mouseup.prevent>
@ -130,8 +130,8 @@
<ui-icon-btn icon="download" :disabled="isMissing" class="mx-0.5" @click="downloadClick" /> <ui-icon-btn icon="download" :disabled="isMissing" class="mx-0.5" @click="downloadClick" />
</ui-tooltip> </ui-tooltip>
<ui-tooltip :text="isRead ? 'Mark as Not Read' : 'Mark as Read'" direction="top"> <ui-tooltip :text="userIsFinished ? 'Mark as Not Finished' : 'Mark as Finished'" direction="top">
<ui-read-icon-btn :disabled="isProcessingReadUpdate" :is-read="isRead" class="mx-0.5" @click="toggleRead" /> <ui-read-icon-btn :disabled="isProcessingReadUpdate" :is-read="userIsFinished" class="mx-0.5" @click="toggleFinished" />
</ui-tooltip> </ui-tooltip>
<ui-tooltip text="Collections" direction="top"> <ui-tooltip text="Collections" direction="top">
@ -173,19 +173,10 @@ export default {
}, },
data() { data() {
return { return {
isRead: false,
resettingProgress: false, resettingProgress: false,
isProcessingReadUpdate: false isProcessingReadUpdate: false
} }
}, },
watch: {
userIsRead: {
immediate: true,
handler(newVal) {
this.isRead = newVal
}
}
},
computed: { computed: {
coverAspectRatio() { coverAspectRatio() {
return this.$store.getters['getServerSetting']('coverAspectRatio') return this.$store.getters['getServerSetting']('coverAspectRatio')
@ -298,29 +289,26 @@ export default {
description() { description() {
return this.mediaMetadata.description || '' return this.mediaMetadata.description || ''
}, },
userAudiobooks() { userItemProgress() {
return this.$store.state.user.user ? this.$store.state.user.user.audiobooks || {} : {} return this.$store.getters['user/getUserLibraryItemProgress'](this.libraryItemId)
},
userAudiobook() {
return this.userAudiobooks[this.libraryItemId] || null
}, },
userCurrentTime() { userCurrentTime() {
return this.userAudiobook ? this.userAudiobook.currentTime : 0 return this.userItemProgress ? this.userItemProgress.currentTime : 0
}, },
userIsRead() { userIsFinished() {
return this.userAudiobook ? !!this.userAudiobook.isRead : false return this.userItemProgress ? !!this.userItemProgress.isFinished : false
}, },
userTimeRemaining() { userTimeRemaining() {
return this.duration - this.userCurrentTime return this.duration - this.userCurrentTime
}, },
progressPercent() { progressPercent() {
return this.userAudiobook ? Math.max(Math.min(1, this.userAudiobook.progress), 0) : 0 return this.userItemProgress ? Math.max(Math.min(1, this.userItemProgress.progress), 0) : 0
}, },
userProgressStartedAt() { userProgressStartedAt() {
return this.userAudiobook ? this.userAudiobook.startedAt : 0 return this.userItemProgress ? this.userItemProgress.startedAt : 0
}, },
userProgressFinishedAt() { userProgressFinishedAt() {
return this.userAudiobook ? this.userAudiobook.finishedAt : 0 return this.userItemProgress ? this.userItemProgress.finishedAt : 0
}, },
streamLibraryItem() { streamLibraryItem() {
return this.$store.state.streamLibraryItem return this.$store.state.streamLibraryItem
@ -346,21 +334,21 @@ export default {
openEbook() { openEbook() {
this.$store.commit('showEReader', this.libraryItem) this.$store.commit('showEReader', this.libraryItem)
}, },
toggleRead() { toggleFinished() {
var updatePayload = { var updatePayload = {
isRead: !this.isRead isFinished: !this.userIsFinished
} }
this.isProcessingReadUpdate = true this.isProcessingReadUpdate = true
this.$axios this.$axios
.$patch(`/api/me/audiobook/${this.libraryItemId}`, updatePayload) .$patch(`/api/me/progress/${this.libraryItemId}`, updatePayload)
.then(() => { .then(() => {
this.isProcessingReadUpdate = false this.isProcessingReadUpdate = false
this.$toast.success(`"${this.title}" Marked as ${updatePayload.isRead ? 'Read' : 'Not Read'}`) this.$toast.success(`Item marked as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`)
}) })
.catch((error) => { .catch((error) => {
console.error('Failed', error) console.error('Failed', error)
this.isProcessingReadUpdate = false this.isProcessingReadUpdate = false
this.$toast.error(`Failed to mark as ${updatePayload.isRead ? 'Read' : 'Not Read'}`) this.$toast.error(`Failed to mark as ${updatePayload.isFinished ? 'Finished' : 'Not Finished'}`)
}) })
}, },
startStream() { startStream() {
@ -386,7 +374,7 @@ export default {
if (confirm(`Are you sure you want to reset your progress?`)) { if (confirm(`Are you sure you want to reset your progress?`)) {
this.resettingProgress = true this.resettingProgress = true
this.$axios this.$axios
.$patch(`/api/me/audiobook/${this.libraryItemId}/reset-progress`) .$delete(`/api/me/progress/${this.libraryItemId}`)
.then(() => { .then(() => {
console.log('Progress reset complete') console.log('Progress reset complete')
this.$toast.success(`Your progress was reset`) this.$toast.success(`Your progress was reset`)

14
client/store/user.js
View File

@ -104,12 +104,18 @@ export const mutations = {
localStorage.removeItem('token') localStorage.removeItem('token')
} }
}, },
updateUserAudiobook(state, { id, data }) { updateItemProgress(state, { id, data }) {
if (!state.user) return if (!state.user) return
if (!state.user.audiobooks) { if (!data) {
Vue.set(state.user, 'audiobooks', {}) state.user.libraryItemProgress = state.user.libraryItemProgress.filter(lip => lip.id != id)
} else {
var indexOf = state.user.libraryItemProgress.findIndex(lip => lip.id == id)
if (indexOf >= 0) {
state.user.libraryItemProgress.splice(indexOf, 1, data)
} else {
state.user.libraryItemProgress.push(data)
}
} }
Vue.set(state.user.audiobooks, id, data)
}, },
setSettings(state, settings) { setSettings(state, settings) {
if (!settings) return if (!settings) return

78
server/ApiController.js
View File

@ -131,9 +131,9 @@ class ApiController {
// //
this.router.get('/me/listening-sessions', MeController.getListeningSessions.bind(this)) this.router.get('/me/listening-sessions', MeController.getListeningSessions.bind(this))
this.router.get('/me/listening-stats', MeController.getListeningStats.bind(this)) this.router.get('/me/listening-stats', MeController.getListeningStats.bind(this))
this.router.patch('/me/audiobook/:id/reset-progress', MeController.resetAudiobookProgress.bind(this)) this.router.patch('/me/progress/:id', MeController.createUpdateLibraryItemProgress.bind(this))
this.router.patch('/me/audiobook/:id', MeController.updateAudiobookData.bind(this)) this.router.delete('/me/progress/:id', MeController.removeLibraryItemProgress.bind(this))
this.router.patch('/me/audiobook/batch/update', MeController.batchUpdateAudiobookData.bind(this)) this.router.patch('/me/progress/batch/update', MeController.batchUpdateLibraryItemProgress.bind(this))
this.router.patch('/me/password', MeController.updatePassword.bind(this)) this.router.patch('/me/password', MeController.updatePassword.bind(this))
this.router.patch('/me/settings', MeController.updateSettings.bind(this)) this.router.patch('/me/settings', MeController.updateSettings.bind(this))
@ -306,35 +306,35 @@ class ApiController {
} }
async syncUserAudiobookData(req, res) { async syncUserAudiobookData(req, res) {
if (!req.body.data) { // if (!req.body.data) {
return res.status(403).send('Invalid local user audiobook data') // return res.status(403).send('Invalid local user audiobook data')
} // }
var hasUpdates = false // var hasUpdates = false
// Local user audiobook data use the latest update // // Local user audiobook data use the latest update
req.body.data.forEach((uab) => { // req.body.data.forEach((uab) => {
if (!uab || !uab.audiobookId) { // if (!uab || !uab.audiobookId) {
Logger.error('[ApiController] Invalid user audiobook data', uab) // Logger.error('[ApiController] Invalid user audiobook data', uab)
return // return
} // }
var audiobook = this.db.audiobooks.find(ab => ab.id === uab.audiobookId) // var audiobook = this.db.audiobooks.find(ab => ab.id === uab.audiobookId)
if (!audiobook) { // if (!audiobook) {
Logger.info('[ApiController] syncUserAudiobookData local audiobook data audiobook no longer exists', uab.audiobookId) // Logger.info('[ApiController] syncUserAudiobookData local audiobook data audiobook no longer exists', uab.audiobookId)
return // return
} // }
if (req.user.syncLocalUserAudiobookData(uab, audiobook)) { // if (req.user.syncLocalUserAudiobookData(uab, audiobook)) {
this.clientEmitter(req.user.id, 'current_user_audiobook_update', { id: uab.audiobookId, data: uab }) // this.clientEmitter(req.user.id, 'current_user_audiobook_update', { id: uab.audiobookId, data: uab })
hasUpdates = true // hasUpdates = true
} // }
}) // })
if (hasUpdates) { // if (hasUpdates) {
await this.db.updateEntity('user', req.user) // await this.db.updateEntity('user', req.user)
} // }
var allUserAudiobookData = Object.values(req.user.audiobooksToJSON()) // var allUserAudiobookData = Object.values(req.user.audiobooksToJSON())
res.json(allUserAudiobookData) // res.json(allUserAudiobookData)
} }
// Sync audiobook stream progress // Sync audiobook stream progress
@ -346,16 +346,16 @@ class ApiController {
// Sync local downloaded audiobook progress // Sync local downloaded audiobook progress
async syncLocal(req, res) { async syncLocal(req, res) {
Logger.debug(`[ApiController] syncLocal for ${req.user.username}`) // Logger.debug(`[ApiController] syncLocal for ${req.user.username}`)
var progressPayload = req.body // var progressPayload = req.body
var audiobookProgress = req.user.updateAudiobookData(progressPayload.audiobookId, progressPayload) // var itemProgress = req.user.updateLibraryItemProgress(progressPayload.libraryItemId, progressPayload)
if (audiobookProgress) { // if (itemProgress) {
await this.db.updateEntity('user', req.user) // await this.db.updateEntity('user', req.user)
this.clientEmitter(req.user.id, 'current_user_audiobook_update', { // this.clientEmitter(req.user.id, 'current_user_audiobook_update', {
id: progressPayload.audiobookId, // id: progressPayload.libraryItemId,
data: audiobookProgress || null // data: itemProgress || null
}) // })
} // }
res.sendStatus(200) res.sendStatus(200)
} }
@ -384,7 +384,7 @@ class ApiController {
// Remove libraryItem from users // Remove libraryItem from users
for (let i = 0; i < this.db.users.length; i++) { for (let i = 0; i < this.db.users.length; i++) {
var user = this.db.users[i] var user = this.db.users[i]
var madeUpdates = user.deleteAudiobookData(libraryItem.id) var madeUpdates = user.removeLibraryItemProgress(libraryItem.id)
if (madeUpdates) { if (madeUpdates) {
await this.db.updateEntity('user', user) await this.db.updateEntity('user', user)
} }

136
server/Server.js
View File

@ -273,7 +273,7 @@ class Server {
// socket.on('stream_sync', (syncData) => this.streamManager.streamSync(socket, syncData)) // socket.on('stream_sync', (syncData) => this.streamManager.streamSync(socket, syncData))
// Used to sync when playing local book on mobile, will be moved to API route // Used to sync when playing local book on mobile, will be moved to API route
socket.on('progress_update', (payload) => this.audiobookProgressUpdate(socket, payload)) // socket.on('progress_update', (payload) => this.audiobookProgressUpdate(socket, payload))
// Downloading // Downloading
socket.on('download', (payload) => this.downloadManager.downloadSocketRequest(socket, payload)) socket.on('download', (payload) => this.downloadManager.downloadSocketRequest(socket, payload))
@ -388,7 +388,7 @@ class Server {
if (audiobookIdsToRemove.length) { if (audiobookIdsToRemove.length) {
Logger.debug(`[Server] Found ${audiobookIdsToRemove.length} audiobook data to remove from user ${_user.username}`) Logger.debug(`[Server] Found ${audiobookIdsToRemove.length} audiobook data to remove from user ${_user.username}`)
for (let y = 0; y < audiobookIdsToRemove.length; y++) { for (let y = 0; y < audiobookIdsToRemove.length; y++) {
_user.deleteAudiobookData(audiobookIdsToRemove[y]) _user.removeLibraryItemProgress(audiobookIdsToRemove[y])
} }
await this.db.updateEntity('user', _user) await this.db.updateEntity('user', _user)
} }
@ -500,89 +500,89 @@ class Server {
res.sendStatus(200) res.sendStatus(200)
} }
async audiobookProgressUpdate(socket, progressPayload) { // async audiobookProgressUpdate(socket, progressPayload) {
var client = socket.sheepClient // var client = socket.sheepClient
if (!client || !client.user) { // if (!client || !client.user) {
Logger.error('[Server] audiobookProgressUpdate invalid socket client') // Logger.error('[Server] audiobookProgressUpdate invalid socket client')
return // return
} // }
var audiobookProgress = client.user.updateAudiobookData(progressPayload.audiobookId, progressPayload) // var audiobookProgress = client.user.createUpdateLibraryItemProgress(progressPayload.audiobookId, progressPayload)
if (audiobookProgress) { // if (audiobookProgress) {
await this.db.updateEntity('user', client.user) // await this.db.updateEntity('user', client.user)
this.clientEmitter(client.user.id, 'current_user_audiobook_update', { // this.clientEmitter(client.user.id, 'current_user_audiobook_update', {
id: progressPayload.audiobookId, // id: progressPayload.audiobookId,
data: audiobookProgress || null // data: audiobookProgress || null
}) // })
} // }
} // }
async createBookmark(socket, payload) { async createBookmark(socket, payload) {
var client = socket.sheepClient // var client = socket.sheepClient
if (!client || !client.user) { // if (!client || !client.user) {
Logger.error('[Server] createBookmark invalid socket client') // Logger.error('[Server] createBookmark invalid socket client')
return // return
} // }
var userAudiobook = client.user.createBookmark(payload) // var userAudiobook = client.user.createBookmark(payload)
if (!userAudiobook || userAudiobook.error) { // if (!userAudiobook || userAudiobook.error) {
var failMessage = (userAudiobook ? userAudiobook.error : null) || 'Unknown Error' // var failMessage = (userAudiobook ? userAudiobook.error : null) || 'Unknown Error'
socket.emit('show_error_toast', `Failed to create Bookmark: ${failMessage}`) // socket.emit('show_error_toast', `Failed to create Bookmark: ${failMessage}`)
return // return
} // }
await this.db.updateEntity('user', client.user) // await this.db.updateEntity('user', client.user)
socket.emit('show_success_toast', `${secondsToTimestamp(payload.time)} Bookmarked`) // socket.emit('show_success_toast', `${secondsToTimestamp(payload.time)} Bookmarked`)
this.clientEmitter(client.user.id, 'current_user_audiobook_update', { // this.clientEmitter(client.user.id, 'current_user_audiobook_update', {
id: userAudiobook.audiobookId, // id: userAudiobook.audiobookId,
data: userAudiobook || null // data: userAudiobook || null
}) // })
} }
async updateBookmark(socket, payload) { async updateBookmark(socket, payload) {
var client = socket.sheepClient // var client = socket.sheepClient
if (!client || !client.user) { // if (!client || !client.user) {
Logger.error('[Server] updateBookmark invalid socket client') // Logger.error('[Server] updateBookmark invalid socket client')
return // return
} // }
var userAudiobook = client.user.updateBookmark(payload) // var userAudiobook = client.user.updateBookmark(payload)
if (!userAudiobook || userAudiobook.error) { // if (!userAudiobook || userAudiobook.error) {
var failMessage = (userAudiobook ? userAudiobook.error : null) || 'Unknown Error' // var failMessage = (userAudiobook ? userAudiobook.error : null) || 'Unknown Error'
socket.emit('show_error_toast', `Failed to update Bookmark: ${failMessage}`) // socket.emit('show_error_toast', `Failed to update Bookmark: ${failMessage}`)
return // return
} // }
await this.db.updateEntity('user', client.user) // await this.db.updateEntity('user', client.user)
socket.emit('show_success_toast', `Bookmark ${secondsToTimestamp(payload.time)} Updated`) // socket.emit('show_success_toast', `Bookmark ${secondsToTimestamp(payload.time)} Updated`)
this.clientEmitter(client.user.id, 'current_user_audiobook_update', { // this.clientEmitter(client.user.id, 'current_user_audiobook_update', {
id: userAudiobook.audiobookId, // id: userAudiobook.audiobookId,
data: userAudiobook || null // data: userAudiobook || null
}) // })
} }
async deleteBookmark(socket, payload) { async deleteBookmark(socket, payload) {
var client = socket.sheepClient // var client = socket.sheepClient
if (!client || !client.user) { // if (!client || !client.user) {
Logger.error('[Server] deleteBookmark invalid socket client') // Logger.error('[Server] deleteBookmark invalid socket client')
return // return
} // }
var userAudiobook = client.user.deleteBookmark(payload) // var userAudiobook = client.user.deleteBookmark(payload)
if (!userAudiobook || userAudiobook.error) { // if (!userAudiobook || userAudiobook.error) {
var failMessage = (userAudiobook ? userAudiobook.error : null) || 'Unknown Error' // var failMessage = (userAudiobook ? userAudiobook.error : null) || 'Unknown Error'
socket.emit('show_error_toast', `Failed to delete Bookmark: ${failMessage}`) // socket.emit('show_error_toast', `Failed to delete Bookmark: ${failMessage}`)
return // return
} // }
await this.db.updateEntity('user', client.user) // await this.db.updateEntity('user', client.user)
socket.emit('show_success_toast', `Bookmark ${secondsToTimestamp(payload.time)} Removed`) // socket.emit('show_success_toast', `Bookmark ${secondsToTimestamp(payload.time)} Removed`)
this.clientEmitter(client.user.id, 'current_user_audiobook_update', { // this.clientEmitter(client.user.id, 'current_user_audiobook_update', {
id: userAudiobook.audiobookId, // id: userAudiobook.audiobookId,
data: userAudiobook || null // data: userAudiobook || null
}) // })
} }
async authenticateSocket(socket, token) { async authenticateSocket(socket, token) {

39
server/controllers/MeController.js
View File

@ -16,31 +16,26 @@ class MeController {
res.json(listeningStats) res.json(listeningStats)
} }
// PATCH: api/me/audiobook/:id/reset-progress // DELETE: api/me/progress/:id
async resetAudiobookProgress(req, res) { async removeLibraryItemProgress(req, res) {
var libraryItem = this.db.libraryItems.find(li => li.id === req.params.id) var wasRemoved = req.user.removeLibraryItemProgress(req.params.id)
if (!libraryItem) { if (!wasRemoved) {
return res.status(404).send('Item not found') return res.sendStatus(200)
} }
req.user.resetAudiobookProgress(libraryItem)
await this.db.updateEntity('user', req.user) await this.db.updateEntity('user', req.user)
this.clientEmitter(req.user.id, 'user_item_progress_updated', { id: libraryItem.id, data: null })
var userAudiobookData = req.user.audiobooks[libraryItem.id]
if (userAudiobookData) {
this.clientEmitter(req.user.id, 'current_user_audiobook_update', { id: libraryItem.id, data: userAudiobookData })
}
this.clientEmitter(req.user.id, 'user_updated', req.user.toJSONForBrowser()) this.clientEmitter(req.user.id, 'user_updated', req.user.toJSONForBrowser())
res.sendStatus(200) res.sendStatus(200)
} }
// PATCH: api/me/audiobook/:id // PATCH: api/me/progress/:id
async updateAudiobookData(req, res) { async createUpdateLibraryItemProgress(req, res) {
var libraryItem = this.db.libraryItems.find(ab => ab.id === req.params.id) var libraryItem = this.db.libraryItems.find(ab => ab.id === req.params.id)
if (!libraryItem) { if (!libraryItem) {
return res.status(404).send('Item not found') return res.status(404).send('Item not found')
} }
var wasUpdated = req.user.updateAudiobookData(libraryItem.id, req.body) var wasUpdated = req.user.createUpdateLibraryItemProgress(libraryItem.id, req.body)
if (wasUpdated) { if (wasUpdated) {
await this.db.updateEntity('user', req.user) await this.db.updateEntity('user', req.user)
this.clientEmitter(req.user.id, 'user_updated', req.user.toJSONForBrowser()) this.clientEmitter(req.user.id, 'user_updated', req.user.toJSONForBrowser())
@ -48,19 +43,21 @@ class MeController {
res.sendStatus(200) res.sendStatus(200)
} }
// PATCH: api/me/audiobook/batch/update // PATCH: api/me/progress/batch/update
async batchUpdateAudiobookData(req, res) { async batchUpdateLibraryItemProgress(req, res) {
var userAbDataPayloads = req.body var itemProgressPayloads = req.body
if (!userAbDataPayloads || !userAbDataPayloads.length) { if (!itemProgressPayloads || !itemProgressPayloads.length) {
return res.sendStatus(500) return res.sendStatus(500)
} }
var shouldUpdate = false var shouldUpdate = false
userAbDataPayloads.forEach((userAbData) => { itemProgressPayloads.forEach((itemProgress) => {
var libraryItem = this.db.libraryItems.find(li => li.id === userAbData.audiobookId) var libraryItem = this.db.libraryItems.find(li => li.id === itemProgress.id) // Make sure this library item exists
if (libraryItem) { if (libraryItem) {
var wasUpdated = req.user.updateAudiobookData(libraryItem.id, userAbData) var wasUpdated = req.user.createUpdateLibraryItemProgress(libraryItem.id, itemProgress)
if (wasUpdated) shouldUpdate = true if (wasUpdated) shouldUpdate = true
} else {
Logger.error(`[MeController] batchUpdateLibraryItemProgress: Library Item does not exist ${itemProgress.id}`)
} }
}) })

52
server/objects/user/LibraryItemProgress.js
View File

@ -5,7 +5,6 @@ class LibraryItemProgress {
this.id = null // Same as library item id this.id = null // Same as library item id
this.libraryItemId = null this.libraryItemId = null
this.totalDuration = null // seconds
this.progress = null // 0 to 1 this.progress = null // 0 to 1
this.currentTime = null // seconds this.currentTime = null // seconds
this.isFinished = false this.isFinished = false
@ -23,7 +22,6 @@ class LibraryItemProgress {
return { return {
id: this.id, id: this.id,
libraryItemId: this.libraryItemId, libraryItemId: this.libraryItemId,
totalDuration: this.totalDuration,
progress: this.progress, progress: this.progress,
currentTime: this.currentTime, currentTime: this.currentTime,
isFinished: this.isFinished, isFinished: this.isFinished,
@ -36,7 +34,6 @@ class LibraryItemProgress {
construct(progress) { construct(progress) {
this.id = progress.id this.id = progress.id
this.libraryItemId = progress.libraryItemId this.libraryItemId = progress.libraryItemId
this.totalDuration = progress.totalDuration
this.progress = progress.progress this.progress = progress.progress
this.currentTime = progress.currentTime this.currentTime = progress.currentTime
this.isFinished = !!progress.isFinished this.isFinished = !!progress.isFinished
@ -46,25 +43,40 @@ class LibraryItemProgress {
} }
updateProgressFromStream(stream) { updateProgressFromStream(stream) {
this.audiobookId = stream.libraryItemId // this.audiobookId = stream.libraryItemId
this.totalDuration = stream.totalDuration // this.totalDuration = stream.totalDuration
this.progress = stream.clientProgress // this.progress = stream.clientProgress
this.currentTime = stream.clientCurrentTime // this.currentTime = stream.clientCurrentTime
// this.lastUpdate = Date.now()
// if (!this.startedAt) {
// this.startedAt = Date.now()
// }
// // If has < 10 seconds remaining mark as read
// var timeRemaining = this.totalDuration - this.currentTime
// if (timeRemaining < 10) {
// this.isFinished = true
// this.progress = 1
// this.finishedAt = Date.now()
// } else {
// this.isFinished = false
// this.finishedAt = null
// }
}
setData(libraryItemId, progress) {
this.id = libraryItemId
this.libraryItemId = libraryItemId
this.progress = Math.min(1, (progress.progress || 0))
this.currentTime = progress.currentTime || 0
this.isFinished = !!progress.isFinished || this.progress == 1
this.lastUpdate = Date.now() this.lastUpdate = Date.now()
this.startedAt = Date.now()
if (!this.startedAt) { this.finishedAt = null
this.startedAt = Date.now() if (this.isFinished) {
}
// If has < 10 seconds remaining mark as read
var timeRemaining = this.totalDuration - this.currentTime
if (timeRemaining < 10) {
this.isFinished = true
this.progress = 1
this.finishedAt = Date.now() this.finishedAt = Date.now()
} else { this.progress = 1
this.isFinished = false
this.finishedAt = null
} }
} }

50
server/objects/user/User.js
View File

@ -204,18 +204,22 @@ class User {
// return this.audiobooks[stream.audiobookId] // return this.audiobooks[stream.audiobookId]
} }
updateAudiobookData(audiobookId, updatePayload) { createUpdateLibraryItemProgress(libraryItemId, updatePayload) {
// if (!this.audiobooks) this.audiobooks = {} var itemProgress = this.libraryItemProgress.find(li => li.id === libraryItemId)
// if (!this.audiobooks[audiobookId]) { if (!itemProgress) {
// this.audiobooks[audiobookId] = new UserAudiobookData() var newItemProgress = new LibraryItemProgress()
// this.audiobooks[audiobookId].audiobookId = audiobookId newItemProgress.setData(libraryItemId, updatePayload)
// } this.libraryItemProgress.push(newItemProgress)
// var wasUpdated = this.audiobooks[audiobookId].update(updatePayload) return true
// if (wasUpdated) { }
// // Logger.debug(`[User] UserAudiobookData was updated ${JSON.stringify(this.audiobooks[audiobookId])}`) var wasUpdated = itemProgress.update(updatePayload)
// return this.audiobooks[audiobookId] return wasUpdated
// } }
// return false
removeLibraryItemProgress(libraryItemId) {
if (!this.libraryItemProgress.some(lip => lip.id == libraryItemId)) return false
this.libraryItemProgress = this.libraryItemProgress.filter(lip => lip != libraryItemId)
return true
} }
// Returns Boolean If update was made // Returns Boolean If update was made
@ -244,28 +248,6 @@ class User {
return madeUpdates return madeUpdates
} }
resetAudiobookProgress(libraryItem) {
// if (!this.audiobooks || !this.audiobooks[libraryItem.id]) {
// return false
// }
// return this.updateAudiobookData(libraryItem.id, {
// progress: 0,
// currentTime: 0,
// isRead: false,
// lastUpdate: Date.now(),
// startedAt: null,
// finishedAt: null
// })
}
deleteAudiobookData(audiobookId) {
// if (!this.audiobooks || !this.audiobooks[audiobookId]) {
// return false
// }
// delete this.audiobooks[audiobookId]
// return true
}
checkCanAccessLibrary(libraryId) { checkCanAccessLibrary(libraryId) {
if (this.permissions.accessAllLibraries) return true if (this.permissions.accessAllLibraries) return true
if (!this.librariesAccessible) return false if (!this.librariesAccessible) return false