Fix files breaking when being saved if some non-ascii characters (or …

…other bad things) were used. also implemented a formatted version of bans.json for easier reading.
TomGrobbe · Sep 2, 2018 · cb1a36a · cb1a36a
1 parent 6c2f17f
commit cb1a36a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/vMenuServer/BanManager.cs b/vMenuServer/BanManager.cs
@@ -348,8 +348,8 @@ private static bool AddBan(BanRecord ban)
 
             BannedPlayersList.Add(ban);
 
-            var output = JsonConvert.SerializeObject(BannedPlayersList);
-            return SaveResourceFile(GetCurrentResourceName(), "bans.json", output, output.Length);
+            var output = JsonConvert.SerializeObject(BannedPlayersList, Formatting.Indented);
+            return SaveResourceFile(GetCurrentResourceName(), "bans.json", output, -1);
         }
 
         /// <summary>
@@ -389,8 +389,8 @@ public static bool RemoveBan(BanRecord record)
                     BannedPlayersList.RemoveAt(i - 1);
                 }
             }
-            var output = JsonConvert.SerializeObject(BannedPlayersList);
-            return SaveResourceFile(GetCurrentResourceName(), "bans.json", output, output.Length);
+            var output = JsonConvert.SerializeObject(BannedPlayersList, Formatting.Indented);
+            return SaveResourceFile(GetCurrentResourceName(), "bans.json", output, -1);
         }
 
         /// <summary>
@@ -481,7 +481,7 @@ public static void BanLog(string banActionMessage)
                     (date.Minute < 10 ? "0" : "") + date.Minute + ":" +
                     (date.Second < 10 ? "0" : "") + date.Second;
                 string outputFile = file + $"[\t{formattedDate}\t] [BAN ACTION] {banActionMessage}\n";
-                SaveResourceFile(GetCurrentResourceName(), "vmenu.log", outputFile, outputFile.Length);
+                SaveResourceFile(GetCurrentResourceName(), "vmenu.log", outputFile, -1);
                 Log(banActionMessage + "\n");
             }
         }

diff --git a/vMenuServer/MainServer.cs b/vMenuServer/MainServer.cs
@@ -823,7 +823,7 @@ private static void KickLog(string kickLogMesage)
                     (date.Minute < 10 ? "0" : "") + date.Minute + ":" +
                     (date.Second < 10 ? "0" : "") + date.Second;
                 string outputFile = file + $"[\t{formattedDate}\t] [KICK ACTION] {kickLogMesage}\n";
-                SaveResourceFile(GetCurrentResourceName(), "vmenu.log", outputFile, outputFile.Length);
+                SaveResourceFile(GetCurrentResourceName(), "vmenu.log", outputFile, -1);
                 Debug.Write(kickLogMesage + "\n");
             }
         }

diff --git a/vMenuServer/UpdateChecker.cs b/vMenuServer/UpdateChecker.cs
@@ -45,7 +45,7 @@ private async void CheckUpdates()
                 {
                     Guid uuid = Guid.NewGuid();
                     UUID = uuid.ToString();
-                    SaveResourceFile(GetCurrentResourceName(), "uuid", UUID, UUID.Length);
+                    SaveResourceFile(GetCurrentResourceName(), "uuid", UUID, -1);
                 }
                 // sets the UUID convar.
                 ExecuteCommand($"sets vMenuUUID {UUID.Substring(0, UUID.LastIndexOf('-'))}");