From a258f4b16f2aa20a24c9a23d21dbe96be9a688d3 Mon Sep 17 00:00:00 2001 From: codefactor-io Date: Mon, 4 Mar 2024 10:42:55 +0000 Subject: [PATCH] [CodeFactor] Apply fixes --- gui/electron/main/index.ts | 123 +++++++++++----------- gui/src/components/main.vue | 8 +- gui/src/components/main_startup_check.vue | 85 ++++++++------- gui/src/components/settings.vue | 3 - gui/src/components/settings_hamlib.vue | 55 +++++----- gui/src/components/settings_modem.vue | 26 ++--- gui/src/js/eventHandler.js | 27 ++--- gui/src/main.ts | 1 - gui/src/store/audioStore.js | 20 ++-- gui/src/store/serialStore.js | 15 +-- 10 files changed, 182 insertions(+), 181 deletions(-) diff --git a/gui/electron/main/index.ts b/gui/electron/main/index.ts index 0059d66c..112cca9b 100644 --- a/gui/electron/main/index.ts +++ b/gui/electron/main/index.ts @@ -74,7 +74,7 @@ async function createWindow() { // Test actively push message to the Electron-Renderer //win.webContents.on("did-finish-load", () => { - // win?.webContents.send("main-process-message", new Date().toLocaleString()); + // win?.webContents.send("main-process-message", new Date().toLocaleString()); //}); // Make all links open with the browser, not with the application @@ -96,60 +96,62 @@ app.whenReady().then(() => { console.log(platform()); //Generate daemon binary path var serverPath = ""; - console.log(process.env) + console.log(process.env); // Attempt to find Installation Folder - console.log(app.getAppPath()) - console.log(join(app.getAppPath(), '..', '..')) - console.log(join(app.getAppPath(), '..', '..', '..')) + console.log(app.getAppPath()); + console.log(join(app.getAppPath(), "..", "..")); + console.log(join(app.getAppPath(), "..", "..", "..")); //var basePath = join(app.getAppPath(), '..', '..', '..') || join(process.env.PWD, '..') || join(process.env.INIT_CWD, '..') || join(process.env.DIST, '..', '..', '..'); - var basePath = join(app.getAppPath(), '..', '..', '..') + var basePath = join(app.getAppPath(), "..", "..", ".."); switch (platform().toLowerCase()) { //case "darwin": - //serverPath = join(basePath, "freedata-server", "freedata-server.exe"); - //serverProcess = spawn(serverPath, [], { detached: true }); - //serverProcess.unref(); // Allow the server process to continue running independently of the parent process - // break; + //serverPath = join(basePath, "freedata-server", "freedata-server.exe"); + //serverProcess = spawn(serverPath, [], { detached: true }); + //serverProcess.unref(); // Allow the server process to continue running independently of the parent process + // break; //case "linux": - //serverPath = join(basePath, "freedata-server", "freedata-server.exe"); - //serverProcess = spawn(serverPath, [], { detached: true }); - //serverProcess.unref(); // Allow the server process to continue running independently of the parent process - // break; + //serverPath = join(basePath, "freedata-server", "freedata-server.exe"); + //serverProcess = spawn(serverPath, [], { detached: true }); + //serverProcess.unref(); // Allow the server process to continue running independently of the parent process + // break; case "win32": - serverPath = join(basePath, "freedata-server", "freedata-server.exe"); - console.log(`Starting server with path: ${serverPath}`); - serverProcess = spawn('cmd.exe', ['/c', 'start', 'cmd.exe', '/c', serverPath], { shell: true }); - console.log(`Started server | PID: ${serverProcess.pid}`); - break; + serverPath = join(basePath, "freedata-server", "freedata-server.exe"); + console.log(`Starting server with path: ${serverPath}`); + serverProcess = spawn( + "cmd.exe", + ["/c", "start", "cmd.exe", "/c", serverPath], + { shell: true }, + ); + console.log(`Started server | PID: ${serverProcess.pid}`); + break; default: - console.log("Unhandled OS Platform: ", platform()); - serverProcess = null; - serverPath = null; - break; + console.log("Unhandled OS Platform: ", platform()); + serverProcess = null; + serverPath = null; + break; } - serverProcess.on('error', (err) => { - console.error('Failed to start server process:', err); - serverProcess = null; + serverProcess.on("error", (err) => { + console.error("Failed to start server process:", err); + serverProcess = null; serverPath = null; -}); -serverProcess.stdout.on('data', (data) => { - //console.log(`stdout: ${data}`); + }); + serverProcess.stdout.on("data", (data) => { + //console.log(`stdout: ${data}`); + }); + + serverProcess.stderr.on("data", (data) => { + console.error(`stderr: ${data}`); + }); }); -serverProcess.stderr.on('data', (data) => { - console.error(`stderr: ${data}`); +app.on("before-quit", () => { + close_sub_processes(); }); -}); - -app.on('before-quit', () => { - close_sub_processes(); -}); - - app.on("window-all-closed", () => { win = null; if (process.platform !== "darwin") app.quit(); @@ -190,33 +192,32 @@ ipcMain.handle("open-win", (_, arg) => { }); function close_sub_processes() { - console.log("Closing sub processes..."); + console.log("Closing sub processes..."); - if (serverProcess != null) { - try { - console.log(`Killing server process with PID: ${serverProcess.pid}`); + if (serverProcess != null) { + try { + console.log(`Killing server process with PID: ${serverProcess.pid}`); - switch (platform().toLowerCase()) { - //case "darwin": + switch (platform().toLowerCase()) { + //case "darwin": // process.kill(serverProcess.pid); // break; - //case "linux": - // process.kill(serverProcess.pid); + //case "linux": + // process.kill(serverProcess.pid); // break; - case "win32": - // For Windows, use taskkill to ensure all child processes are also terminated - spawn("taskkill", ["/pid", serverProcess.pid.toString(), "/f", "/t"]); - break; + case "win32": + // For Windows, use taskkill to ensure all child processes are also terminated + spawn("taskkill", ["/pid", serverProcess.pid.toString(), "/f", "/t"]); + break; - default: - console.log("Unhandled OS Platform: ", platform()); - serverProcess = null; - serverPath = null; - break; - } - - } catch (error) { - console.error(`Error killing server process: ${error}`); - } + default: + console.log("Unhandled OS Platform: ", platform()); + serverProcess = null; + serverPath = null; + break; + } + } catch (error) { + console.error(`Error killing server process: ${error}`); } -} \ No newline at end of file + } +} diff --git a/gui/src/components/main.vue b/gui/src/components/main.vue index 7de1d9e9..fa4e28aa 100644 --- a/gui/src/components/main.vue +++ b/gui/src/components/main.vue @@ -23,17 +23,11 @@ import Dynamic_components from "./dynamic_components.vue"; import { getFreedataMessages } from "../js/api"; import { getRemote } from "../store/settingsStore.js"; import { loadAllData } from "../js/eventHandler"; - -