From 017b5991701bde012a75fc433b696b7fdf5790e7 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 11 Feb 2023 09:35:08 -0800 Subject: [PATCH] server/windows: add support for python version when used with py.exe --- server/package-lock.json | 4 ++-- server/package.json | 2 +- server/src/plugin/runtime/python-worker.ts | 10 +++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 8c9fbbebc..d02e31d99 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.6.14", + "version": "0.6.15", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.6.14", + "version": "0.6.15", "license": "ISC", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", diff --git a/server/package.json b/server/package.json index 4fbb12974..a4816675a 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/server", - "version": "0.6.14", + "version": "0.6.15", "description": "", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", diff --git a/server/src/plugin/runtime/python-worker.ts b/server/src/plugin/runtime/python-worker.ts index da6b47782..af099537a 100644 --- a/server/src/plugin/runtime/python-worker.ts +++ b/server/src/plugin/runtime/python-worker.ts @@ -46,7 +46,15 @@ export class PythonRuntimeWorker extends ChildProcessWorker { } } - const pythonPath = process.env.SCRYPTED_PYTHON_PATH || (os.platform() === 'win32' ? 'py.exe' : 'python3'); + let pythonPath = process.env.SCRYPTED_PYTHON_PATH; + if (os.platform() === 'win32') { + pythonPath ||= 'py.exe'; + if (process.env.SCRYPTED_WINDOWS_PYTHON_VERSION) + args.unshift(process.env.SCRYPTED_WINDOWS_PYTHON_VERSION) + } + else { + pythonPath ||= 'python3'; + } this.worker = child_process.spawn(pythonPath, args, { // stdin, stdout, stderr, peer in, peer out