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

Fix:FFprobe path for node-ffprobe

Browse Source
This commit is contained in:
advplyr 2022-02-06 17:14:55 -06:00
parent 0336b65bca
commit c0c4b1fa23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/Server.js
View File

@ -428,7 +428,7 @@ class Server {
var exists = await fs.pathExists(outputDirectory) var exists = await fs.pathExists(outputDirectory)
if (exists) { if (exists) {
Logger.error(`[Server] Upload directory "${outputDirectory}" already exists`) Logger.error(`[Server] Upload directory "${outputDirectory}" already exists`)
return res.status(500).error(`Directory "${outputDirectory}" already exists`) return res.status(500).send(`Directory "${outputDirectory}" already exists`)
} }
await fs.ensureDir(outputDirectory) await fs.ensureDir(outputDirectory)

11
server/utils/prober.js
View File

@ -1,5 +1,8 @@
const ffprobe = require('node-ffprobe') const ffprobe = require('node-ffprobe')
const Path = require('path')
if (process.env.FFPROBE_PATH) {
ffprobe.FFPROBE_PATH = process.env.FFPROBE_PATH
}
const AudioProbeData = require('../scanner/AudioProbeData') const AudioProbeData = require('../scanner/AudioProbeData')
@ -278,11 +281,7 @@ function parseProbeData(data, verbose = false) {
// Updated probe returns AudioProbeData object // Updated probe returns AudioProbeData object
function probe(filepath, verbose = false) { function probe(filepath, verbose = false) {
var options = {} return ffprobe(filepath)
if (process.env.FFPROBE_PATH) {
options.path = process.env.FFPROBE_PATH
}
return ffprobe(filepath, options)
.then(raw => { .then(raw => {
var rawProbeData = parseProbeData(raw, verbose) var rawProbeData = parseProbeData(raw, verbose)
if (!rawProbeData || !rawProbeData.audio_stream) { if (!rawProbeData || !rawProbeData.audio_stream) {