groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-02-03 16:59:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lazy bookshelf finalized

Browse source
This commit is contained in:
advplyr 2021-12-01 19:07:03 -06:00
parent 5c92aef048
commit 1ef9a689bc
53 changed files with 914 additions and 795 deletions
Download patch file Download diff file Expand all files Collapse all files

105
server/ApiController.js
View file

@ -55,11 +55,13 @@ class ApiController {
this.router.get('/libraries/:id/books/all', LibraryController.middleware.bind(this), LibraryController.getBooksForLibrary2.bind(this))
this.router.get('/libraries/:id/books', LibraryController.middleware.bind(this), LibraryController.getBooksForLibrary.bind(this))
this.router.get('/libraries/:id/series', LibraryController.middleware.bind(this), LibraryController.getSeriesForLibrary.bind(this))
this.router.get('/libraries/:id/series', LibraryController.middleware.bind(this), LibraryController.getAllSeriesForLibrary.bind(this))
this.router.get('/libraries/:id/series/:series', LibraryController.middleware.bind(this), LibraryController.getSeriesForLibrary.bind(this))
this.router.get('/libraries/:id/collections', LibraryController.middleware.bind(this), LibraryController.getCollectionsForLibrary.bind(this))
this.router.get('/libraries/:id/categories', LibraryController.middleware.bind(this), LibraryController.getLibraryCategories.bind(this))
this.router.get('/libraries/:id/filters', LibraryController.middleware.bind(this), LibraryController.getLibraryFilters.bind(this))
this.router.get('/libraries/:id/search', LibraryController.middleware.bind(this), LibraryController.search.bind(this))
this.router.get('/libraries/:id/stats', LibraryController.middleware.bind(this), LibraryController.stats.bind(this))
this.router.patch('/libraries/order', LibraryController.reorder.bind(this))
// TEMP: Support old syntax for mobile app
@ -78,6 +80,7 @@ class ApiController {
this.router.delete('/books/all', BookController.deleteAll.bind(this))
this.router.post('/books/batch/delete', BookController.batchDelete.bind(this))
this.router.post('/books/batch/update', BookController.batchUpdate.bind(this))
this.router.post('/books/batch/get', BookController.batchGet.bind(this))
this.router.patch('/books/:id/tracks', BookController.updateTracks.bind(this))
this.router.get('/books/:id/stream', BookController.openStream.bind(this))
this.router.post('/books/:id/cover', BookController.uploadCover.bind(this))
@ -493,105 +496,5 @@ class ApiController {
})
return listeningStats
}
// decode(text) {
// return Buffer.from(decodeURIComponent(text), 'base64').toString()
// }
// getFiltered(audiobooks, filterBy, user) {
// var filtered = audiobooks
// var searchGroups = ['genres', 'tags', 'series', 'authors', 'progress', 'narrators']
// var group = searchGroups.find(_group => filterBy.startsWith(_group + '.'))
// if (group) {
// var filterVal = filterBy.replace(`${group}.`, '')
// var filter = this.decode(filterVal)
// if (group === 'genres') filtered = filtered.filter(ab => ab.book && ab.book.genres.includes(filter))
// else if (group === 'tags') filtered = filtered.filter(ab => ab.tags.includes(filter))
// else if (group === 'series') {
// if (filter === 'No Series') filtered = filtered.filter(ab => ab.book && !ab.book.series)
// else filtered = filtered.filter(ab => ab.book && ab.book.series === filter)
// }
// else if (group === 'authors') filtered = filtered.filter(ab => ab.book && ab.book.authorFL && ab.book.authorFL.split(', ').includes(filter))
// else if (group === 'narrators') filtered = filtered.filter(ab => ab.book && ab.book.narratorFL && ab.book.narratorFL.split(', ').includes(filter))
// else if (group === 'progress') {
// filtered = filtered.filter(ab => {
// var userAudiobook = user.getAudiobookJSON(ab.id)
// var isRead = userAudiobook && userAudiobook.isRead
// if (filter === 'Read' && isRead) return true
// if (filter === 'Unread' && !isRead) return true
// if (filter === 'In Progress' && (userAudiobook && !userAudiobook.isRead && userAudiobook.progress > 0)) return true
// return false
// })
// }
// } else if (filterBy === 'issues') {
// filtered = filtered.filter(ab => {
// return ab.hasMissingParts || ab.hasInvalidParts || ab.isMissing || ab.isIncomplete
// })
// }
// return filtered
// }
// getDistinctFilterData(audiobooks) {
// var data = {
// authors: [],
// genres: [],
// tags: [],
// series: [],
// narrators: []
// }
// audiobooks.forEach((ab) => {
// if (ab.book._authorsList.length) {
// ab.book._authorsList.forEach((author) => {
// if (author && !data.authors.includes(author)) data.authors.push(author)
// })
// }
// if (ab.book._genres.length) {
// ab.book._genres.forEach((genre) => {
// if (genre && !data.genres.includes(genre)) data.genres.push(genre)
// })
// }
// if (ab.tags.length) {
// ab.tags.forEach((tag) => {
// if (tag && !data.tags.includes(tag)) data.tags.push(tag)
// })
// }
// if (ab.book._series && !data.series.includes(ab.book._series)) data.series.push(ab.book._series)
// if (ab.book._narratorsList.length) {
// ab.book._narratorsList.forEach((narrator) => {
// if (narrator && !data.narrators.includes(narrator)) data.narrators.push(narrator)
// })
// }
// })
// return data
// }
// getBooksMostRecentlyRead(user, books, limit) {
// var booksWithProgress = books.map(book => {
// return {
// userAudiobook: user.getAudiobookJSON(book.id),
// book
// }
// }).filter((data) => data.userAudiobook && !data.userAudiobook.isRead)
// booksWithProgress.sort((a, b) => {
// return b.userAudiobook.lastUpdate - a.userAudiobook.lastUpdate
// })
// return booksWithProgress.map(b => b.book).slice(0, limit)
// }
// getBooksMostRecentlyAdded(user, books, limit) {
// var booksWithProgress = books.map(book => {
// return {
// userAudiobook: user.getAudiobookJSON(book.id),
// book
// }
// }).filter((data) => data.userAudiobook && !data.userAudiobook.isRead)
// booksWithProgress.sort((a, b) => {
// return b.userAudiobook.lastUpdate - a.userAudiobook.lastUpdate
// })
// return booksWithProgress.map(b => b.book).slice(0, limit)
// }
}
module.exports = ApiController

