extern/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2024-10-06 18:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #692 from cassieesposito/getBookDataFromDir-refactor

Browse Source 
Fixed bugs that caused getSequence to run twice and broke year recognition
This commit is contained in:
advplyr 2022-06-05 18:02:39 -05:00 committed by GitHub
commit ac00f3ebe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/utils/scandir.js
View File

@ -216,7 +216,6 @@ function getBookDataFromDir(folderPath, relPath, parseSubtitle = false) {
// The may contain various other pieces of metadata, these functions extract it. // The may contain various other pieces of metadata, these functions extract it.
var [folder, narrators] = getNarrator(folder) var [folder, narrators] = getNarrator(folder)
if (series) { var [folder, sequence] = getSequence(folder) }
var [folder, sequence] = series ? getSequence(folder) : [folder, null] var [folder, sequence] = series ? getSequence(folder) : [folder, null]
var [folder, publishedYear] = getPublishedYear(folder) var [folder, publishedYear] = getPublishedYear(folder)
var [title, subtitle] = parseSubtitle ? getSubtitle(folder) : [folder, null] var [title, subtitle] = parseSubtitle ? getSubtitle(folder) : [folder, null]
@ -258,7 +257,7 @@ function getSequence(folder) {
// ] // ]
// Matches a valid volume string. Also matches a book whose title starts with a 1 to 3 digit number. Will handle that later. // Matches a valid volume string. Also matches a book whose title starts with a 1 to 3 digit number. Will handle that later.
let pattern = /^(?<volumeLabel>vol\.? |volume |book )?(?<sequence>\d{1,3}(?:\.\d{1,2})?)(?<trailingDot>\.?)(?: (?<suffix>.*))?/i let pattern = /^(?<volumeLabel>vol\.? |volume |book )?(?<sequence>\d{1,3}(?:\.\d{1,2})?)(?<trailingDot>\.?)(?: (?<suffix>.*))?$/i
let volumeNumber = null let volumeNumber = null
let parts = folder.split(' - ') let parts = folder.split(' - ')