Settings
- -Libraries
- -Users
- -Backups
- -Log
- -Stats
- + +{{ route.title }}
+{{ emptyMessage }}
+{{ title }}
@@ -10,7 +10,7 @@by {{ authorFL }}
- +Tags: ${html}
` if (this.matchKey === 'authorFL') return `by ${html}` + if (this.matchKey === 'isbn') return `ISBN: ${html}
` + if (this.matchKey === 'asin') return `ASIN: ${html}
` if (this.matchKey === 'series') return `Series: ${html}
` return `${html}` } diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue index 7a9e7246..1b29c664 100644 --- a/client/components/cards/LazyBookCard.vue +++ b/client/components/cards/LazyBookCard.vue @@ -5,6 +5,13 @@+ #{{ volumeNumber }} {{ title }} +
+{{ authorFL }}
+{{ title }}
@@ -79,6 +86,7 @@ export default { }, bookCoverAspectRatio: Number, showVolumeNumber: Boolean, + bookshelfView: Number, bookMount: { // Book can be passed as prop or set with setEntity() type: Object, @@ -292,6 +300,10 @@ export default { return this.authorFL.slice(0, 27) + '...' } return this.authorFL + }, + isAlternativeBookshelfView() { + var constants = this.$constants || this.$nuxt.$constants + return this.bookshelfView === constants.BookshelfView.TITLES } }, methods: { diff --git a/client/components/cards/LazySeriesCard.vue b/client/components/cards/LazySeriesCard.vue index 9f1e7b8d..4fb1dd9a 100644 --- a/client/components/cards/LazySeriesCard.vue +++ b/client/components/cards/LazySeriesCard.vue @@ -74,7 +74,6 @@ export default { }, methods: { setEntity(_series) { - console.log('setting entity', _series) this.series = _series }, setSelectionMode(val) { diff --git a/client/components/controls/FilterSelect.vue b/client/components/controls/FilterSelect.vue index 6d7d3b08..e466788f 100644 --- a/client/components/controls/FilterSelect.vue +++ b/client/components/controls/FilterSelect.vue @@ -14,7 +14,7 @@Books in Library
{{ userAudiobooksRead.length }}
-Books Read
-{{ totalAudiobookHours }}
@@ -30,7 +18,7 @@{{ totalMinutesListening }}
-Minutes Listening
+{{ totalSizeNum }}
+Size ({{ totalSizeMod }})
+{{ numAudioTracks }}
+Audio Tracks
{{ userAudiobooksRead.length }}
+Books Read
+{{ Math.round((100 * genre.count) / totalBooks) }} %
- -{{ genre.genre }}
-{{ totalDaysListened }}
+Days Listened
+{{ index + 1 }}. {{ author.author }}
-{{ author.count }}
-{{ totalMinutesListening }}
+Minutes Listening
+No Listening Sessions
+ +{{ index + 1 }}.
+{{ book.audiobookTitle }}
+{{ $dateDistanceFromNow(book.lastUpdate) }}
+{{ $elapsedPretty(book.timeListening) }}
+
## Organizing your audiobooks
@@ -50,6 +52,8 @@ Available in Unraid Community Apps
docker pull advplyr/audiobookshelf
docker run -d \
+ -e AUDIOBOOKSHELF_UID=99 \
+ -e AUDIOBOOKSHELF_GID=100 \
-p 13378:80 \
-v :/audiobooks \
-v :/config \
@@ -189,17 +193,7 @@ For this to work you must enable at least the following mods using `a2enmod`:
## Run from source
-Note: you will need `npm`, `node12`, and `ffmpeg` to run this project locally
-
-```bash
-git clone https://github.com/advplyr/audiobookshelf.git
-cd audiobookshelf
-
-# All paths default to root directory. Config path is the database.
-# Directories will be created if they don't exist
-# Paths are relative to the root directory, so "../Audiobooks" would be a valid path
-npm run prod -- -p [PORT] --audiobooks [AUDIOBOOKS_PATH] --config [CONFIG_PATH] --metadata [METADATA_PATH]
-```
+[See discussion](https://github.com/advplyr/audiobookshelf/discussions/259#discussioncomment-1869729)
## Contributing / How to Support
diff --git a/server/ApiController.js b/server/ApiController.js
index 2fe3315d..6a120cb9 100644
--- a/server/ApiController.js
+++ b/server/ApiController.js
@@ -458,14 +458,15 @@ class ApiController {
books: {},
days: {},
dayOfWeek: {},
- today: 0
+ today: 0,
+ recentSessions: listeningSessions.slice(0, 10)
}
listeningSessions.forEach((s) => {
if (s.dayOfWeek) {
if (!listeningStats.dayOfWeek[s.dayOfWeek]) listeningStats.dayOfWeek[s.dayOfWeek] = 0
listeningStats.dayOfWeek[s.dayOfWeek] += s.timeListening
}
- if (s.date) {
+ if (s.date && s.timeListening > 0) {
if (!listeningStats.days[s.date]) listeningStats.days[s.date] = 0
listeningStats.days[s.date] += s.timeListening
@@ -473,8 +474,17 @@ class ApiController {
listeningStats.today += s.timeListening
}
}
- if (!listeningStats.books[s.audiobookId]) listeningStats.books[s.audiobookId] = 0
- listeningStats.books[s.audiobookId] += s.timeListening
+ if (!listeningStats.books[s.audiobookId]) {
+ listeningStats.books[s.audiobookId] = {
+ id: s.audiobookId,
+ timeListening: s.timeListening,
+ title: s.audiobookTitle,
+ author: s.audiobookAuthor,
+ lastUpdate: s.lastUpdate
+ }
+ } else {
+ listeningStats.books[s.audiobookId].timeListening += s.timeListening
+ }
listeningStats.totalTime += s.timeListening
})
diff --git a/server/Watcher.js b/server/Watcher.js
index c9fede87..7912d485 100644
--- a/server/Watcher.js
+++ b/server/Watcher.js
@@ -120,6 +120,7 @@ class FolderWatcher extends EventEmitter {
onRename(libraryId, pathFrom, pathTo) {
Logger.debug(`[Watcher] Rename ${pathFrom} => ${pathTo}`)
+ this.addFileUpdate(libraryId, pathFrom, 'renamed')
this.addFileUpdate(libraryId, pathTo, 'renamed')
}
diff --git a/server/controllers/FileSystemController.js b/server/controllers/FileSystemController.js
index 28d63571..3a592b74 100644
--- a/server/controllers/FileSystemController.js
+++ b/server/controllers/FileSystemController.js
@@ -1,4 +1,5 @@
const Logger = require('../Logger')
+const Path = require('path')
class FileSystemController {
constructor() { }
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index ddc89d3a..7576c4ce 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -29,6 +29,11 @@ class LibraryController {
}
findAll(req, res) {
+ var librariesAccessible = req.user.librariesAccessible || []
+ if (librariesAccessible && librariesAccessible.length) {
+ return res.json(this.db.libraries.filter(lib => librariesAccessible.includes(lib.id)).map(lib => lib.toJSON()))
+ }
+
res.json(this.db.libraries.map(lib => lib.toJSON()))
}
@@ -167,6 +172,7 @@ class LibraryController {
}
var series = libraryHelpers.getSeriesFromBooks(audiobooks, payload.minified)
+ series = sort(series).asc(s => s.name)
payload.total = series.length
if (payload.limit) {
@@ -174,7 +180,7 @@ class LibraryController {
series = series.slice(startIndex, startIndex + payload.limit)
}
- payload.results = sort(series).asc(s => s.name)
+ payload.results = series
res.json(payload)
}
@@ -375,11 +381,14 @@ class LibraryController {
var authorsWithCount = libraryHelpers.getAuthorsWithCount(audiobooksInLibrary)
var genresWithCount = libraryHelpers.getGenresWithCount(audiobooksInLibrary)
+ var abDurationStats = libraryHelpers.getAudiobookDurationStats(audiobooksInLibrary)
var stats = {
totalBooks: audiobooksInLibrary.length,
totalAuthors: Object.keys(authorsWithCount).length,
totalGenres: Object.keys(genresWithCount).length,
- totalDuration: libraryHelpers.getAudiobooksTotalDuration(audiobooksInLibrary),
+ totalDuration: abDurationStats.totalDuration,
+ longestAudiobooks: abDurationStats.longstAudiobooks,
+ numAudioTracks: abDurationStats.numAudioTracks,
totalSize: libraryHelpers.getAudiobooksTotalSize(audiobooksInLibrary),
authorsWithCount,
genresWithCount
@@ -409,6 +418,12 @@ class LibraryController {
}
middleware(req, res, next) {
+ var librariesAccessible = req.user.librariesAccessible || []
+ if (librariesAccessible && librariesAccessible.length && !librariesAccessible.includes(req.params.id)) {
+ Logger.warn(`[LibraryController] Library ${req.params.id} not accessible to user ${req.user.username}`)
+ return res.sendStatus(404)
+ }
+
var library = this.db.libraries.find(lib => lib.id === req.params.id)
if (!library) {
return res.status(404).send('Library not found')
diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js
index a57e1d98..b9b2b31f 100644
--- a/server/controllers/MeController.js
+++ b/server/controllers/MeController.js
@@ -40,7 +40,7 @@ class MeController {
if (!audiobook) {
return res.status(404).send('Audiobook not found')
}
- var wasUpdated = req.user.updateAudiobookData(audiobook, req.body)
+ var wasUpdated = req.user.updateAudiobookData(audiobook.id, req.body)
if (wasUpdated) {
await this.db.updateEntity('user', req.user)
this.clientEmitter(req.user.id, 'user_updated', req.user.toJSONForBrowser())
@@ -59,7 +59,7 @@ class MeController {
userAbDataPayloads.forEach((userAbData) => {
var audiobook = this.db.audiobooks.find(ab => ab.id === userAbData.audiobookId)
if (audiobook) {
- var wasUpdated = req.user.updateAudiobookData(audiobook, userAbData)
+ var wasUpdated = req.user.updateAudiobookData(audiobook.id, userAbData)
if (wasUpdated) shouldUpdate = true
}
})
diff --git a/server/objects/AudioFile.js b/server/objects/AudioFile.js
index 2e33f0ef..196381a2 100644
--- a/server/objects/AudioFile.js
+++ b/server/objects/AudioFile.js
@@ -14,8 +14,9 @@ class AudioFile {
this.addedAt = null
this.trackNumFromMeta = null
+ this.discNumFromMeta = null
this.trackNumFromFilename = null
- this.cdNumFromFilename = null
+ this.discNumFromFilename = null
this.format = null
this.duration = null
@@ -42,16 +43,6 @@ class AudioFile {
}
}
- // Sort number takes cd num into account
- // get sortNumber() {
- // if (this.manuallyVerified) return this.index
- // var num = this.index
- // if (this.cdNumFromFilename && !isNaN(this.cdNumFromFilename)) {
- // num += (Number(this.cdNumFromFilename) * 1000)
- // }
- // return num
- // }
-
toJSON() {
return {
index: this.index,
@@ -62,8 +53,9 @@ class AudioFile {
fullPath: this.fullPath,
addedAt: this.addedAt,
trackNumFromMeta: this.trackNumFromMeta,
+ discNumFromMeta: this.discNumFromMeta,
trackNumFromFilename: this.trackNumFromFilename,
- cdNumFromFilename: this.cdNumFromFilename,
+ discNumFromFilename: this.discNumFromFilename,
manuallyVerified: !!this.manuallyVerified,
invalid: !!this.invalid,
exclude: !!this.exclude,
@@ -97,8 +89,11 @@ class AudioFile {
this.error = data.error || null
this.trackNumFromMeta = data.trackNumFromMeta
+ this.discNumFromMeta = data.discNumFromMeta
this.trackNumFromFilename = data.trackNumFromFilename
- this.cdNumFromFilename = data.cdNumFromFilename
+
+ if (data.cdNumFromFilename !== undefined) this.discNumFromFilename = data.cdNumFromFilename // TEMP:Support old var name
+ else this.discNumFromFilename = data.discNumFromFilename
this.format = data.format
this.duration = data.duration
@@ -132,8 +127,9 @@ class AudioFile {
this.addedAt = Date.now()
this.trackNumFromMeta = fileData.trackNumFromMeta
+ this.discNumFromMeta = fileData.discNumFromMeta
this.trackNumFromFilename = fileData.trackNumFromFilename
- this.cdNumFromFilename = fileData.cdNumFromFilename
+ this.discNumFromFilename = fileData.discNumFromFilename
this.format = probeData.format
this.duration = probeData.duration
diff --git a/server/objects/AudioFileMetadata.js b/server/objects/AudioFileMetadata.js
index 3a82ceab..0b6abe11 100644
--- a/server/objects/AudioFileMetadata.js
+++ b/server/objects/AudioFileMetadata.js
@@ -7,6 +7,7 @@ class AudioFileMetadata {
this.tagSeries = null
this.tagSeriesPart = null
this.tagTrack = null
+ this.tagDisc = null
this.tagSubtitle = null
this.tagAlbumArtist = null
this.tagDate = null
@@ -16,6 +17,9 @@ class AudioFileMetadata {
this.tagDescription = null
this.tagEncoder = null
this.tagEncodedBy = null
+ this.tagIsbn = null
+ this.tagLanguage = null
+ this.tagASIN = null
if (metadata) {
this.construct(metadata)
@@ -41,6 +45,7 @@ class AudioFileMetadata {
this.tagSeries = metadata.tagSeries || null
this.tagSeriesPart = metadata.tagSeriesPart || null
this.tagTrack = metadata.tagTrack || null
+ this.tagDisc = metadata.tagDisc || null
this.tagSubtitle = metadata.tagSubtitle || null
this.tagAlbumArtist = metadata.tagAlbumArtist || null
this.tagDate = metadata.tagDate || null
@@ -50,6 +55,9 @@ class AudioFileMetadata {
this.tagDescription = metadata.tagDescription || null
this.tagEncoder = metadata.tagEncoder || null
this.tagEncodedBy = metadata.tagEncodedBy || null
+ this.tagIsbn = metadata.tagIsbn || null
+ this.tagLanguage = metadata.tagLanguage || null
+ this.tagASIN = metadata.tagASIN || null
}
// Data parsed in prober.js
@@ -61,6 +69,7 @@ class AudioFileMetadata {
this.tagSeries = payload.file_tag_series || null
this.tagSeriesPart = payload.file_tag_seriespart || null
this.tagTrack = payload.file_tag_track || null
+ this.tagDisc = payload.file_tag_disc || null
this.tagSubtitle = payload.file_tag_subtitle || null
this.tagAlbumArtist = payload.file_tag_albumartist || null
this.tagDate = payload.file_tag_date || null
@@ -70,6 +79,9 @@ class AudioFileMetadata {
this.tagDescription = payload.file_tag_description || null
this.tagEncoder = payload.file_tag_encoder || null
this.tagEncodedBy = payload.file_tag_encodedby || null
+ this.tagIsbn = payload.file_tag_isbn || null
+ this.tagLanguage = payload.file_tag_language || null
+ this.tagASIN = payload.file_tag_asin || null
}
updateData(payload) {
@@ -81,6 +93,7 @@ class AudioFileMetadata {
tagSeries: payload.file_tag_series || null,
tagSeriesPart: payload.file_tag_seriespart || null,
tagTrack: payload.file_tag_track || null,
+ tagDisc: payload.file_tag_disc || null,
tagSubtitle: payload.file_tag_subtitle || null,
tagAlbumArtist: payload.file_tag_albumartist || null,
tagDate: payload.file_tag_date || null,
@@ -89,7 +102,10 @@ class AudioFileMetadata {
tagComment: payload.file_tag_comment || null,
tagDescription: payload.file_tag_description || null,
tagEncoder: payload.file_tag_encoder || null,
- tagEncodedBy: payload.file_tag_encodedby || null
+ tagEncodedBy: payload.file_tag_encodedby || null,
+ tagIsbn: payload.file_tag_isbn || null,
+ tagLanguage: payload.file_tag_language || null,
+ tagASIN: payload.file_tag_asin || null
}
var hasUpdates = false
diff --git a/server/objects/Book.js b/server/objects/Book.js
index ec250d75..3bf149ac 100644
--- a/server/objects/Book.js
+++ b/server/objects/Book.js
@@ -18,7 +18,8 @@ class Book {
this.publisher = null
this.description = null
this.isbn = null
- this.langauge = null
+ this.asin = null
+ this.language = null
this.cover = null
this.coverFullPath = null
this.genres = []
@@ -43,6 +44,9 @@ class Book {
get _authorsList() { return this._author.split(', ') }
get _narratorsList() { return this._narrator.split(', ') }
get _genres() { return this.genres || [] }
+ get _language() { return this.language || '' }
+ get _isbn() { return this.isbn || '' }
+ get _asin() { return this.asin || '' }
get shouldSearchForCover() {
if (this.cover) return false
@@ -66,6 +70,7 @@ class Book {
this.publisher = book.publisher
this.description = book.description
this.isbn = book.isbn || null
+ this.asin = book.asin || null
this.language = book.language || null
this.cover = book.cover
this.coverFullPath = book.coverFullPath || null
@@ -97,6 +102,7 @@ class Book {
publisher: this.publisher,
description: this.description,
isbn: this.isbn,
+ asin: this.asin,
language: this.language,
cover: this.cover,
coverFullPath: this.coverFullPath,
@@ -155,6 +161,7 @@ class Book {
this.publishYear = data.publishYear || null
this.description = data.description || null
this.isbn = data.isbn || null
+ this.asin = data.asin || null
this.language = data.language || null
this.cover = data.cover || null
this.coverFullPath = data.coverFullPath || null
@@ -279,7 +286,13 @@ class Book {
// var authorMatch = this._author.toLowerCase().includes(search)
var seriesMatch = this._series.toLowerCase().includes(search)
- var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorsMatched.length ? 'authorFL' : seriesMatch ? 'series' : false
+ // ISBN match has to be exact to prevent isbn matches to flood results. Remove dashes since isbn might have those
+ var isbnMatch = this._isbn.toLowerCase().replace(/-/g, '') === search.replace(/-/g, '')
+
+ var asinMatch = this._asin.toLowerCase() === search
+
+ var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorsMatched.length ? 'authorFL' : seriesMatch ? 'series' : isbnMatch ? 'isbn' : asinMatch ? 'asin' : false
+
var bookMatchText = bookMatchKey ? this[bookMatchKey] : ''
return {
book: bookMatchKey,
@@ -343,6 +356,18 @@ class Book {
{
tag: 'tagSeriesPart',
key: 'volumeNumber'
+ },
+ {
+ tag: 'tagIsbn',
+ key: 'isbn'
+ },
+ {
+ tag: 'tagLanguage',
+ key: 'language'
+ },
+ {
+ tag: 'tagASIN',
+ key: 'asin'
}
]
diff --git a/server/objects/ServerSettings.js b/server/objects/ServerSettings.js
index b3695303..34bacb6c 100644
--- a/server/objects/ServerSettings.js
+++ b/server/objects/ServerSettings.js
@@ -1,4 +1,4 @@
-const { CoverDestination, BookCoverAspectRatio } = require('../utils/constants')
+const { CoverDestination, BookCoverAspectRatio, BookshelfView } = require('../utils/constants')
const Logger = require('../Logger')
class ServerSettings {
@@ -12,6 +12,7 @@ class ServerSettings {
// Scanner
this.scannerParseSubtitle = false
this.scannerFindCovers = false
+ this.scannerCoverProvider = 'google'
this.scannerPreferAudioMetadata = false
this.scannerPreferOpfMetadata = false
@@ -34,7 +35,8 @@ class ServerSettings {
this.loggerScannerLogsToKeep = 2
// Cover
- this.coverAspectRatio = BookCoverAspectRatio.STANDARD
+ this.coverAspectRatio = BookCoverAspectRatio.SQUARE
+ this.bookshelfView = BookshelfView.STANDARD
this.logLevel = Logger.logLevel
this.version = null
@@ -48,6 +50,7 @@ class ServerSettings {
this.autoTagNew = settings.autoTagNew
this.newTagExpireDays = settings.newTagExpireDays
this.scannerFindCovers = !!settings.scannerFindCovers
+ this.scannerCoverProvider = settings.scannerCoverProvider || 'google'
this.scannerParseSubtitle = settings.scannerParseSubtitle
this.scannerPreferAudioMetadata = !!settings.scannerPreferAudioMetadata
this.scannerPreferOpfMetadata = !!settings.scannerPreferOpfMetadata
@@ -64,7 +67,8 @@ class ServerSettings {
this.loggerDailyLogsToKeep = settings.loggerDailyLogsToKeep || 7
this.loggerScannerLogsToKeep = settings.loggerScannerLogsToKeep || 2
- this.coverAspectRatio = settings.coverAspectRatio || BookCoverAspectRatio.STANDARD
+ this.coverAspectRatio = settings.coverAspectRatio || BookCoverAspectRatio.SQUARE
+ this.bookshelfView = settings.bookshelfView || BookshelfView.STANDARD
this.logLevel = settings.logLevel || Logger.logLevel
this.version = settings.version || null
@@ -80,6 +84,7 @@ class ServerSettings {
autoTagNew: this.autoTagNew,
newTagExpireDays: this.newTagExpireDays,
scannerFindCovers: this.scannerFindCovers,
+ scannerCoverProvider: this.scannerCoverProvider,
scannerParseSubtitle: this.scannerParseSubtitle,
scannerPreferAudioMetadata: this.scannerPreferAudioMetadata,
scannerPreferOpfMetadata: this.scannerPreferOpfMetadata,
@@ -93,6 +98,7 @@ class ServerSettings {
loggerDailyLogsToKeep: this.loggerDailyLogsToKeep,
loggerScannerLogsToKeep: this.loggerScannerLogsToKeep,
coverAspectRatio: this.coverAspectRatio,
+ bookshelfView: this.bookshelfView,
logLevel: this.logLevel,
version: this.version
}
diff --git a/server/objects/User.js b/server/objects/User.js
index 1a6a8d10..48a92c43 100644
--- a/server/objects/User.js
+++ b/server/objects/User.js
@@ -140,7 +140,9 @@ class User {
if (user.audiobooks) {
this.audiobooks = {}
for (const key in user.audiobooks) {
- if (user.audiobooks[key]) {
+ if (key === '[object Object]') { // TEMP: Bug remove bad data
+ Logger.warn('[User] Construct found invalid UAD')
+ } else if (user.audiobooks[key]) {
this.audiobooks[key] = new UserAudiobookData(user.audiobooks[key])
}
}
@@ -207,16 +209,16 @@ class User {
return this.audiobooks[stream.audiobookId]
}
- updateAudiobookData(audiobook, updatePayload) {
+ updateAudiobookData(audiobookId, updatePayload) {
if (!this.audiobooks) this.audiobooks = {}
- if (!this.audiobooks[audiobook.id]) {
- this.audiobooks[audiobook.id] = new UserAudiobookData()
- this.audiobooks[audiobook.id].audiobookId = audiobook.id
+ if (!this.audiobooks[audiobookId]) {
+ this.audiobooks[audiobookId] = new UserAudiobookData()
+ this.audiobooks[audiobookId].audiobookId = audiobookId
}
- var wasUpdated = this.audiobooks[audiobook.id].update(updatePayload)
+ var wasUpdated = this.audiobooks[audiobookId].update(updatePayload)
if (wasUpdated) {
- // Logger.debug(`[User] UserAudiobookData was updated ${JSON.stringify(this.audiobooks[audiobook.id])}`)
- return this.audiobooks[audiobook.id]
+ // Logger.debug(`[User] UserAudiobookData was updated ${JSON.stringify(this.audiobooks[audiobookId])}`)
+ return this.audiobooks[audiobookId]
}
return false
}
@@ -251,7 +253,7 @@ class User {
if (!this.audiobooks || !this.audiobooks[audiobook.id]) {
return false
}
- return this.updateAudiobookData(audiobook, {
+ return this.updateAudiobookData(audiobook.id, {
progress: 0,
currentTime: 0,
isRead: false,
diff --git a/server/objects/UserAudiobookData.js b/server/objects/UserAudiobookData.js
index ca11e742..65da4a84 100644
--- a/server/objects/UserAudiobookData.js
+++ b/server/objects/UserAudiobookData.js
@@ -86,7 +86,7 @@ class UserAudiobookData {
update(payload) {
var hasUpdates = false
for (const key in payload) {
- if (payload[key] !== this[key]) {
+ if (this[key] !== undefined && payload[key] !== this[key]) {
if (key === 'isRead') {
if (!payload[key]) { // Updating to Not Read - Reset progress and current time
this.finishedAt = null
diff --git a/server/objects/UserListeningSession.js b/server/objects/UserListeningSession.js
index 35985e67..41e4506f 100644
--- a/server/objects/UserListeningSession.js
+++ b/server/objects/UserListeningSession.js
@@ -10,6 +10,7 @@ class UserListeningSession {
this.audiobookId = null
this.audiobookTitle = null
this.audiobookAuthor = null
+ this.audiobookDuration = 0
this.audiobookGenres = []
this.date = null
@@ -32,6 +33,7 @@ class UserListeningSession {
audiobookId: this.audiobookId,
audiobookTitle: this.audiobookTitle,
audiobookAuthor: this.audiobookAuthor,
+ audiobookDuration: this.audiobookDuration,
audiobookGenres: [...this.audiobookGenres],
date: this.date,
dayOfWeek: this.dayOfWeek,
@@ -48,6 +50,7 @@ class UserListeningSession {
this.audiobookId = session.audiobookId
this.audiobookTitle = session.audiobookTitle
this.audiobookAuthor = session.audiobookAuthor
+ this.audiobookDuration = session.audiobookDuration || 0
this.audiobookGenres = session.audiobookGenres
this.date = session.date
@@ -64,6 +67,7 @@ class UserListeningSession {
this.audiobookId = audiobook.id
this.audiobookTitle = audiobook.title || ''
this.audiobookAuthor = audiobook.authorFL || ''
+ this.audiobookDuration = audiobook.duration || 0
this.audiobookGenres = [...audiobook.genres]
this.timeListening = 0
diff --git a/server/providers/Audible.js b/server/providers/Audible.js
index 4651684c..2f369937 100644
--- a/server/providers/Audible.js
+++ b/server/providers/Audible.js
@@ -39,8 +39,12 @@ class Audible {
}
asinSearch(asin) {
- var queryString = `response_groups=rating,series,contributors,product_desc,media,product_extended_attrs` +
- `&image_sizes=500,1024,2000`;
+ var queryObj = {
+ response_groups: 'rating,series,contributors,product_desc,media,product_extended_attrs',
+ image_sizes: '500,1024,2000'
+ };
+ var queryString = (new URLSearchParams(queryObj)).toString();
+ asin = encodeURIComponent(asin);
var url = `https://api.audible.com/1.0/catalog/products/${asin}?${queryString}`
Logger.debug(`[Audible] ASIN url: ${url}`)
return axios.get(url).then((res) => {
diff --git a/server/providers/Audnexus.js b/server/providers/Audnexus.js
index a7d76f67..4d9c4ce2 100644
--- a/server/providers/Audnexus.js
+++ b/server/providers/Audnexus.js
@@ -8,6 +8,7 @@ class Audnexus {
}
authorASINsRequest(name) {
+ name = encodeURIComponent(name);
return axios.get(`${this.baseUrl}/authors?name=${name}`).then((res) => {
return res.data || []
}).catch((error) => {
@@ -17,6 +18,7 @@ class Audnexus {
}
authorRequest(asin) {
+ asin = encodeURIComponent(asin);
return axios.get(`${this.baseUrl}/authors/${asin}`).then((res) => {
return res.data
}).catch((error) => {
diff --git a/server/providers/GoogleBooks.js b/server/providers/GoogleBooks.js
index 43bdf719..0da3c309 100644
--- a/server/providers/GoogleBooks.js
+++ b/server/providers/GoogleBooks.js
@@ -32,8 +32,12 @@ class GoogleBooks {
}
async search(title, author) {
+ title = encodeURIComponent(title)
var queryString = `q=intitle:${title}`
- if (author) queryString += `+inauthor:${author}`
+ if (author) {
+ author = encodeURIComponent(author)
+ queryString += `+inauthor:${author}`
+ }
var url = `https://www.googleapis.com/books/v1/volumes?${queryString}`
Logger.debug(`[GoogleBooks] Search url: ${url}`)
var items = await axios.get(url).then((res) => {
diff --git a/server/providers/LibGen.js b/server/providers/LibGen.js
index 87d119b0..6b01436d 100644
--- a/server/providers/LibGen.js
+++ b/server/providers/LibGen.js
@@ -15,6 +15,7 @@ class LibGen {
await this.init()
}
queryTitle = queryTitle.replace(/'/g, '')
+ queryTitle = encodeURIComponent(queryTitle);
var options = {
mirror: this.mirror,
query: queryTitle,
diff --git a/server/providers/OpenLibrary.js b/server/providers/OpenLibrary.js
index 6694005e..3f4d4682 100644
--- a/server/providers/OpenLibrary.js
+++ b/server/providers/OpenLibrary.js
@@ -85,7 +85,7 @@ class OpenLibrary {
}
async searchTitle(title) {
- title = title.replace(/'/g, '')
+ title = encodeURIComponent(title);
var lookupData = await this.get(`/search.json?title=${title}`)
if (!lookupData) {
return {
diff --git a/server/scanner/AudioFileScanner.js b/server/scanner/AudioFileScanner.js
index 94311208..9cfd6660 100644
--- a/server/scanner/AudioFileScanner.js
+++ b/server/scanner/AudioFileScanner.js
@@ -9,11 +9,7 @@ const { LogLevel } = require('../utils/constants')
class AudioFileScanner {
constructor() { }
- getTrackNumberFromMeta(scanData) {
- return !isNaN(scanData.trackNumber) && scanData.trackNumber !== null ? Math.trunc(Number(scanData.trackNumber)) : null
- }
-
- getTrackNumberFromFilename(bookScanData, filename) {
+ getTrackAndDiscNumberFromFilename(bookScanData, filename) {
const { title, author, series, publishYear } = bookScanData
var partbasename = Path.basename(filename, Path.extname(filename))
@@ -23,39 +19,24 @@ class AudioFileScanner {
if (series) partbasename = partbasename.replace(series, '')
if (publishYear) partbasename = partbasename.replace(publishYear)
- // Remove eg. "disc 1" from path
- partbasename = partbasename.replace(/\bdisc \d\d?\b/i, '')
-
- // Remove "cd01" or "cd 01" from path
- partbasename = partbasename.replace(/\bcd ?\d\d?\b/i, '')
-
- var numbersinpath = partbasename.match(/\d{1,4}/g)
- if (!numbersinpath) return null
-
- var number = numbersinpath.length ? parseInt(numbersinpath[0]) : null
- return number
- }
-
- getCdNumberFromFilename(bookScanData, filename) {
- const { title, author, series, publishYear } = bookScanData
- var partbasename = Path.basename(filename, Path.extname(filename))
-
- // Remove title, author, series, and publishYear from filename if there
- if (title) partbasename = partbasename.replace(title, '')
- if (author) partbasename = partbasename.replace(author, '')
- if (series) partbasename = partbasename.replace(series, '')
- if (publishYear) partbasename = partbasename.replace(publishYear)
-
- var cdNumber = null
-
- var cdmatch = partbasename.match(/\b(disc|cd) ?(\d\d?)\b/i)
- if (cdmatch && cdmatch.length > 2 && cdmatch[2]) {
- if (!isNaN(cdmatch[2])) {
- cdNumber = Number(cdmatch[2])
+ // Look for disc number
+ var discNumber = null
+ var discMatch = partbasename.match(/\b(disc|cd) ?(\d\d?)\b/i)
+ if (discMatch && discMatch.length > 2 && discMatch[2]) {
+ if (!isNaN(discMatch[2])) {
+ discNumber = Number(discMatch[2])
}
+
+ // Remove disc number from filename
+ partbasename = partbasename.replace(/\b(disc|cd) ?(\d\d?)\b/i, '')
}
- return cdNumber
+ var numbersinpath = partbasename.match(/\d{1,4}/g)
+ var trackNumber = numbersinpath && numbersinpath.length ? parseInt(numbersinpath[0]) : null
+ return {
+ trackNumber,
+ discNumber
+ }
}
getAverageScanDurationMs(results) {
@@ -76,20 +57,21 @@ class AudioFileScanner {
// Logger.debug(`[AudioFileScanner] Finished Probe ${audioFileData.fullPath} elapsed ${msToTimestamp(Date.now() - probeStart, true)}`)
var audioFile = new AudioFile()
- audioFileData.trackNumFromMeta = this.getTrackNumberFromMeta(probeData)
- audioFileData.trackNumFromFilename = this.getTrackNumberFromFilename(bookScanData, audioFileData.filename)
- audioFileData.cdNumFromFilename = this.getCdNumberFromFilename(bookScanData, audioFileData.filename)
- audioFile.setDataFromProbe(audioFileData, probeData)
- if (audioFile.embeddedCoverArt) {
+ audioFileData.trackNumFromMeta = probeData.trackNumber
+ audioFileData.discNumFromMeta = probeData.discNumber
+
+ const { trackNumber, discNumber } = this.getTrackAndDiscNumberFromFilename(bookScanData, audioFileData.filename)
+ audioFileData.trackNumFromFilename = trackNumber
+ audioFileData.discNumFromFilename = discNumber
+
+ audioFile.setDataFromProbe(audioFileData, probeData)
- }
return {
audioFile,
elapsed: Date.now() - probeStart
}
}
-
// Returns array of { AudioFile, elapsed, averageScanDuration } from audio file scan objects
async executeAudioFileScans(audioFileDataArray, bookScanData) {
var proms = []
@@ -105,6 +87,86 @@ class AudioFileScanner {
}
}
+ isSequential(nums) {
+ if (!nums || !nums.length) return false
+ if (nums.length === 1) return true
+ var prev = nums[0]
+ for (let i = 1; i < nums.length; i++) {
+ if (nums[i] - prev > 1) return false
+ prev = nums[i]
+ }
+ return true
+ }
+
+ removeDupes(nums) {
+ if (!nums || !nums.length) return []
+ if (nums.length === 1) return nums
+
+ var nodupes = [nums[0]]
+ nums.forEach((num) => {
+ if (num > nodupes[nodupes.length - 1]) nodupes.push(num)
+ })
+ return nodupes
+ }
+
+ runSmartTrackOrder(audiobook, audioFiles) {
+ var discsFromFilename = []
+ var tracksFromFilename = []
+ var discsFromMeta = []
+ var tracksFromMeta = []
+
+ audioFiles.forEach((af) => {
+ if (af.discNumFromFilename !== null) discsFromFilename.push(af.discNumFromFilename)
+ if (af.discNumFromMeta !== null) discsFromMeta.push(af.discNumFromMeta)
+ if (af.trackNumFromFilename !== null) tracksFromFilename.push(af.trackNumFromFilename)
+ if (af.trackNumFromMeta !== null) tracksFromMeta.push(af.trackNumFromMeta)
+ af.validateTrackIndex() // Sets error if no valid track number
+ })
+ discsFromFilename.sort((a, b) => a - b)
+ discsFromMeta.sort((a, b) => a - b)
+ tracksFromFilename.sort((a, b) => a - b)
+ tracksFromMeta.sort((a, b) => a - b)
+
+ var discKey = null
+ if (discsFromMeta.length === audioFiles.length && this.isSequential(discsFromMeta)) {
+ discKey = 'discNumFromMeta'
+ } else if (discsFromFilename.length === audioFiles.length && this.isSequential(discsFromFilename)) {
+ discKey = 'discNumFromFilename'
+ }
+
+ var trackKey = null
+ tracksFromFilename = this.removeDupes(tracksFromFilename)
+ tracksFromMeta = this.removeDupes(tracksFromMeta)
+ if (tracksFromFilename.length > tracksFromMeta.length) {
+ trackKey = 'trackNumFromFilename'
+ } else {
+ trackKey = 'trackNumFromMeta'
+ }
+
+
+ if (discKey !== null) {
+ Logger.debug(`[AudioFileScanner] Smart track order for "${audiobook.title}" using disc key ${discKey} and track key ${trackKey}`)
+ audioFiles.sort((a, b) => {
+ let Dx = a[discKey] - b[discKey]
+ if (Dx === 0) Dx = a[trackKey] - b[trackKey]
+ return Dx
+ })
+ } else {
+ Logger.debug(`[AudioFileScanner] Smart track order for "${audiobook.title}" using track key ${trackKey}`)
+ audioFiles.sort((a, b) => a[trackKey] - b[trackKey])
+ }
+
+ for (let i = 0; i < audioFiles.length; i++) {
+ audioFiles[i].index = i + 1
+ var existingAF = audiobook.getAudioFileByIno(audioFiles[i].ino)
+ if (existingAF) {
+ audiobook.updateAudioFile(audioFiles[i])
+ } else {
+ audiobook.addAudioFile(audioFiles[i])
+ }
+ }
+ }
+
async scanAudioFiles(audioFileDataArray, bookScanData, audiobook, preferAudioMetadata, libraryScan = null) {
var hasUpdated = false
@@ -114,37 +176,34 @@ class AudioFileScanner {
libraryScan.addLog(LogLevel.DEBUG, `Book "${bookScanData.path}" Audio file scan took ${audioScanResult.elapsed}ms for ${audioScanResult.audioFiles.length} with average time of ${audioScanResult.averageScanDuration}ms`)
}
- var totalAudioFilesToInclude = audiobook.audioFilesToInclude.filter(af => !audioScanResult.audioFiles.find(_af => _af.ino === af.ino)).length + audioScanResult.audioFiles.length
+ var totalAudioFilesToInclude = audioScanResult.audioFiles.length
+ var newAudioFiles = audioScanResult.audioFiles.filter(af => {
+ return !audiobook.audioFilesToInclude.find(_af => _af.ino === af.ino)
+ })
- // validate & add/update audio files to audiobook
- for (let i = 0; i < audioScanResult.audioFiles.length; i++) {
- var newAF = audioScanResult.audioFiles[i]
- var existingAF = audiobook.getAudioFileByIno(newAF.ino)
-
- var trackIndex = null
- if (totalAudioFilesToInclude === 1) { // Single track audiobooks
- trackIndex = 1
- } else if (existingAF && existingAF.manuallyVerified) { // manually verified audio files use existing index
- trackIndex = existingAF.index
+ if (newAudioFiles.length) {
+ // Single Track Audiobooks
+ if (totalAudioFilesToInclude === 1) {
+ var af = audioScanResult.audioFiles[0]
+ af.index = 1
+ audiobook.addAudioFile(af)
+ hasUpdated = true
} else {
- trackIndex = newAF.validateTrackIndex()
- }
-
- if (trackIndex !== null) {
- if (audiobook.checkHasTrackNum(trackIndex, newAF.ino)) {
- newAF.setDuplicateTrackNumber(trackIndex)
- } else {
- newAF.index = trackIndex
- }
- }
- if (existingAF) {
- if (audiobook.updateAudioFile(newAF)) {
- hasUpdated = true
- }
- } else {
- audiobook.addAudioFile(newAF)
+ this.runSmartTrackOrder(audiobook, audioScanResult.audioFiles)
hasUpdated = true
}
+ } else {
+ Logger.debug(`[AudioFileScanner] No audio track re-order required`)
+ // Only update metadata not index
+ audioScanResult.audioFiles.forEach((af) => {
+ var existingAF = audiobook.getAudioFileByIno(af.ino)
+ if (existingAF) {
+ af.index = existingAF.index
+ if (audiobook.updateAudioFile(af)) {
+ hasUpdated = true
+ }
+ }
+ })
}
// Set book details from audio file ID3 tags, optional prefer
diff --git a/server/scanner/AudioProbeData.js b/server/scanner/AudioProbeData.js
index 0fd294ec..05e09891 100644
--- a/server/scanner/AudioProbeData.js
+++ b/server/scanner/AudioProbeData.js
@@ -19,6 +19,9 @@ class AudioProbeData {
this.trackNumber = null
this.trackTotal = null
+
+ this.discNumber = null
+ this.discTotal = null
}
getEmbeddedCoverArt(videoStream) {
@@ -55,10 +58,22 @@ class AudioProbeData {
if (this.audioFileMetadata.tagTrack) {
var trackParts = this.audioFileMetadata.tagTrack.split('/').map(part => Number(part))
if (trackParts.length > 0) {
- this.trackNumber = trackParts[0]
+ // Fractional track numbers not supported
+ this.trackNumber = !isNaN(trackParts[0]) ? Math.trunc(trackParts[0]) : null
}
if (trackParts.length > 1) {
- this.trackTotal = trackParts[1]
+ this.trackTotal = !isNaN(trackParts[1]) ? trackParts[1] : null
+ }
+ }
+
+ // Parse disc tag
+ if (this.audioFileMetadata.tagDisc) {
+ var discParts = this.audioFileMetadata.tagDisc.split('/').map(p => Number(p))
+ if (discParts.length > 0) {
+ this.discNumber = !isNaN(discParts[0]) ? Math.trunc(discParts[0]) : null
+ }
+ if (discParts.length > 1) {
+ this.discTotal = !isNaN(discParts[1]) ? discParts[1] : null
}
}
}
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index 177d5db0..cf6aea17 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -322,7 +322,7 @@ class Scanner {
}
async rescanAudiobook(audiobookCheckData, libraryScan) {
- const { newAudioFileData, newOtherFileData, audiobook, bookScanData, updated, existingAudioFileData, existingOtherFileData } = audiobookCheckData
+ const { newAudioFileData, audioFilesRemoved, newOtherFileData, audiobook, bookScanData, updated, existingAudioFileData, existingOtherFileData } = audiobookCheckData
libraryScan.addLog(LogLevel.DEBUG, `Library "${libraryScan.libraryName}" Re-scanning "${audiobook.path}"`)
var hasUpdated = updated
@@ -342,7 +342,7 @@ class Scanner {
}
}
// Scan new audio files
- if (newAudioFileData.length) {
+ if (newAudioFileData.length || audioFilesRemoved.length) {
if (await AudioFileScanner.scanAudioFiles(newAudioFileData, bookScanData, audiobook, libraryScan.preferAudioMetadata, libraryScan)) {
hasUpdated = true
}
@@ -459,11 +459,38 @@ class Scanner {
async scanFolderUpdates(library, folder, fileUpdateBookGroup) {
Logger.debug(`[Scanner] Scanning file update groups in folder "${folder.id}" of library "${library.name}"`)
+ // First pass - Remove files in parent dirs of audiobooks and remap the fileupdate group
+ // Test Case: Moving audio files from audiobook folder to author folder should trigger a re-scan of audiobook
+ var updateGroup = { ...fileUpdateBookGroup }
+ for (const bookDir in updateGroup) {
+ var bookDirNestedFiles = fileUpdateBookGroup[bookDir].filter(b => b.includes('/'))
+ if (!bookDirNestedFiles.length) continue;
+
+ var firstNest = bookDirNestedFiles[0].split('/').shift()
+ var altDir = `${bookDir}/${firstNest}`
+
+ var fullPath = Path.posix.join(folder.fullPath.replace(/\\/g, '/'), bookDir)
+ var childAudiobook = this.db.audiobooks.find(ab => ab.fullPath !== fullPath && ab.fullPath.startsWith(fullPath))
+ if (!childAudiobook) {
+ continue;
+ }
+ var altFullPath = Path.posix.join(folder.fullPath.replace(/\\/g, '/'), altDir)
+ var altChildAudiobook = this.db.audiobooks.find(ab => ab.fullPath !== altFullPath && ab.fullPath.startsWith(altFullPath))
+ if (altChildAudiobook) {
+ continue;
+ }
+
+ delete fileUpdateBookGroup[bookDir]
+ fileUpdateBookGroup[altDir] = bookDirNestedFiles.map((f) => f.split('/').slice(1).join('/'))
+ Logger.warn(`[Scanner] Some files were modified in a parent directory of an audiobook "${childAudiobook.title}" - ignoring`)
+ }
+
+ // Second pass: Check for new/updated/removed audiobooks
var bookGroupingResults = {}
for (const bookDir in fileUpdateBookGroup) {
var fullPath = Path.posix.join(folder.fullPath.replace(/\\/g, '/'), bookDir)
- // Check if book dir group is already an audiobook or in a subdir of an audiobook
+ // Check if book dir group is already an audiobook
var existingAudiobook = this.db.audiobooks.find(ab => fullPath.startsWith(ab.fullPath))
if (existingAudiobook) {
@@ -519,7 +546,8 @@ class Scanner {
titleDistance: 2,
authorDistance: 2
}
- var results = await this.bookFinder.findCovers('google', audiobook.title, audiobook.authorFL, options)
+ var scannerCoverProvider = this.db.serverSettings.scannerCoverProvider
+ var results = await this.bookFinder.findCovers(scannerCoverProvider, audiobook.title, audiobook.authorFL, options)
if (results.length) {
if (libraryScan) libraryScan.addLog(LogLevel.DEBUG, `Found best cover for "${audiobook.title}"`)
else Logger.debug(`[Scanner] Found best cover for "${audiobook.title}"`)
diff --git a/server/utils/constants.js b/server/utils/constants.js
index 868d223d..7d0e094d 100644
--- a/server/utils/constants.js
+++ b/server/utils/constants.js
@@ -16,6 +16,11 @@ module.exports.BookCoverAspectRatio = {
SQUARE: 1
}
+module.exports.BookshelfView = {
+ STANDARD: 0,
+ TITLES: 1
+}
+
module.exports.LogLevel = {
TRACE: 0,
DEBUG: 1,
diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js
index 2d012587..ff2636ed 100644
--- a/server/utils/libraryHelpers.js
+++ b/server/utils/libraryHelpers.js
@@ -11,7 +11,7 @@ module.exports = {
getFiltered(audiobooks, filterBy, user) {
var filtered = audiobooks
- var searchGroups = ['genres', 'tags', 'series', 'authors', 'progress', 'narrators']
+ var searchGroups = ['genres', 'tags', 'series', 'authors', 'progress', 'narrators', 'languages']
var group = searchGroups.find(_group => filterBy.startsWith(_group + '.'))
if (group) {
var filterVal = filterBy.replace(`${group}.`, '')
@@ -33,6 +33,8 @@ module.exports = {
if (filter === 'In Progress' && (userAudiobook && !userAudiobook.isRead && userAudiobook.progress > 0)) return true
return false
})
+ } else if (group === 'languages') {
+ filtered = filtered.filter(ab => ab.book && ab.book.language === filter)
}
} else if (filterBy === 'issues') {
filtered = filtered.filter(ab => {
@@ -49,7 +51,8 @@ module.exports = {
genres: [],
tags: [],
series: [],
- narrators: []
+ narrators: [],
+ languages: []
}
audiobooks.forEach((ab) => {
if (ab.book._authorsList.length) {
@@ -73,7 +76,14 @@ module.exports = {
if (narrator && !data.narrators.includes(narrator)) data.narrators.push(narrator)
})
}
+ if (ab.book._language && !data.languages.includes(ab.book._language)) data.languages.push(ab.book._language)
})
+ data.authors = naturalSort(data.authors).asc()
+ data.genres = naturalSort(data.genres).asc()
+ data.tags = naturalSort(data.tags).asc()
+ data.series = naturalSort(data.series).asc()
+ data.narrators = naturalSort(data.narrators).asc()
+ data.languages = naturalSort(data.languages).asc()
return data
},
@@ -113,7 +123,7 @@ module.exports = {
userAudiobook: user.getAudiobookJSON(book.id),
book
}
- })
+ }).filter(b => !!b.userAudiobook)
},
getBooksMostRecentlyRead(booksWithUserAb, limit, minified = false) {
@@ -177,12 +187,20 @@ module.exports = {
return Object.values(authorsMap).sort((a, b) => b.count - a.count)
},
- getAudiobooksTotalDuration(audiobooks) {
+ getAudiobookDurationStats(audiobooks) {
+ var sorted = sort(audiobooks).desc(a => a.duration)
+ var top10 = sorted.slice(0, 10).map(ab => ({ title: ab.book.title, duration: ab.duration })).filter(ab => ab.duration > 0)
var totalDuration = 0
+ var numAudioTracks = 0
audiobooks.forEach((ab) => {
totalDuration += ab.duration
+ numAudioTracks += ab.tracks.length
})
- return totalDuration
+ return {
+ totalDuration,
+ numAudioTracks,
+ longstAudiobooks: top10
+ }
},
getAudiobooksTotalSize(audiobooks) {
diff --git a/server/utils/prober.js b/server/utils/prober.js
index d8b48827..a6e79f39 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -1,4 +1,4 @@
-var Ffmpeg = require('fluent-ffmpeg')
+const ffprobe = require('node-ffprobe')
const Path = require('path')
const AudioProbeData = require('../scanner/AudioProbeData')
@@ -125,15 +125,37 @@ function parseMediaStreamInfo(stream, all_streams, total_bit_rate) {
return info
}
+function isNullOrNaN(val) {
+ return val === null || isNaN(val)
+}
+
+
+/* Example chapter object
+ * {
+ "id": 71,
+ "time_base": "1/1000",
+ "start": 80792671,
+ "start_time": "80792.671000",
+ "end": 81084755,
+ "end_time": "81084.755000",
+ "tags": {
+ "title": "072"
+ }
+ * }
+ */
function parseChapters(chapters) {
if (!chapters) return []
return chapters.map(chap => {
var title = chap['TAG:title'] || chap.title || ''
+ if (!title && chap.tags && chap.tags.title) title = chap.tags.title
+
var timebase = chap.time_base && chap.time_base.includes('/') ? Number(chap.time_base.split('/')[1]) : 1
+ var start = !isNullOrNaN(chap.start_time) ? Number(chap.start_time) : !isNullOrNaN(chap.start) ? Number(chap.start) / timebase : 0
+ var end = !isNullOrNaN(chap.end_time) ? Number(chap.end_time) : !isNullOrNaN(chap.end) ? Number(chap.end) / timebase : 0
return {
id: chap.id,
- start: !isNaN(chap.start_time) ? chap.start_time : (chap.start / timebase),
- end: chap.end_time || (chap.end / timebase),
+ start,
+ end,
title
}
})
@@ -152,6 +174,7 @@ function parseTags(format, verbose) {
file_tag_title: tryGrabTags(format, 'title', 'tit2', 'tt2'),
file_tag_subtitle: tryGrabTags(format, 'subtitle', 'tit3', 'tt3'),
file_tag_track: tryGrabTags(format, 'track', 'trck', 'trk'),
+ file_tag_disc: tryGrabTags(format, 'discnumber', 'disc', 'disk', 'tpos'),
file_tag_album: tryGrabTags(format, 'album', 'talb', 'tal'),
file_tag_artist: tryGrabTags(format, 'artist', 'tpe1', 'tp1'),
file_tag_albumartist: tryGrabTags(format, 'albumartist', 'album_artist', 'tpe2'),
@@ -163,6 +186,9 @@ function parseTags(format, verbose) {
file_tag_genre: tryGrabTags(format, 'genre', 'tcon', 'tco'),
file_tag_series: tryGrabTag(format, 'series'),
file_tag_seriespart: tryGrabTag(format, 'series-part'),
+ file_tag_isbn: tryGrabTag(format, 'isbn'),
+ file_tag_language: tryGrabTags(format, 'language', 'lang'),
+ file_tag_asin: tryGrabTag(format, 'asin'),
// Not sure if these are actually used yet or not
file_tag_creation_time: tryGrabTag(format, 'creation_time'),
@@ -180,7 +206,7 @@ function parseTags(format, verbose) {
}
}
- var keysToLookOutFor = ['file_tag_genre1', 'file_tag_genre2', 'file_tag_series', 'file_tag_seriespart', 'file_tag_movement', 'file_tag_movementname', 'file_tag_wwwaudiofile', 'file_tag_contentgroup', 'file_tag_releasetime']
+ var keysToLookOutFor = ['file_tag_genre1', 'file_tag_genre2', 'file_tag_series', 'file_tag_seriespart', 'file_tag_movement', 'file_tag_movementname', 'file_tag_wwwaudiofile', 'file_tag_contentgroup', 'file_tag_releasetime', 'file_tag_isbn']
keysToLookOutFor.forEach((key) => {
if (tags[key]) {
Logger.debug(`Notable! ${key} => ${tags[key]}`)
@@ -252,27 +278,27 @@ function parseProbeData(data, verbose = false) {
// Updated probe returns AudioProbeData object
function probe(filepath, verbose = false) {
- return new Promise((resolve) => {
- Ffmpeg.ffprobe(filepath, ['-show_chapters'], (err, raw) => {
- if (err) {
- console.error(err)
- var errorMsg = err ? err.message : null
- resolve({
- error: errorMsg || 'Probe Error'
- })
- } else {
- var rawProbeData = parseProbeData(raw, verbose)
- if (!rawProbeData || !rawProbeData.audio_stream) {
- resolve({
- error: rawProbeData ? 'Invalid audio file: no audio streams found' : 'Probe Failed'
- })
- } else {
- var probeData = new AudioProbeData()
- probeData.setData(rawProbeData)
- resolve(probeData)
+ var options = {}
+ if (process.env.FFPROBE_PATH) {
+ options.path = process.env.FFPROBE_PATH
+ }
+ return ffprobe(filepath, options)
+ .then(raw => {
+ var rawProbeData = parseProbeData(raw, verbose)
+ if (!rawProbeData || !rawProbeData.audio_stream) {
+ return {
+ error: rawProbeData ? 'Invalid audio file: no audio streams found' : 'Probe Failed'
}
+ } else {
+ var probeData = new AudioProbeData()
+ probeData.setData(rawProbeData)
+ return probeData
+ }
+ })
+ .catch((err) => {
+ return {
+ error: err
}
})
- })
}
module.exports.probe = probe
\ No newline at end of file