michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-04-27 02:11:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: allow plugins to customize python installs (#1542)

Browse Source 
* server: allow plugins to customize python installs

* move options inside pythonVersion
This commit is contained in:
Brett Jia
2024-08-13 21:18:39 -04:00
committed by GitHub
parent 407f573a29
commit 0bc6fadb23
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/plugin/runtime/python-worker.ts
View File

@@ -116,6 +116,8 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
if (process.env.SCRYPTED_PORTABLE_PYTHON && !pluginPythonVersion)
pluginPythonVersion = packagedPythonVersion;
let portablePythonOptions = options.packageJson.scrypted.pythonVersion?.options?.[os.platform()]?.[os.arch()] || options.packageJson.scrypted.pythonVersion?.options?.default || {};
// if the plugin requests a specific python, then install it via portable python
if (!pluginPythonVersion) {
setup();
@@ -148,7 +150,7 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
const pyPath = path.join(getPluginVolume(pluginId), 'py');
const portableInstallPath = path.join(pyPath, pyVersion);
const py = new PortablePython(pluginPythonVersion, portableInstallPath);
const py = new PortablePython(pluginPythonVersion, portableInstallPath, portablePythonOptions);
if (fs.existsSync(py.executablePath)) {
pythonPath = py.executablePath;
finishSetup();
@@ -158,7 +160,7 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
try {
this.pythonInstallationComplete = false;
await fs.promises.rm(pyPath, { recursive: true, force: true }).catch(() => { });
pythonPath = await installScryptedServerRequirements(pluginPythonVersion, portableInstallPath);
pythonPath = await installScryptedServerRequirements(pluginPythonVersion, portableInstallPath, portablePythonOptions);
finishSetup();
}
catch (e) {