From c0c4b1fa23e6a34859c93a7c1be92905f57cad02 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 6 Feb 2022 17:14:55 -0600
Subject: [PATCH] Fix:FFprobe path for node-ffprobe

---
 server/Server.js       |  2 +-
 server/utils/prober.js | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/server/Server.js b/server/Server.js
index 10eeae8a..3c140596 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -428,7 +428,7 @@ class Server {
     var exists = await fs.pathExists(outputDirectory)
     if (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)
diff --git a/server/utils/prober.js b/server/utils/prober.js
index a6e79f39..bc8623e1 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -1,5 +1,8 @@
 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')
 
@@ -278,11 +281,7 @@ function parseProbeData(data, verbose = false) {
 
 // Updated probe returns AudioProbeData object
 function probe(filepath, verbose = false) {
-  var options = {}
-  if (process.env.FFPROBE_PATH) {
-    options.path = process.env.FFPROBE_PATH
-  }
-  return ffprobe(filepath, options)
+  return ffprobe(filepath)
     .then(raw => {
       var rawProbeData = parseProbeData(raw, verbose)
       if (!rawProbeData || !rawProbeData.audio_stream) {