Fixed GameConfig parsing crash, added pre release versioning

GameConfigs would fail to parse if they started with GameConfig.txt instead of Configs
ruarai · May 25, 2019 · 423ce24 · 423ce24
1 parent 49ab52c
commit 423ce24
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/CompilePalX/CompilePalX.csproj b/CompilePalX/CompilePalX.csproj
@@ -187,6 +187,9 @@
     <Content Include="Compiling\errorstyle.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="version_prerelease.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Keys\materialkeys.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/CompilePalX/GameConfiguration/GameConfigurationParser.cs b/CompilePalX/GameConfiguration/GameConfigurationParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 public static class sutil {
@@ -98,6 +99,13 @@ public class DataBlock {
 
             return null;
         }
+        public DataBlock GetFirstByName(string[] names) {
+            for (int i = 0; i < this.subBlocks.Count; i++)
+                if (names.Contains(this.subBlocks[i].name))
+                    return this.subBlocks[i];
+
+            return null;
+        }
 
         public List<DataBlock> GetAllByName(string _name) {
             List<DataBlock> c = new List<DataBlock>();
@@ -140,7 +148,7 @@ class GameConfigurationParser {
 
             KV.FileData data = new KV.FileData(filename);
 
-            foreach (KV.DataBlock gamedb in data.headnode.GetFirstByName("\"Configs\"").GetFirstByName("\"Games\"").subBlocks) {
+            foreach (KV.DataBlock gamedb in data.headnode.GetFirstByName(new []{"\"Configs\"", "\"GameConfig.txt\""}).GetFirstByName("\"Games\"").subBlocks) {
                 string binfolder = Path.GetDirectoryName(filename);
                 KV.DataBlock hdb = gamedb.GetFirstByName("\"Hammer\"");
 

diff --git a/CompilePalX/Updating/UpdateManager.cs b/CompilePalX/Updating/UpdateManager.cs
@@ -16,15 +16,22 @@ static class UpdateManager
     {
         public static event UpdateFound OnUpdateFound;
 
-        public static int CurrentVersion;
-        public static int LatestVersion;
+        public static float CurrentVersion;
+        public static float CurrentPrereleaseVersion;
+        public static float LatestVersion;
+        public static float LatestPrereleaseVersion;
 
         private const string UpdateURL = "https://raw.githubusercontent.com/ruarai/CompilePal/master/CompilePalX/version.txt";
 
         public static void CheckVersion()
         {
             string currentVersion = File.ReadAllText(CompilePalPath.Directory + "version.txt");
-            CurrentVersion = int.Parse(currentVersion);
+            string currentPrereleaseVersion = File.ReadAllText(CompilePalPath.Directory + "version_prerelease.txt");
+            CurrentVersion = float.Parse(currentVersion);
+            CurrentPrereleaseVersion = float.Parse(currentPrereleaseVersion);
+
+            if (CurrentPrereleaseVersion > CurrentVersion)
+	            CurrentVersion = CurrentPrereleaseVersion;
 
             Thread updaterThread = new Thread(ThreadedCheck);
             updaterThread.Start();

diff --git a/CompilePalX/version_prerelease.txt b/CompilePalX/version_prerelease.txt
@@ -0,0 +1 @@
+026.1