8
server/Scanner.js
View file

@ -149,13 +149,13 @@ class Scanner {
if (!audiobookData.audioFiles.length && !ebookFiles.length) {
Logger.error(`[Scanner] "${existingAudiobook.title}" no valid book files found - marking as incomplete`)
existingAudiobook.setLastScan(version)
existingAudiobook.isIncomplete = true
existingAudiobook.isInvalid = true
await this.db.updateAudiobook(existingAudiobook)
this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
return ScanResult.UPDATED
} else if (existingAudiobook.isIncomplete) { // Was incomplete but now is not
} else if (existingAudiobook.isInvalid) { // Was incomplete but now is not
Logger.info(`[Scanner] "${existingAudiobook.title}" was incomplete but now has book files`)
existingAudiobook.isIncomplete = false
existingAudiobook.isInvalid = false
}
// Check for audio files that were removed
@ -241,7 +241,7 @@ class Scanner {
if (!existingAudiobook.tracks.length && !ebookFiles.length) {
Logger.error(`[Scanner] "${existingAudiobook.title}" no valid book files found after update - marking as incomplete`)
existingAudiobook.setLastScan(version)
existingAudiobook.isIncomplete = true
existingAudiobook.isInvalid = true
await this.db.updateAudiobook(existingAudiobook)
this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
return ScanResult.UPDATED

1
server/Server.js
View file

@ -240,7 +240,6 @@ class Server {
methods: ["GET", "POST"]
}
})
this.io.on('connection', (socket) => {
this.clients[socket.id] = {
id: socket.id,

2
server/Watcher.js
View file

@ -124,8 +124,6 @@ class FolderWatcher extends EventEmitter {
}
addFileUpdate(libraryId, path, type) {
console.log('add file update', libraryId, path, type)
return
path = path.replace(/\\/g, '/')
if (this.pendingFilePaths.includes(path)) return

20
server/controllers/BookController.js
View file

@ -42,7 +42,7 @@ class BookController {
if (hasUpdates) {
await this.db.updateAudiobook(audiobook)
}
this.emitter('audiobook_updated', audiobook.toJSONMinified())
this.emitter('audiobook_updated', audiobook.toJSONExpanded())
res.json(audiobook.toJSON())
}
@ -118,7 +118,7 @@ class BookController {
Logger.info(`[ApiController] ${audiobooksUpdated} Audiobooks have updates`)
for (let i = 0; i < audiobooks.length; i++) {
await this.db.updateAudiobook(audiobooks[i])
this.emitter('audiobook_updated', audiobooks[i].toJSONMinified())
this.emitter('audiobook_updated', audiobooks[i].toJSONExpanded())
}
}
@ -128,6 +128,16 @@ class BookController {
})
}
// POST: api/books/batch/get
async batchGet(req, res) {
var bookIds = req.body.books || []
if (!bookIds.length) {
return res.status(403).send('Invalid payload')
}
var audiobooks = this.db.audiobooks.filter(ab => bookIds.includes(ab.id)).map((ab) => ab.toJSONExpanded())
res.json(audiobooks)
}
// PATCH: api/books/:id/tracks
async updateTracks(req, res) {
if (!req.user.canUpdate) {
@ -140,7 +150,7 @@ class BookController {
Logger.info(`Updating audiobook tracks called ${audiobook.id}`)
audiobook.updateAudioTracks(orderedFileData)
await this.db.updateAudiobook(audiobook)
this.emitter('audiobook_updated', audiobook.toJSONMinified())
this.emitter('audiobook_updated', audiobook.toJSONExpanded())
res.json(audiobook.toJSON())
}
@ -184,7 +194,7 @@ class BookController {
}
await this.db.updateAudiobook(audiobook)
this.emitter('audiobook_updated', audiobook.toJSONMinified())
this.emitter('audiobook_updated', audiobook.toJSONExpanded())
res.json({
success: true,
cover: result.cover
@ -205,7 +215,7 @@ class BookController {
if (updated) {
await this.db.updateAudiobook(audiobook)
this.emitter('audiobook_updated', audiobook.toJSONMinified())
this.emitter('audiobook_updated', audiobook.toJSONExpanded())
}
if (updated) res.status(200).send('Cover updated successfully')

60
server/controllers/LibraryController.js
View file

@ -35,6 +35,7 @@ class LibraryController {
var books = this.db.audiobooks.filter(ab => ab.libraryId === req.library.id)
return res.json({
filterdata: libraryHelpers.getDistinctFilterData(books),
issues: libraryHelpers.getNumIssues(books),
library: req.library
})
}
@ -85,13 +86,6 @@ class LibraryController {
getBooksForLibrary(req, res) {
var libraryId = req.library.id
var audiobooks = this.db.audiobooks.filter(ab => ab.libraryId === libraryId)
// if (req.query.q) {
// audiobooks = this.db.audiobooks.filter(ab => {
// return ab.libraryId === libraryId && ab.isSearchMatch(req.query.q)
// }).map(ab => ab.toJSONMinified())
// } else {
// audiobooks = this.db.audiobooks.filter(ab => ab.libraryId === libraryId).map(ab => ab.toJSONMinified())
// }
if (req.query.filter) {
audiobooks = libraryHelpers.getFiltered(audiobooks, req.query.filter, req.user)
@ -154,13 +148,11 @@ class LibraryController {
audiobooks = audiobooks.slice(startIndex, startIndex + payload.limit)
}
payload.results = audiobooks.map(ab => ab.toJSONExpanded())
console.log('returning books', audiobooks.length)
res.json(payload)
}
// api/libraries/:id/series
async getSeriesForLibrary(req, res) {
async getAllSeriesForLibrary(req, res) {
var audiobooks = this.db.audiobooks.filter(ab => ab.libraryId === req.library.id)
var payload = {
@ -182,11 +174,28 @@ class LibraryController {
}
payload.results = series
console.log('returning series', series.length)
res.json(payload)
}
// GET: api/libraries/:id/series/:series
async getSeriesForLibrary(req, res) {
var series = libraryHelpers.decode(req.params.series)
if (!series) {
return res.status(403).send('Invalid series')
}
var audiobooks = this.db.audiobooks.filter(ab => ab.libraryId === req.library.id && ab.book.series === series)
if (!audiobooks.length) {
return res.status(404).send('Series not found')
}
audiobooks = sort(audiobooks).asc(ab => {
return ab.book.volumeNumber
})
res.json({
results: audiobooks,
total: audiobooks.length
})
}
// api/libraries/:id/series
async getCollectionsForLibrary(req, res) {
var audiobooks = this.db.audiobooks.filter(ab => ab.libraryId === req.library.id)
@ -210,8 +219,6 @@ class LibraryController {
}
payload.results = collections
console.log('returning collections', collections.length)
res.json(payload)
}
@ -300,7 +307,7 @@ class LibraryController {
if (!req.query.q) {
return res.status(400).send('No query string')
}
var maxResults = req.query.max || 3
var maxResults = req.query.limit && !isNaN(req.query.limit) ? Number(req.query.limit) : 12
var bookMatches = []
var authorMatches = {}
@ -350,13 +357,30 @@ class LibraryController {
})
}
})
res.json({
var results = {
audiobooks: bookMatches.slice(0, maxResults),
tags: Object.values(tagMatches).slice(0, maxResults),
authors: Object.values(authorMatches).slice(0, maxResults),
series: Object.values(seriesMatches).slice(0, maxResults)
})
}
res.json(results)
}
async stats(req, res) {
var audiobooksInLibrary = this.db.audiobooks.filter(ab => ab.libraryId === req.library.id)
var authorsWithCount = libraryHelpers.getAuthorsWithCount(audiobooksInLibrary)
var genresWithCount = libraryHelpers.getGenresWithCount(audiobooksInLibrary)
var stats = {
totalBooks: audiobooksInLibrary.length,
totalAuthors: Object.keys(authorsWithCount).length,
totalGenres: Object.keys(genresWithCount).length,
totalDuration: libraryHelpers.getAudiobooksTotalDuration(audiobooksInLibrary),
totalSize: libraryHelpers.getAudiobooksTotalSize(audiobooksInLibrary),
authorsWithCount,
genresWithCount
}
res.json(stats)
}
middleware(req, res, next) {

17
server/objects/Audiobook.js
View file

@ -124,6 +124,14 @@ class Audiobook {
return this._audioFiles.filter(af => af.invalid).map(af => ({ filename: af.filename, error: af.error || 'Unknown Error' }))
}
get numMissingParts() {
return this.missingParts ? this.missingParts.length : 0
}
get numInvalidParts() {
return this.invalidParts ? this.invalidParts.length : 0
}
get _audioFiles() { return this.audioFiles || [] }
get _otherFiles() { return this.otherFiles || [] }
get _tracks() { return this.tracks || [] }
@ -206,8 +214,8 @@ class Audiobook {
chapters: this.chapters || [],
isMissing: !!this.isMissing,
isInvalid: !!this.isInvalid,
hasMissingParts: this.missingParts ? this.missingParts.length : 0,
hasInvalidParts: this.invalidParts ? this.invalidParts.length : 0
hasMissingParts: this.numMissingParts,
hasInvalidParts: this.numInvalidParts
}
}
@ -238,8 +246,8 @@ class Audiobook {
chapters: this.chapters || [],
isMissing: !!this.isMissing,
isInvalid: !!this.isInvalid,
hasMissingParts: this.missingParts ? this.missingParts.length : 0,
hasInvalidParts: this.invalidParts ? this.invalidParts.length : 0
hasMissingParts: this.numMissingParts,
hasInvalidParts: this.numInvalidParts
}
}
@ -419,7 +427,6 @@ class Audiobook {
update(payload) {
var hasUpdates = false
if (payload.tags && payload.tags.join(',') !== this.tags.join(',')) {
this.tags = payload.tags
hasUpdates = true

3
server/objects/User.js
View file

@ -215,7 +215,7 @@ class User {
}
var wasUpdated = this.audiobooks[audiobook.id].update(updatePayload)
if (wasUpdated) {
Logger.debug(`[User] UserAudiobookData was updated ${JSON.stringify(this.audiobooks[audiobook.id])}`)
// Logger.debug(`[User] UserAudiobookData was updated ${JSON.stringify(this.audiobooks[audiobook.id])}`)
return this.audiobooks[audiobook.id]
}
return false
@ -276,6 +276,7 @@ class User {
}
getAudiobookJSON(audiobookId) {
if (!this.audiobooks) return null
return this.audiobooks[audiobookId] ? this.audiobooks[audiobookId].toJSON() : null
}

1
server/objects/UserAudiobookData.js
View file

@ -85,7 +85,6 @@ class UserAudiobookData {
update(payload) {
var hasUpdates = false
Logger.debug(`[UserAudiobookData] Update called ${JSON.stringify(payload)}`)
for (const key in payload) {
if (payload[key] !== this[key]) {
if (key === 'isRead') {

65
server/utils/libraryHelpers.js
View file

@ -33,7 +33,7 @@ module.exports = {
}
} else if (filterBy === 'issues') {
filtered = filtered.filter(ab => {
return ab.hasMissingParts || ab.hasInvalidParts || ab.isMissing || ab.isIncomplete
return ab.numMissingParts || ab.numInvalidParts || ab.isMissing || ab.isInvalid
})
}
@ -82,6 +82,7 @@ module.exports = {
_series[audiobook.book.series] = {
id: audiobook.book.series,
name: audiobook.book.series,
type: 'series',
books: [audiobook.toJSONExpanded()]
}
} else {
@ -102,16 +103,16 @@ module.exports = {
},
getBooksMostRecentlyRead(booksWithUserAb, limit) {
var booksWithProgress = booksWithUserAb.filter((data) => data.userAudiobook && !data.userAudiobook.isRead)
var booksWithProgress = booksWithUserAb.filter((data) => data.userAudiobook && data.userAudiobook.progress > 0 && !data.userAudiobook.isRead)
booksWithProgress.sort((a, b) => {
return b.userAudiobook.lastUpdate - a.userAudiobook.lastUpdate
})
return booksWithProgress.map(b => b.book).slice(0, limit)
return booksWithProgress.map(b => b.book.toJSONExpanded()).slice(0, limit)
},
getBooksMostRecentlyAdded(books, limit) {
var booksSortedByAddedAt = sort(books).desc(book => book.addedAt)
return booksSortedByAddedAt.slice(0, limit)
return booksSortedByAddedAt.map(b => b.toJSONExpanded()).slice(0, limit)
},
getBooksMostRecentlyFinished(booksWithUserAb, limit) {
@ -119,7 +120,7 @@ module.exports = {
booksRead.sort((a, b) => {
return b.userAudiobook.finishedAt - a.userAudiobook.finishedAt
})
return booksRead.map(b => b.book).slice(0, limit)
return booksRead.map(b => b.book.toJSONExpanded()).slice(0, limit)
},
getSeriesMostRecentlyAdded(series, limit) {
@ -128,5 +129,59 @@ module.exports = {
return booksSortedByMostRecent[0].addedAt
})
return seriesSortedByAddedAt.slice(0, limit)
},
getGenresWithCount(audiobooks) {
var genresMap = {}
audiobooks.forEach((ab) => {
var genres = ab.book.genres || []
genres.forEach((genre) => {
if (genresMap[genre]) genresMap[genre].count++
else
genresMap[genre] = {
genre,
count: 1
}
})
})
return Object.values(genresMap).sort((a, b) => b.count - a.count)
},
getAuthorsWithCount(audiobooks) {
var authorsMap = {}
audiobooks.forEach((ab) => {
var authors = ab.book.authorFL ? ab.book.authorFL.split(', ') : []
authors.forEach((author) => {
if (authorsMap[author]) authorsMap[author].count++
else
authorsMap[author] = {
author,
count: 1
}
})
})
return Object.values(authorsMap).sort((a, b) => b.count - a.count)
},
getAudiobooksTotalDuration(audiobooks) {
var totalDuration = 0
audiobooks.forEach((ab) => {
totalDuration += ab.totalDuration
})
return totalDuration
},
getAudiobooksTotalSize(audiobooks) {
var totalSize = 0
audiobooks.forEach((ab) => {
totalSize += ab.totalSize
})
return totalSize
},
getNumIssues(books) {
return books.filter(ab => {
return ab.numMissingParts || ab.numInvalidParts || ab.isMissing || ab.isInvalid
}).length
}
}