From 132fea11e3599c9c2c9df8a69fd4d093033788ba Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Mon, 21 Feb 2022 19:31:33 +0100
Subject: some functionality is now present

Albeit only frontend functionality, it doesn't actually save your
settings, it simply loads them, and Settings.get(), allows you to
convert them to a format that can be used to save settings.
---
 src/utils.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/utils.js')

diff --git a/src/utils.js b/src/utils.js
index 2ea91cd..b4dd920 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -20,8 +20,10 @@ process.chdir(app.getPath("appData"));
 
 // Base settings
 var settings = {
+	nsargs: "",
 	gamepath: "",
 	lang: "en-US",
+	nsupdate: true,
 	autoupdate: true,
 	zip: "/northstar.zip",
 
-- 
cgit v1.2.3


From 815106a3e1214196b25a380d83e826473840f948 Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Wed, 23 Feb 2022 18:17:56 +0100
Subject: settings page is now fully functional

It actually saves settings, loads them properly and everything...
---
 src/app/index.html  |  4 ++--
 src/app/settings.js |  5 ++++-
 src/index.js        |  2 ++
 src/utils.js        | 14 ++++++++++----
 4 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'src/utils.js')

diff --git a/src/app/index.html b/src/app/index.html
index 0bd6694..f605136 100644
--- a/src/app/index.html
+++ b/src/app/index.html
@@ -26,11 +26,11 @@
 		<div class="popup" id="options">
 			<div class="misc">
 				<div style="width:100%"></div>
-				<button id="apply" onclick="Settings.apply()">
+				<button id="apply" onclick="Settings.toggle(false);Settings.apply()">
 					<img src="icons/apply.png">
 					Save
 				</button>
-				<button id="close" onclick="Settings.toggle(false)">
+				<button id="close" onclick="Settings.toggle(false);Settings.load()">
 					<img src="icons/close.png">
 					Discard
 				</button>
diff --git a/src/app/settings.js b/src/app/settings.js
index e558d61..4921e07 100644
--- a/src/app/settings.js
+++ b/src/app/settings.js
@@ -20,7 +20,10 @@ var Settings = {
 		overlay.classList.toggle("shown")
 		options.classList.toggle("shown")
 	},
