From 8ced91d0fafcb01c2aaf84df4b59f5e90ef3530b Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 3 Apr 2024 21:44:02 -0400
Subject: [PATCH] Move some constants to the deserializer

---
 .../Deserializers/SeparatedValue.cs            | 18 +++++++++++++-----
 SabreTools.Serialization/SeparatedValue.cs     | 12 ------------
 2 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100644 SabreTools.Serialization/SeparatedValue.cs

diff --git a/SabreTools.Serialization/Deserializers/SeparatedValue.cs b/SabreTools.Serialization/Deserializers/SeparatedValue.cs
index aa4d1128..62fd20d8 100644
--- a/SabreTools.Serialization/Deserializers/SeparatedValue.cs
+++ b/SabreTools.Serialization/Deserializers/SeparatedValue.cs
@@ -12,6 +12,14 @@ namespace SabreTools.Serialization.Deserializers
         IFileDeserializer<MetadataFile>,
         IStreamDeserializer<MetadataFile>
     {
+        #region Constants
+
+        public const int HeaderWithoutExtendedHashesCount = 14;
+
+        public const int HeaderWithExtendedHashesCount = 17;
+
+        #endregion
+
         #region IFileDeserializer
 
         /// <inheritdoc cref="IFileDeserializer.Deserialize(string?)"/>
@@ -79,7 +87,7 @@ namespace SabreTools.Serialization.Deserializers
 
                 // Parse the line into a row
                 Row? row = null;
-                if (reader.Line.Count < Serialization.SeparatedValue.HeaderWithExtendedHashesCount)
+                if (reader.Line.Count < HeaderWithExtendedHashesCount)
                 {
                     row = new Row
                     {
@@ -100,8 +108,8 @@ namespace SabreTools.Serialization.Deserializers
                     };
 
                     // If we have additional fields
-                    if (reader.Line.Count > Serialization.SeparatedValue.HeaderWithoutExtendedHashesCount)
-                        row.ADDITIONAL_ELEMENTS = reader.Line.Skip(Serialization.SeparatedValue.HeaderWithoutExtendedHashesCount).ToArray();
+                    if (reader.Line.Count > HeaderWithoutExtendedHashesCount)
+                        row.ADDITIONAL_ELEMENTS = reader.Line.Skip(HeaderWithoutExtendedHashesCount).ToArray();
                 }
                 else
                 {
@@ -127,8 +135,8 @@ namespace SabreTools.Serialization.Deserializers
                     };
 
                     // If we have additional fields
-                    if (reader.Line.Count > Serialization.SeparatedValue.HeaderWithExtendedHashesCount)
-                        row.ADDITIONAL_ELEMENTS = reader.Line.Skip(Serialization.SeparatedValue.HeaderWithExtendedHashesCount).ToArray();
+                    if (reader.Line.Count > HeaderWithExtendedHashesCount)
+                        row.ADDITIONAL_ELEMENTS = reader.Line.Skip(HeaderWithExtendedHashesCount).ToArray();
                 }
                 rows.Add(row);
             }
diff --git a/SabreTools.Serialization/SeparatedValue.cs b/SabreTools.Serialization/SeparatedValue.cs
deleted file mode 100644
index 3795f0ea..00000000
--- a/SabreTools.Serialization/SeparatedValue.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace SabreTools.Serialization
-{
-    /// <summary>
-    /// Represents separated-value variants
-    /// </summary>
-    public static class SeparatedValue
-    {
-        public const int HeaderWithoutExtendedHashesCount = 14;
-
-        public const int HeaderWithExtendedHashesCount = 17;
-    }
-}
\ No newline at end of file