Merge branch 'main' into jan-182-drake
This commit is contained in:
commit
026cdb8b20
@ -12,8 +12,11 @@ module.exports = {
|
|||||||
],
|
],
|
||||||
rules: {
|
rules: {
|
||||||
"@typescript-eslint/no-non-null-assertion": "off",
|
"@typescript-eslint/no-non-null-assertion": "off",
|
||||||
quotes: ["error", "single"],
|
|
||||||
"react/prop-types": "off", // In favor of strong typing - no need to dedupe
|
"react/prop-types": "off", // In favor of strong typing - no need to dedupe
|
||||||
|
"@typescript-eslint/no-var-requires": "off",
|
||||||
|
"@typescript-eslint/ban-ts-comment": "off",
|
||||||
|
"@typescript-eslint/no-unused-vars": "off",
|
||||||
|
"@typescript-eslint/no-explicit-any": "off",
|
||||||
},
|
},
|
||||||
settings: {
|
settings: {
|
||||||
react: {
|
react: {
|
||||||
|
|||||||
@ -2,6 +2,7 @@ const path = require("path");
|
|||||||
const { app, dialog } = require("electron");
|
const { app, dialog } = require("electron");
|
||||||
const { spawn } = require("child_process");
|
const { spawn } = require("child_process");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
|
var exec = require("child_process").exec;
|
||||||
|
|
||||||
let subprocess = null;
|
let subprocess = null;
|
||||||
|
|
||||||
@ -34,10 +35,10 @@ async function initModel(product) {
|
|||||||
killSubprocess();
|
killSubprocess();
|
||||||
}
|
}
|
||||||
|
|
||||||
let binaryFolder = `${__dirname}/nitro`; // Current directory by default
|
let binaryFolder = path.join(__dirname, "nitro"); // Current directory by default
|
||||||
|
|
||||||
// Read the existing config
|
// Read the existing config
|
||||||
const configFilePath = `${binaryFolder}/config/config.json`;
|
const configFilePath = path.join(binaryFolder, "config", "config.json");
|
||||||
let config = {};
|
let config = {};
|
||||||
if (fs.existsSync(configFilePath)) {
|
if (fs.existsSync(configFilePath)) {
|
||||||
const rawData = fs.readFileSync(configFilePath, "utf-8");
|
const rawData = fs.readFileSync(configFilePath, "utf-8");
|
||||||
@ -56,8 +57,13 @@ async function initModel(product) {
|
|||||||
// Write the updated config back to the file
|
// Write the updated config back to the file
|
||||||
fs.writeFileSync(configFilePath, JSON.stringify(config, null, 4));
|
fs.writeFileSync(configFilePath, JSON.stringify(config, null, 4));
|
||||||
|
|
||||||
|
const binaryPath =
|
||||||
|
process.platform === "win32"
|
||||||
|
? path.join(binaryFolder, "nitro.exe")
|
||||||
|
: path.join(binaryFolder, "nitro");
|
||||||
// Execute the binary
|
// Execute the binary
|
||||||
subprocess = spawn(`${binaryFolder}/nitro`, [configFilePath]);
|
|
||||||
|
subprocess = spawn(binaryPath, [configFilePath], {cwd: binaryFolder});
|
||||||
|
|
||||||
// Handle subprocess output
|
// Handle subprocess output
|
||||||
subprocess.stdout.on("data", (data) => {
|
subprocess.stdout.on("data", (data) => {
|
||||||
|
|||||||
BIN
electron/core/plugins/inference-plugin/nitro/nitro.exe
Normal file
BIN
electron/core/plugins/inference-plugin/nitro/nitro.exe
Normal file
Binary file not shown.
BIN
electron/core/plugins/inference-plugin/nitro/zlib.dll
Normal file
BIN
electron/core/plugins/inference-plugin/nitro/zlib.dll
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user