groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-12-23 12:19:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into auth_passportjs

Browse source
This commit is contained in:
lukeIam 2023-09-20 17:34:29 +01:00
commit 51b0750a3f
24 changed files with 118 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/objects/files/EBookFile.js
View file

@ -16,7 +16,7 @@ class EBookFile {
construct(file) {
this.ino = file.ino
this.metadata = new FileMetadata(file.metadata)
this.ebookFormat = file.ebookFormat
this.ebookFormat = file.ebookFormat || this.metadata.format
this.addedAt = file.addedAt
this.updatedAt = file.updatedAt
}

4
server/objects/mediaTypes/Book.js
View file

@ -73,7 +73,7 @@ class Book {
numInvalidAudioFiles: this.invalidAudioFiles.length,
duration: this.duration,
size: this.size,
ebookFormat: this.ebookFile ? this.ebookFile.ebookFormat : null
ebookFormat: this.ebookFile?.ebookFormat
}
}
@ -90,7 +90,7 @@ class Book {
size: this.size,
tracks: this.tracks.map(t => t.toJSON()),
missingParts: [...this.missingParts],
ebookFile: this.ebookFile ? this.ebookFile.toJSON() : null
ebookFile: this.ebookFile?.toJSON() || null
}
}