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

Fixes reading multiline data from file tags

Browse Source 
Swiched fluent-ffmpeg to node-ffprobe.
Fluent's ffprobe can't handle multiline tag data due to it's parsing process.
node-ffprobe supports getting probe data using json format which keeps line changes.
This commit is contained in:
ISO-B 2022-01-07 15:15:53 +02:00
parent cfba1c8ec5
commit dc05c38430
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -41,6 +41,7 @@
"jsonwebtoken": "^8.5.1",
"libgen": "^2.1.0",
"njodb": "^0.4.27",
"node-ffprobe": "^3.0.0",
"node-cron": "^3.0.0",
"node-stream-zip": "^1.15.0",
"podcast": "^1.3.0",
@ -52,4 +53,4 @@
"xml2js": "^0.4.23"
},
"devDependencies": {}
}
}

37
server/utils/prober.js
View File

@ -1,4 +1,5 @@
var Ffmpeg = require('fluent-ffmpeg')
const ffprobe = require('node-ffprobe')
const Path = require('path')
const AudioProbeData = require('../scanner/AudioProbeData')
@ -128,7 +129,7 @@ function parseMediaStreamInfo(stream, all_streams, total_bit_rate) {
function parseChapters(chapters) {
if (!chapters) return []
return chapters.map(chap => {
var title = chap['TAG:title'] || chap.title || ''
var title = chap['TAG:title'] || chap.title || chap.tags.title || ''
var timebase = chap.time_base && chap.time_base.includes('/') ? Number(chap.time_base.split('/')[1]) : 1
return {
id: chap.id,
@ -253,27 +254,23 @@ 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)
return ffprobe(filepath)
.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