Merge pull request #125 from neon-glowstick/locale-independent-xml

Locale independent xml
BasisVR · Feb 1, 2025 · 52c1d0b · 52c1d0b
2 parents 78df3f3 + 01db873
commit 52c1d0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 86 deletions.
diff --git a/Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableConfiguration.cs b/Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableConfiguration.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
+using System.Xml.Serialization;
 
 namespace BasisNetworking.InitialData
 {
@@ -22,50 +23,14 @@ public class BasisLoadableConfiguration
         public float QuaternionX = 0f;
         public float QuaternionY = 0f;
         public float QuaternionZ = 0f;
-        public float QuaternionW = 0f;
+        public float QuaternionW = 1f;
 
         public float ScaleX = 1f;
         public float ScaleY = 1f;
         public float ScaleZ = 1f;
 
         public bool Persist = false;
 
-        public static BasisLoadableConfiguration LoadFromXml(string filePath)
-        {
-            if (!File.Exists(filePath))
-            {
-                CreateDefaultXml(filePath);
-            }
-
-            XmlDocument doc = new XmlDocument();
-            doc.Load(filePath);
-
-            return new BasisLoadableConfiguration
-            {
-                Mode = byte.Parse(doc.SelectSingleNode("/Resource/Mode")?.InnerText ?? "0"),
-                LoadedNetID = doc.SelectSingleNode("/Resource/LoadedNetID")?.InnerText ?? "",
-                UnlockPassword = doc.SelectSingleNode("/Resource/UnlockPassword")?.InnerText ?? "",
-                MetaURL = doc.SelectSingleNode("/Resource/MetaURL")?.InnerText ?? "",
-                BundleURL = doc.SelectSingleNode("/Resource/BundleURL")?.InnerText ?? "",
-                IsLocalLoad = bool.Parse(doc.SelectSingleNode("/Resource/IsLocalLoad")?.InnerText ?? "false"),
-
-                PositionX = float.Parse(doc.SelectSingleNode("/Resource/PositionX")?.InnerText ?? "0"),
-                PositionY = float.Parse(doc.SelectSingleNode("/Resource/PositionY")?.InnerText ?? "0"),
-                PositionZ = float.Parse(doc.SelectSingleNode("/Resource/PositionZ")?.InnerText ?? "0"),
-
-                QuaternionX = float.Parse(doc.SelectSingleNode("/Resource/QuaternionX")?.InnerText ?? "0"),
-                QuaternionY = float.Parse(doc.SelectSingleNode("/Resource/QuaternionY")?.InnerText ?? "0"),
-                QuaternionZ = float.Parse(doc.SelectSingleNode("/Resource/QuaternionZ")?.InnerText ?? "0"),
-                QuaternionW = float.Parse(doc.SelectSingleNode("/Resource/QuaternionW")?.InnerText ?? "1"),
-
-                ScaleX = float.Parse(doc.SelectSingleNode("/Resource/ScaleX")?.InnerText ?? "1"),
-                ScaleY = float.Parse(doc.SelectSingleNode("/Resource/ScaleY")?.InnerText ?? "1"),
-                ScaleZ = float.Parse(doc.SelectSingleNode("/Resource/ScaleZ")?.InnerText ?? "1"),
-
-                Persist = bool.Parse(doc.SelectSingleNode("/Resource/Persist")?.InnerText ?? "false")
-            };
-        }
-
         public static BasisLoadableConfiguration[] LoadAllFromFolder(string folderPath)
         {
             if (!Directory.Exists(folderPath))
@@ -76,58 +41,15 @@ public static BasisLoadableConfiguration[] LoadAllFromFolder(string folderPath)
             List<BasisLoadableConfiguration> configurations = new List<BasisLoadableConfiguration>();
 
             string[] xmlFiles = Directory.GetFiles(folderPath, "*.xml");
+            var serializer = new XmlSerializer(typeof(BasisLoadableConfiguration));
             foreach (var file in xmlFiles)
             {
-                configurations.Add(LoadFromXml(file));
+                using var reader = new StreamReader(file);
+                configurations.Add((BasisLoadableConfiguration)serializer.Deserialize(reader));
+                reader.Close();
             }
 
             return configurations.ToArray();
         }
-
-        private static void CreateDefaultXml(string filePath)
-        {
-            // Ensure the folder exists, create if not
-            string folderPath = Path.GetDirectoryName(filePath);
-            if (!Directory.Exists(folderPath))
-            {
-                Directory.CreateDirectory(folderPath);
-            }
-
-            // Create XML document with sample data
-            XmlDocument doc = new XmlDocument();
-            XmlElement root = doc.CreateElement("Resource");
-
-            root.AppendChild(CreateElement(doc, "Mode", "0"));
-            root.AppendChild(CreateElement(doc, "LoadedNetID", ""));
-            root.AppendChild(CreateElement(doc, "UnlockPassword", ""));
-            root.AppendChild(CreateElement(doc, "MetaURL", ""));
-            root.AppendChild(CreateElement(doc, "BundleURL", ""));
-            root.AppendChild(CreateElement(doc, "IsLocalLoad", "false"));
-
-            root.AppendChild(CreateElement(doc, "PositionX", "0"));
-            root.AppendChild(CreateElement(doc, "PositionY", "0"));
-            root.AppendChild(CreateElement(doc, "PositionZ", "0"));
-
-            root.AppendChild(CreateElement(doc, "QuaternionX", "0"));
-            root.AppendChild(CreateElement(doc, "QuaternionY", "0"));
-            root.AppendChild(CreateElement(doc, "QuaternionZ", "0"));
-            root.AppendChild(CreateElement(doc, "QuaternionW", "1"));
-
-            root.AppendChild(CreateElement(doc, "ScaleX", "1"));
-            root.AppendChild(CreateElement(doc, "ScaleY", "1"));
-            root.AppendChild(CreateElement(doc, "ScaleZ", "1"));
-
-            root.AppendChild(CreateElement(doc, "Persist", "false"));
-
-            doc.AppendChild(root);
-            doc.Save(filePath);
-        }
-
-        private static XmlElement CreateElement(XmlDocument doc, string name, string value)
-        {
-            XmlElement element = doc.CreateElement(name);
-            element.InnerText = value;
-            return element;
-        }
     }
 }
diff --git a/Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableLoader.cs b/Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableLoader.cs
@@ -67,7 +67,7 @@ public static LocalLoadResource FromBasisLoadableConfiguration(BasisLoadableConf
                 Persist = config.Persist
             };
         }
-        public const string exampleXml = @"<Resource>
+        public const string exampleXml = @"<BasisLoadableConfiguration>
     <!-- Mode of the configuration -->
     <Mode>0</Mode>
     <!-- Network ID -->
@@ -99,6 +99,6 @@ public static LocalLoadResource FromBasisLoadableConfiguration(BasisLoadableConf
 
     <!-- Persist flag -->
     <Persist>false</Persist>
-</Resource>";
+</BasisLoadableConfiguration>";
     }
 }