Remove deferredmode argument from Load<T>

Author: kristiker

Datamodel.cs

@@ -270,10 +270,10 @@ public static Datamodel Load(byte[] data, DeferredMode defer_mode = DeferredMode
         /// <param name="data">The input byte array.</param>
         /// <param name="defer_mode">How to handle deferred loading.</param>
         /// <typeparam  name="T">Type hint for what the Root of this datamodel should be when using reflection</param>
-        public static Datamodel Load<T>(byte[] data, DeferredMode defer_mode = DeferredMode.Automatic, ReflectionParams? reflectionParams = null)
+        public static Datamodel Load<T>(byte[] data, ReflectionParams? reflectionParams = null)
              where T : Element
         {
-            return Load_Internal<T>(new MemoryStream(data, true), Assembly.GetCallingAssembly(), defer_mode, reflectionParams);
+            return Load_Internal<T>(new MemoryStream(data, true), Assembly.GetCallingAssembly(), DeferredMode.Disabled, reflectionParams);
         }
 
         /// <summary>
@@ -296,25 +296,15 @@ public static Datamodel Load(string path, DeferredMode defer_mode = DeferredMode
             }
         }
         /// <summary>
-        /// Loads a Datamodel from a file path.
+        /// Loads a Datamodel from a file path, unserializing the Root as <typeparamref name="T"/>.
         /// </summary>
         /// <param name="path">The source file path.</param>
-        /// <param name="defer_mode">How to handle deferred loading.</param>
         /// <typeparam  name="T">Type hint for what the Root of this datamodel should be when using reflection</param>
-        public static Datamodel Load<T>(string path, DeferredMode defer_mode = DeferredMode.Automatic, ReflectionParams? reflectionParams = null)
+        public static Datamodel Load<T>(string path, ReflectionParams? reflectionParams = null)
             where T : Element
         {
-            var stream = File.OpenRead(path);
-            Datamodel? dm = null;
-            try
-            {
-                dm = Load_Internal<T>(stream, Assembly.GetCallingAssembly(), defer_mode, reflectionParams);
-                return dm;
-            }
-            finally
-            {
-                if (defer_mode == DeferredMode.Disabled || (dm != null && dm.Codec == null)) stream.Dispose();
-            }
+            using var stream = File.OpenRead(path);
+            return Load_Internal<T>(stream, Assembly.GetCallingAssembly(), DeferredMode.Disabled, reflectionParams);
         }
 
         private static Datamodel Load_Internal<T>(Stream stream, Assembly callingAssembly, DeferredMode defer_mode = DeferredMode.Automatic, ReflectionParams? reflectionParams = null)

Tests/Tests.cs

@@ -20,9 +20,7 @@ public class DatamodelTests
         protected FileStream Binary_4_File = File.OpenRead(TestContext.CurrentContext.TestDirectory + "/Resources/binary4.dmx");
         protected FileStream KeyValues2_1_File = File.OpenRead(TestContext.CurrentContext.TestDirectory + "/Resources/taunt05.dmx");
 
-        // TODO: would be nice if this could find this path automatically
-        //const string GameBin = @"C:/Program Files (x86)/Steam/steamapps/common/Counter-Strike Global Offensive/game/bin/win64";
-        const string GameBin = @"D:/Steam/steamapps/common/Counter-Strike Global Offensive/game/bin/win64";
+        const string GameBin = @"C:/Program Files (x86)/Steam/steamapps/common/Counter-Strike Global Offensive/game/bin/win64";
 
         static readonly string DmxConvertExe = Path.Combine(GameBin, "dmxconvert.exe");
         static readonly bool DmxConvertExe_Exists = File.Exists(DmxConvertExe);
@@ -294,7 +292,7 @@ public static void TypedArrayAddingRemoving()
             Assert.AreEqual(0, array.Count);
         }
 
-        private void Test_Vmap_Reflection(Datamodel.Datamodel unserialisedVmap)
+        private static void Validate_Vmap_Reflection(Datamodel.Datamodel unserialisedVmap)
         {
             Assert.AreEqual(typeof(CMapRootElement), unserialisedVmap.Root.GetType());
 
@@ -326,14 +324,14 @@ private void Test_Vmap_Reflection(Datamodel.Datamodel unserialisedVmap)
         public void LoadVmap_Reflection_Binary()
         {
             var unserialisedVmap = DM.Load<CMapRootElement>(Path.Combine(TestContext.CurrentContext.TestDirectory, "Resources", "cs2_map.vmap"));
-            Test_Vmap_Reflection(unserialisedVmap);
+            Validate_Vmap_Reflection(unserialisedVmap);
         }
 
         [Test]
         public void LoadVmap_Reflection_Text()
         {
             var unserialisedVmap = DM.Load<CMapRootElement>(Path.Combine(TestContext.CurrentContext.TestDirectory, "Resources", "cs2_map.vmap.txt"));
-            Test_Vmap_Reflection(unserialisedVmap);
+            Validate_Vmap_Reflection(unserialisedVmap);
         }
 
         public class NullOwnerElement

Tests/ValveMap.cs

@@ -4,6 +4,8 @@
 
 namespace VMAP;
 
+#nullable enable
+
 /// <summary>
 ///  Valve Map (VMAP) format version 29.
 /// </summary>