mirror of
https://github.com/advplyr/audiobookshelf.git
synced 2025-01-22 00:07:52 +01:00
Fix merging embedded chapters for multi-track audiobooks giving incorrect chapter ids #3361
- Also trim chapter titles on probe (remove carriage return)
This commit is contained in:
parent
0da9a04d8e
commit
64e9ac9d8f
@ -499,16 +499,17 @@ class AudioFileScanner {
|
|||||||
// Filter these out and log a warning
|
// Filter these out and log a warning
|
||||||
// See https://github.com/advplyr/audiobookshelf/issues/3361
|
// See https://github.com/advplyr/audiobookshelf/issues/3361
|
||||||
const afChaptersCleaned =
|
const afChaptersCleaned =
|
||||||
file.chapters?.filter((c) => {
|
file.chapters?.filter((c, i) => {
|
||||||
if (c.end - c.start < 0.1) {
|
if (c.end - c.start < 0.1) {
|
||||||
libraryScan.addLog(LogLevel.WARN, `Chapter "${c.title}" has invalid duration of ${c.end - c.start} seconds. Skipping this chapter.`)
|
libraryScan.addLog(LogLevel.WARN, `Audio file "${file.metadata.filename}" Chapter "${c.title}" (index ${i}) has invalid duration of ${c.end - c.start} seconds. Skipping this chapter.`)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
}) || []
|
}) || []
|
||||||
const afChapters = afChaptersCleaned.map((c) => ({
|
|
||||||
|
const afChapters = afChaptersCleaned.map((c, i) => ({
|
||||||
...c,
|
...c,
|
||||||
id: c.id + currChapterId,
|
id: currChapterId + i,
|
||||||
start: c.start + currStartTime,
|
start: c.start + currStartTime,
|
||||||
end: c.end + currStartTime
|
end: c.end + currStartTime
|
||||||
}))
|
}))
|
||||||
|
@ -143,6 +143,7 @@ function parseChapters(_chapters) {
|
|||||||
.map((chap) => {
|
.map((chap) => {
|
||||||
let title = chap['TAG:title'] || chap.title || ''
|
let title = chap['TAG:title'] || chap.title || ''
|
||||||
if (!title && chap.tags?.title) title = chap.tags.title
|
if (!title && chap.tags?.title) title = chap.tags.title
|
||||||
|
title = title.trim()
|
||||||
|
|
||||||
const timebase = chap.time_base?.includes('/') ? Number(chap.time_base.split('/')[1]) : 1
|
const timebase = chap.time_base?.includes('/') ? Number(chap.time_base.split('/')[1]) : 1
|
||||||
const start = !isNullOrNaN(chap.start_time) ? Number(chap.start_time) : !isNullOrNaN(chap.start) ? Number(chap.start) / timebase : 0
|
const start = !isNullOrNaN(chap.start_time) ? Number(chap.start_time) : !isNullOrNaN(chap.start) ? Number(chap.start) / timebase : 0
|
||||||
|
Loading…
Reference in New Issue
Block a user