Update Scheme constructors

cooolbros · Dec 26, 2023 · e1b783c · e1b783c
1 parent 4927c8c
commit e1b783c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/HUDMerger/Models/Scheme/ClientScheme.cs b/src/HUDMerger/Models/Scheme/ClientScheme.cs
@@ -1,4 +1,5 @@
 using System;
+using VDF.Models;
 
 namespace HUDMerger.Models.Scheme;
 
@@ -11,4 +12,8 @@ public ClientScheme() : base()
 	public ClientScheme(string filePath) : base(filePath)
 	{
 	}
+
+	public ClientScheme(string filePath, KeyValues keyValues) : base(filePath, keyValues)
+	{
+	}
 }
diff --git a/src/HUDMerger/Models/Scheme/SchemeBase.cs b/src/HUDMerger/Models/Scheme/SchemeBase.cs
@@ -28,7 +28,11 @@ public SchemeBase()
 	{
 	}
 
-	public SchemeBase(string filePath)
+	public SchemeBase(string filePath) : this(filePath, VDFSerializer.Deserialize(File.ReadAllText(filePath)))
+	{
+	}
+
+	public SchemeBase(string filePath, KeyValues keyValues)
 	{
 		static SchemeFile? ReadBaseFile(FileInfo file)
 		{
@@ -153,8 +157,6 @@ public SchemeBase(string filePath)
 		static KeyValues GetValueOrDefault(KeyValues keyValues, string key) =>
 			keyValues.FirstOrDefault((kv) => StringComparer.OrdinalIgnoreCase.Equals(kv.Key, key)).Value is KeyValues v ? v : [];
 
-		KeyValues keyValues = VDFSerializer.Deserialize(File.ReadAllText(filePath));
-
 		KeyValues header = keyValues.Header();
 
 		foreach (KeyValue colour in GetValueOrDefault(header, "Colors"))

diff --git a/src/HUDMerger/Models/Scheme/SourceScheme.cs b/src/HUDMerger/Models/Scheme/SourceScheme.cs
@@ -1,4 +1,5 @@
 using System;
+using VDF.Models;
 
 namespace HUDMerger.Models.Scheme;
 
@@ -11,4 +12,8 @@ public SourceScheme() : base()
 	public SourceScheme(string filePath) : base(filePath)
 	{
 	}
+
+	public SourceScheme(string filePath, KeyValues keyValues) : base(filePath, keyValues)
+	{
+	}
 }