From 91875b4eafdc9d2d452a0e4dfa7e7348786070e0 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sun, 10 Mar 2024 21:08:34 -0400
Subject: [PATCH] Remove a couple specialized constructors

---
 SabreTools.DatItems/Formats/Rom.cs |  9 ---------
 SabreTools.DatItems/Machine.cs     |  6 ------
 SabreTools.DatTools/DatFromDir.cs  | 18 ++++++++++++++++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/SabreTools.DatItems/Formats/Rom.cs b/SabreTools.DatItems/Formats/Rom.cs
index a6f8aebf..ca24d369 100644
--- a/SabreTools.DatItems/Formats/Rom.cs
+++ b/SabreTools.DatItems/Formats/Rom.cs
@@ -90,15 +90,6 @@ namespace SabreTools.DatItems.Formats
             SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.None);
         }
 
-        public Rom(string name, string machineName) : base()
-        {
-            SetName(name);
-            SetFieldValue<long?>(Models.Metadata.Rom.SizeKey, null);
-            SetFieldValue<ItemStatus>(Models.Metadata.Rom.StatusKey, ItemStatus.None);
-            GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.DescriptionKey, machineName);
-            GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, machineName);
-        }
-
         public Rom(BaseFile baseFile) : base()
         {
             SetName(baseFile.Filename);
diff --git a/SabreTools.DatItems/Machine.cs b/SabreTools.DatItems/Machine.cs
index c950227d..eeec4ee7 100644
--- a/SabreTools.DatItems/Machine.cs
+++ b/SabreTools.DatItems/Machine.cs
@@ -169,12 +169,6 @@ namespace SabreTools.DatItems
                     _machine[fieldName] = machine[fieldName];
             }
         }
-        
-        public Machine(string name, string description)
-        {
-            SetFieldValue<string?>(Models.Metadata.Machine.NameKey, name);
-            SetFieldValue<string?>(Models.Metadata.Machine.DescriptionKey, description);
-        }
 
         #endregion
 
diff --git a/SabreTools.DatTools/DatFromDir.cs b/SabreTools.DatTools/DatFromDir.cs
index db50e643..84655afb 100644
--- a/SabreTools.DatTools/DatFromDir.cs
+++ b/SabreTools.DatTools/DatFromDir.cs
@@ -298,7 +298,13 @@ namespace SabreTools.DatTools
             foreach (var empty in empties)
 #endif
             {
-                Rom emptyRom = new(Path.Combine(empty, "_"), item);
+                var emptyMachine = new Machine();
+                emptyMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, item);
+
+                var emptyRom = new Rom();
+                emptyRom.SetName(Path.Combine(empty, "_"));
+                emptyRom.SetFieldValue<Machine?>(DatItem.MachineKey, emptyMachine);
+
                 ProcessFileHelper(datFile, item, emptyRom, basePath, parent);
 #if NET40_OR_GREATER || NETCOREAPP
             });
@@ -365,7 +371,15 @@ namespace SabreTools.DatTools
                 romname = romname.Trim(Path.DirectorySeparatorChar);
 
                 logger.Verbose($"Adding blank empty folder: {gamename}");
-                datFile.Items["null"]?.Add(new Rom(romname, gamename));
+
+                var blankMachine = new Machine();
+                blankMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, gamename);
+
+                var blankRom = new Rom();
+                blankRom.SetName(romname);
+                blankRom.SetFieldValue<Machine?>(DatItem.MachineKey, blankMachine);
+
+                datFile.Items["null"]?.Add(blankRom);
 #if NET40_OR_GREATER || NETCOREAPP
             });
 #else