Mirrors/audiobookshelf
Mirrors/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-03-19 00:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/advplyr/audiobookshelf

Browse Source
This commit is contained in:
advplyr 2022-05-22 08:14:42 -05:00
commit f2e16017f6
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/objects/metadata/BookMetadata.js
View File

@ -194,7 +194,7 @@ class BookMetadata {
setData(scanMediaData = {}) { setData(scanMediaData = {}) {
this.title = scanMediaData.title || null this.title = scanMediaData.title || null
this.subtitle = scanMediaData.subtitle || null this.subtitle = scanMediaData.subtitle || null
this.narrators = [] this.narrators = this.parseNarratorsTag(scanMediaData.narrators)
this.publishedYear = scanMediaData.publishedYear || null this.publishedYear = scanMediaData.publishedYear || null
this.description = scanMediaData.description || null this.description = scanMediaData.description || null
this.isbn = scanMediaData.isbn || null this.isbn = scanMediaData.isbn || null
@ -356,4 +356,4 @@ class BookMetadata {
return null return null
} }
} }
module.exports = BookMetadata module.exports = BookMetadata

14
server/utils/scandir.js
View File

@ -212,7 +212,8 @@ function getBookDataFromDir(folderPath, relPath, parseSubtitle = false) {
var splitDir = relPath.split('/') var splitDir = relPath.split('/')
// Audio files will always be in the directory named for the title // Audio files will always be in the directory named for the title
var title = splitDir.pop() var [title, narrators] = getTitleAndNarrator(splitDir.pop())
var series = null var series = null
var author = null var author = null
// If there are at least 2 more directories, next furthest will be the series // If there are at least 2 more directories, next furthest will be the series
@ -265,7 +266,7 @@ function getBookDataFromDir(folderPath, relPath, parseSubtitle = false) {
// If Title is of format 1999 OR (1999) - Title, then use 1999 as publish year // If Title is of format 1999 OR (1999) - Title, then use 1999 as publish year
var publishYearMatch = title.match(/^(\(?[0-9]{4}\)?) - (.+)/) var publishYearMatch = title.match(/^(\(?[0-9]{4}\)?) - (.+)/)
if (publishYearMatch && publishYearMatch.length > 2 && publishYearMatch[1]) { if (publishYearMatch && publishYearMatch.length > 2 && publishYearMatch[1]) {
// Strip parentheses // Strip parentheses
if (publishYearMatch[1].startsWith('(') && publishYearMatch[1].endsWith(')')) { if (publishYearMatch[1].startsWith('(') && publishYearMatch[1].endsWith(')')) {
publishYearMatch[1] = publishYearMatch[1].slice(1, -1) publishYearMatch[1] = publishYearMatch[1].slice(1, -1)
} }
@ -292,12 +293,19 @@ function getBookDataFromDir(folderPath, relPath, parseSubtitle = false) {
series, series,
sequence: volumeNumber, sequence: volumeNumber,
publishedYear, publishedYear,
narrators,
}, },
relPath: relPath, // relative audiobook path i.e. /Author Name/Book Name/.. relPath: relPath, // relative audiobook path i.e. /Author Name/Book Name/..
path: Path.posix.join(folderPath, relPath) // i.e. /audiobook/Author Name/Book Name/.. path: Path.posix.join(folderPath, relPath) // i.e. /audiobook/Author Name/Book Name/..
} }
} }
function getTitleAndNarrator(folder) {
let pattern = /^(?<title>.*)\{(?<narrators>.*)\} *$/
let match = folder.match(pattern)
return match ? [match.groups.title.trimEnd(), match.groups.narrators] : [folder, null]
}
function getPodcastDataFromDir(folderPath, relPath) { function getPodcastDataFromDir(folderPath, relPath) {
relPath = relPath.replace(/\\/g, '/') relPath = relPath.replace(/\\/g, '/')
var splitDir = relPath.split('/') var splitDir = relPath.split('/')
@ -356,4 +364,4 @@ async function getLibraryItemFileData(libraryMediaType, folder, libraryItemPath,
} }
return libraryItem return libraryItem
} }
module.exports.getLibraryItemFileData = getLibraryItemFileData module.exports.getLibraryItemFileData = getLibraryItemFileData