From db3ac5aa33a14e11f72683b6db862c804822fc2d Mon Sep 17 00:00:00 2001
From: Jens van de Wiel <85284773+JensvandeWiel@users.noreply.github.com>
Date: Fri, 5 Jan 2024 13:24:04 +0100
Subject: [PATCH] Ini files not found (#176)

* bug: Allow paths with spaces

Before this path's with spaces in them did not work, now to path is escaped between "" to make it work.

* bug: Make ini files if they don't exist

* bug: Made so that values are always defined

* bug: Made so that values are always defined
---
 frontend/src/helpers/ini.ts           | 18 ++++++++++++++++++
 frontend/src/pages/server/General.tsx | 18 ++++++++----------
 installer/installer_controller.go     |  2 +-
 server/game.go                        | 11 +++++++++++
 server/gus.go                         | 10 ++++++++++
 5 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 frontend/src/helpers/ini.ts

diff --git a/frontend/src/helpers/ini.ts b/frontend/src/helpers/ini.ts
new file mode 100644
index 0000000..71bbc0b
--- /dev/null
+++ b/frontend/src/helpers/ini.ts
@@ -0,0 +1,18 @@
+// getVal is a function that takes a gus object, a section, a key, and an index, and returns a string. This function is used to handle when anything is undefined, if so it creates it.
+export function getVal(gus: { [key: string]: { [key: string]: Array<string> } }, section: string, key: string, index: number = 0): string {
+
+    if (!gus[section]) {
+        gus[section] = {};
+    }
+
+    if (!gus[section][key]) {
+        gus[section][key] = [];
+    }
+
+    if (!gus[section][key][index]) {
+        gus[section][key][index] = '';
+        return gus[section][key][index];
+    }
+
+    return gus[section][key][index];
+}
\ No newline at end of file
diff --git a/frontend/src/pages/server/General.tsx b/frontend/src/pages/server/General.tsx
index 6183cf6..da31066 100644
--- a/frontend/src/pages/server/General.tsx
+++ b/frontend/src/pages/server/General.tsx
@@ -26,6 +26,7 @@ import { PasswordInput } from "../../components/PasswordInput";
 import { Slider } from "../../components/Slider";
 import { useAlert } from "../../components/AlertProvider";
 import { EventsOn } from "../../../wailsjs/runtime";
+import {getVal} from "../../helpers/ini";
 
 type Props = {
 	setServ: React.Dispatch<React.SetStateAction<server.Server>>;
@@ -136,9 +137,7 @@ function GeneralSettings({ setServ, serv, setGus, gus }: Props) {
 						>
 							<Slider
 								value={parseFloat(
-									gus["ServerSettings"][
-										"AutoSavePeriodMinutes"
-									][0] ?? "0",
+									getVal(gus, "ServerSettings", "AutoSavePeriodMinutes") ?? "0",
 								)}
 								onChange={(v) => {
 									setGus((p) => {
@@ -161,11 +160,11 @@ function GeneralSettings({ setServ, serv, setGus, gus }: Props) {
 						<FormLabel>Message</FormLabel>
 						<Textarea
 							minRows={5}
-							value={gus["MessageOfTheDay"].Message[0]}
+							value={getVal(gus, "MessageOfTheDay", "Message")}
 							onChange={(e) => {
 								setGus((p) => {
 									const newState = { ...p };
-									newState["MessageOfTheDay"].Message[0] =
+									newState["MessageOfTheDay"]["Message"][0] =
 										e.target.value;
 									return newState;
 								});
@@ -184,7 +183,7 @@ function GeneralSettings({ setServ, serv, setGus, gus }: Props) {
 								sliderMax={240}
 								value={
 									parseFloat(
-										gus["MessageOfTheDay"].Duration[0],
+										getVal(gus, "MessageOfTheDay", "Duration"),
 									) ?? 0
 								}
 								onChange={(v) => {
@@ -253,8 +252,7 @@ function GeneralSettings({ setServ, serv, setGus, gus }: Props) {
 								sliderMax={3600}
 								value={
 									parseFloat(
-										gus["ServerSettings"]
-											.KickIdlePlayersPeriod[0],
+										getVal(gus, "ServerSettings", "KickIdlePlayersPeriod"),
 									) ?? 0
 								}
 								onChange={(v) => {
@@ -275,7 +273,7 @@ function GeneralSettings({ setServ, serv, setGus, gus }: Props) {
 					<div className={"space-y-2"}>
 						<FormLabel>Ban list url:</FormLabel>
 						<Input
-							value={gus["ServerSettings"]["BanListURL"]}
+							value={getVal(gus, "ServerSettings", "BanListURL")}
 							onChange={(e) => {
 								setGus((p) => {
 									const newState = { ...p };
@@ -290,7 +288,7 @@ function GeneralSettings({ setServ, serv, setGus, gus }: Props) {
 					<div className={"space-y-2"}>
 						<FormLabel>Allowed Cheaters URL:</FormLabel>
 						<Input
-							value={gus["ServerSettings"]["AllowedCheatersURL"]}
+							value={getVal(gus, "ServerSettings", "AllowedCheatersURL")}
 							onChange={(e) => {
 								setGus((p) => {
 									const newState = { ...p };
diff --git a/installer/installer_controller.go b/installer/installer_controller.go
index 749fba4..06cd985 100644
--- a/installer/installer_controller.go
+++ b/installer/installer_controller.go
@@ -50,7 +50,7 @@ func (c *InstallerController) InstallUpdateVerify(installPath string) error {
 	}
 
 	c.config.GetConfig()
-	steamCMDPath = c.config.Config.SteamCMDPath
+	steamCMDPath = "\"" + c.config.Config.SteamCMDPath + "\""
 
 	prompts := []*gosteamcmd.Prompt{
 		gosteamcmd.ForceInstallDir("\"" + installPath + "\""),
diff --git a/server/game.go b/server/game.go
index f105909..64da462 100644
--- a/server/game.go
+++ b/server/game.go
@@ -11,6 +11,17 @@ import (
 func (s *Server) getGame() (*ini.IniFile, error) {
 	gamePath := filepath.Join(s.ServerPath, "ShooterGame", "Saved", "Config", "WindowsServer", "Game.ini")
 
+	if _, err := os.Stat(gamePath); os.IsNotExist(err) {
+		err = os.MkdirAll(filepath.Dir(gamePath), 0644)
+		if err != nil {
+			return nil, err
+		}
+		err = os.WriteFile(gamePath, []byte(""), 0644)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	gameContent, err := os.ReadFile(gamePath)
 	if err != nil {
 		return nil, errors.New("error reading Game.ini: " + err.Error())
diff --git a/server/gus.go b/server/gus.go
index 1132e06..ca69ad1 100644
--- a/server/gus.go
+++ b/server/gus.go
@@ -12,6 +12,16 @@ var duplicateKeys = []string{}
 // getGus returns the GameUserSettings.ini file as an ini.IniFile struct
 func (s *Server) getGus() (*ini.IniFile, error) {
 	gusPath := filepath.Join(s.ServerPath, "ShooterGame", "Saved", "Config", "WindowsServer", "GameUserSettings.ini")
+	if _, err := os.Stat(gusPath); os.IsNotExist(err) {
+		err = os.MkdirAll(filepath.Dir(gusPath), 0644)
+		if err != nil {
+			return nil, err
+		}
+		err = os.WriteFile(gusPath, []byte(""), 0644)
+		if err != nil {
+			return nil, err
+		}
+	}
 
 	gusContent, err := os.ReadFile(gusPath)
 	if err != nil {