Make 'fix #1' better & avoid some bugs

hulxv · Jan 8, 2022 · e9e4ad4 · e9e4ad4
1 parent b7c41cd
commit e9e4ad4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/main/background.js b/main/background.js
@@ -66,6 +66,8 @@ async function INIT() {
 	}
 	await TrayIcon.init();
 
+	mainWindow.webContents.send("send-config", (await AppConfig).get());
+
 	if (!(await vnStatIsInstalled())) {
 		error(
 			"vnStat isn't installed, You should download and setup it before using this client.",
@@ -74,18 +76,18 @@ async function INIT() {
 		return;
 	}
 
-	// Send Configs
-	mainWindow.webContents.send("send-config", (await AppConfig).get());
-
-	mainWindow.webContents.send("send-vn-configs", vnStat.configurations().read());
+	// Send vnStat data
+	mainWindow.webContents.send(
+		"send-vn-configs",
+		vnStat.configurations().read(),
+	);
 
-	// Send Data
 	mainWindow.webContents.send("send-traffic", await vnStat.traffic().getData());
+
 	mainWindow.webContents.send(
 		"send-vnstat-interfaces",
 		await vnStat.interfaces(),
 	);
-
 	mainWindow.webContents.send(
 		"send-vn-daemon-status",
 		await vnStat.daemon().status(),

diff --git a/main/util/index.js b/main/util/index.js
@@ -41,19 +41,14 @@ export async function vnStatIsInstalled() {
 	let bash = `        
 if ! [ -x "$(command -v vnstat)" ]; then
   echo "false"
-  exit 1
-
   else echo "true"
-fi                                                                                                                  
-  `;
+  exit 1
+fi`;
 
 	try {
 		const { stdout, stderr } = await exec(bash);
 		if (stderr) throw stderr;
-		return stdout
-			.split("\n")
-			.map((e) => e.replace(/[\n, " "]/, ""))
-			.includes("true");
+		return stdout.includes("true");
 	} catch (err) {
 		return err;
 	}

diff --git a/renderer/components/Settings/vnStat/index.js b/renderer/components/Settings/vnStat/index.js
@@ -24,7 +24,7 @@ function vnStat() {
 	const { configs, daemonStatus, stopDaemon, startDaemon, restartDaemon } =
 		useVnStat();
 
-	if (!configs || !Object.keys(configs))
+	if (!configs || !(Object.keys(configs).length > 0))
 		return (
 			<Stack align='center'>
 				<Heading>Something went wrong</Heading>