-	apply: () => {},
+	apply: () => {
+		settings = {...settings, ...Settings.get()};
+		ipcRenderer.send("savesettings", Settings.get());
+	},
 	reloadSwitches: () => {
 		let switches = document.querySelectorAll(".switch");
 
diff --git a/src/index.js b/src/index.js
index 95115b4..fa2a35f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -53,6 +53,8 @@ function start() {
 	ipcMain.on("installedmod", (event, modname) => {win.webContents.send("installedmod", modname)});
 	ipcMain.on("guigetmods", (event, ...args) => {win.webContents.send("mods", utils.mods.list())});
 
+	ipcMain.on("savesettings", (event, obj) => {utils.saveSettings(obj)})
+
 	win.webContents.on("dom-ready", () => {
 		win.webContents.send("mods", utils.mods.list());
 	});
diff --git a/src/utils.js b/src/utils.js
index b4dd920..5055a2e 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -20,15 +20,15 @@ process.chdir(app.getPath("appData"));
 
 // Base settings
 var settings = {
-	nsargs: "",
 	gamepath: "",
 	lang: "en-US",
 	nsupdate: true,
 	autoupdate: true,
+	nsargs: "-multiple",
 	zip: "/northstar.zip",
 
 	// These files won't be overwritten when installing/updating
-	// Northstar, useful for config file.
+	// Northstar, useful for config files
 	excludes: [
 		"ns_startup_args.txt",
 		"ns_startup_args_dedi.txt"
@@ -172,8 +172,13 @@ async function setpath(win, forcedialog) {
 // As to not have to do the same one liner a million times, this
 // function exists, as the name suggests, it simply writes the current
 // settings to the disk.
-function saveSettings() {
-	fs.writeFileSync(app.getPath("appData") + "/viper.json", JSON.stringify(settings));
+//
+// You can also pass a settings object to the function and it'll try and
+// merge it together with the already existing settings
+function saveSettings(obj = {}) {
+	settings = {...settings, ...obj};
+	fs.writeFileSync(path.join(settings.gamepath, "ns_startup_args.txt"), settings.nsargs);
+	fs.writeFileSync(app.getPath("appData") + "/viper.json", JSON.stringify({...settings, ...obj}));
 }
 
 // Returns the current Northstar version
@@ -754,6 +759,7 @@ module.exports = {
 	setpath,
 	updatevp,
 	settings,
+	saveSettings,
 	getNSVersion,
 	getTF2Version,
 	isGameRunning,
-- 
cgit v1.2.3


From 5193485b5c66170330b920d891e3fe1442cc1f3d Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Wed, 23 Feb 2022 18:33:59 +0100
Subject: implement ability to disable NS auto-updates

Albeit with some caveats, due to the way electron-updater is setup, if
you're not on a version of Viper which supports auto-updates the event
which runs the NS Updater code will never be run, and hence it'll never
auto-update. This was also an issue before, but I only noticed it now.
---
 src/index.js |  8 +++++++-
 src/utils.js | 10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/utils.js')

diff --git a/src/index.js b/src/index.js
index fa2a35f..0e8364f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -59,7 +59,13 @@ function start() {
 		win.webContents.send("mods", utils.mods.list());
 	});
 
-	if (utils.settings.autoupdate) {utils.updatevp(false)}
+	if (utils.settings.autoupdate) {
+		utils.updatevp(false)
+	} else {
+		if (utils.settings.nsupdate) {
+			utils.update();
+		}
+	}
 
 	autoUpdater.on("update-downloaded", () => {
 		win.webContents.send("updateavailable")
diff --git a/src/utils.js b/src/utils.js
index 2449a73..655eee0 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -75,7 +75,7 @@ async function isGameRunning() {
 //
 // It uses isGameRunning() to ensure it doesn't run while the game is
 // running, as that may have all kinds of issues.
-function handleNorthstarAutoUpdating() {
+function handleNorthstarUpdating() {
 	if (!settings.autoupdate || !fs.existsSync("viper.json") || settings.gamepath.length === 0) {
 		return;
 	}
@@ -314,8 +314,11 @@ function updatevp(autoinstall) {
 
 	autoUpdater.on("error", (info) => {cli.exit(1)});
 	autoUpdater.on("update-not-available", (info) => {
-		// only check for N* updates if Viper itself has no updates
-		handleNorthstarAutoUpdating();
+		// only check for NS updates if Viper itself has no updates and
+		// if NS auto updates is enabled.
+		if (settings.nsupdate || cli.hasArgs()) {
+			handleNorthstarUpdating();
+		}
 		cli.exit();
 	});
 
@@ -767,6 +770,7 @@ module.exports = {
 	getNSVersion,
 	getTF2Version,
 	isGameRunning,
+	handleNorthstarUpdating,
 	setlang: (lang) => {
 		settings.lang = lang;
 		saveSettings();
-- 
cgit v1.2.3


From 2c74233c21c27c45c79edb843cd5078a950b9ff6 Mon Sep 17 00:00:00 2001
From: 0neGal <mail@0negal.com>
Date: Thu, 24 Feb 2022 00:25:15 +0100
Subject: fixed NS never being auto-updated and more

When #87 was merged an unnoticed problem slipped in where if Viper was
running in a version that did not support auto-updates we would never
auto-update Northstar. Now that's fixed, and the nsupdate option is
completely implemented.

I also took the liberty of removing the auto-update option in the
settings page if Viper can't auto-update anyway, as it's useless if
that's not possible.
---
 src/app/settings.js |  5 +++++
 src/index.js        | 10 +++++++---
 src/utils.js        |  9 ++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/utils.js')

diff --git a/src/app/settings.js b/src/app/settings.js
index 4921e07..902e57b 100644
--- a/src/app/settings.js
+++ b/src/app/settings.js
@@ -96,6 +96,11 @@ var Settings = {
 				}
 			}
 		}
+
+		ipcRenderer.send("can-autoupdate");
+		ipcRenderer.on("cant-autoupdate", () => {
+			document.querySelector(".option[name=autoupdate]").style.display = "none";
+		})
 	}
 }
 
diff --git a/src/index.js b/src/index.js
index 0e8364f..265e13d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -55,6 +55,12 @@ function start() {
 
 	ipcMain.on("savesettings", (event, obj) => {utils.saveSettings(obj)})
 
+	ipcMain.on("can-autoupdate", (event) => {
+		if (! require("electron-updater").autoUpdater.isUpdaterActive()) {
+			win.webContents.send("cant-autoupdate")
+		}
+	})
+
 	win.webContents.on("dom-ready", () => {
 		win.webContents.send("mods", utils.mods.list());
 	});
@@ -62,9 +68,7 @@ function start() {
 	if (utils.settings.autoupdate) {
 		utils.updatevp(false)
 	} else {
-		if (utils.settings.nsupdate) {
-			utils.update();
-		}
+		utils.handleNorthstarUpdating();
 	}
 
 	autoUpdater.on("update-downloaded", () => {
diff --git a/src/utils.js b/src/utils.js
index 655eee0..6069a46 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -76,7 +76,7 @@ async function isGameRunning() {
 // It uses isGameRunning() to ensure it doesn't run while the game is
 // running, as that may have all kinds of issues.
 function handleNorthstarUpdating() {
-	if (!settings.autoupdate || !fs.existsSync("viper.json") || settings.gamepath.length === 0) {
+	if (! settings.nsupdate || ! fs.existsSync("viper.json") || settings.gamepath.length === 0) {
 		return;
 	}
 
@@ -306,6 +306,13 @@ async function update() {
 function updatevp(autoinstall) {
 	const { autoUpdater } = require("electron-updater");
 
+	if (! autoUpdater.isUpdaterActive()) {
+		if (settings.nsupdate) {
+			handleNorthstarUpdating();
+		}
+		return cli.exit();
+	}
+
 	if (autoinstall) {
 		autoUpdater.on("update-downloaded", (info) => {
 			autoUpdater.quitAndInstall();
-- 
cgit v1.2.3