From 022c506eda8312015219d91348f318866383967c Mon Sep 17 00:00:00 2001 From: Nick Thomson Date: Sat, 24 Sep 2022 22:50:21 +0100 Subject: [PATCH 1/3] Possible fix for issue #1004 --- server/libs/nodeFfprobe/index.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/libs/nodeFfprobe/index.js b/server/libs/nodeFfprobe/index.js index a6d78233..ec52ef2a 100644 --- a/server/libs/nodeFfprobe/index.js +++ b/server/libs/nodeFfprobe/index.js @@ -20,7 +20,14 @@ module.exports = (function () { proc.on('exit', code => { exitCode = code }) proc.on('error', err => reject(err)) - proc.on('close', () => resolve(JSON.parse(probeData.join('')))) + proc.on('close', () => { + try { + let result = JSON.parse(probeData.join('')) + resolve(result); + } catch (err) { + reject(err); + } + }) }) } From dd0d2e9f55fe032eecd1dffd3226d3a287af8593 Mon Sep 17 00:00:00 2001 From: Nick Thomson Date: Sat, 24 Sep 2022 22:51:17 +0100 Subject: [PATCH 2/3] Fix tabs --- server/libs/nodeFfprobe/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/libs/nodeFfprobe/index.js b/server/libs/nodeFfprobe/index.js index ec52ef2a..e082d7a5 100644 --- a/server/libs/nodeFfprobe/index.js +++ b/server/libs/nodeFfprobe/index.js @@ -21,13 +21,13 @@ module.exports = (function () { proc.on('exit', code => { exitCode = code }) proc.on('error', err => reject(err)) proc.on('close', () => { - try { - let result = JSON.parse(probeData.join('')) - resolve(result); - } catch (err) { - reject(err); - } - }) + try { + let result = JSON.parse(probeData.join('')) + resolve(result); + } catch (err) { + reject(err); + } + }) }) } From 0f772fd3cf1b3ecc2f58942afe2b1205f9f94301 Mon Sep 17 00:00:00 2001 From: advplyr <67830747+advplyr@users.noreply.github.com> Date: Sat, 24 Sep 2022 17:36:29 -0500 Subject: [PATCH 3/3] Update server/libs/nodeFfprobe/index.js --- server/libs/nodeFfprobe/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/libs/nodeFfprobe/index.js b/server/libs/nodeFfprobe/index.js index e082d7a5..bdab89ad 100644 --- a/server/libs/nodeFfprobe/index.js +++ b/server/libs/nodeFfprobe/index.js @@ -22,8 +22,7 @@ module.exports = (function () { proc.on('error', err => reject(err)) proc.on('close', () => { try { - let result = JSON.parse(probeData.join('')) - resolve(result); + resolve(JSON.parse(probeData.join(''))) } catch (err) { reject(err); }