Add exceptions parameter

BigBang1112 · Jul 17, 2024 · db1584c · db1584c
1 parent 4968fb0
commit db1584c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/Src/GBX.NET/Components/GbxRefTable.cs b/Src/GBX.NET/Components/GbxRefTable.cs
@@ -37,7 +37,7 @@ public string GetFullFilePath(GbxRefTableFile file)
         return Path.GetFullPath(GetFilePath(file));
     }
 
-    public CMwNod? LoadNode(GbxRefTableFile file, GbxReadSettings settings = default)
+    public CMwNod? LoadNode(GbxRefTableFile file, GbxReadSettings settings = default, bool exceptions = false)
     {
         if (file is null)
         {
@@ -77,6 +77,12 @@ public string GetFullFilePath(GbxRefTableFile file)
             {
                 scope?.Dispose();
                 logger?.LogError(ex, "Failed to load node from file: {FilePath}", filePath);
+
+                if (exceptions)
+                {
+                    throw;
+                }
+
                 return default;
             }
         }
@@ -104,16 +110,22 @@ public string GetFullFilePath(GbxRefTableFile file)
             {
                 scope?.Dispose();
                 logger?.LogError(ex, "Failed to load node from file: {Length} bytes", data.Length);
+
+                if (exceptions)
+                {
+                    throw;
+                }
+
                 return default;
             }
         }
 
         return default;
     }
 
-    public T? LoadNode<T>(GbxRefTableFile file, GbxReadSettings settings = default) where T : CMwNod
+    public T? LoadNode<T>(GbxRefTableFile file, GbxReadSettings settings = default, bool exceptions = false) where T : CMwNod
     {
-        return LoadNode(file, settings) as T;
+        return LoadNode(file, settings, exceptions) as T;
     }
 
     internal static GbxRefTable? Parse(GbxReader reader, GbxHeader header, string? fileSystemPath)

diff --git a/Src/GBX.NET/Components/GbxRefTableFile.cs b/Src/GBX.NET/Components/GbxRefTableFile.cs
@@ -14,14 +14,14 @@ public override string ToString()
         return $"{FilePath}, Flags: {Flags}, UseFile: {UseFile}";
     }
 
-    public T? GetNode<T>(ref T? cachedNode, GbxReadSettings settings = default) where T : CMwNod
+    public T? GetNode<T>(ref T? cachedNode, GbxReadSettings settings = default, bool exceptions = false) where T : CMwNod
     {
         if (cachedNode is not null)
         {
             return cachedNode;
         }
 
-        return cachedNode = RefTable.LoadNode<T>(this, settings);
+        return cachedNode = RefTable.LoadNode<T>(this, settings, exceptions);
     }
 
     public string GetFullPath()