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(Models.Metadata.Rom.StatusKey, ItemStatus.None); } - public Rom(string name, string machineName) : base() - { - SetName(name); - SetFieldValue(Models.Metadata.Rom.SizeKey, null); - SetFieldValue(Models.Metadata.Rom.StatusKey, ItemStatus.None); - GetFieldValue(DatItem.MachineKey)!.SetFieldValue(Models.Metadata.Machine.DescriptionKey, machineName); - GetFieldValue(DatItem.MachineKey)!.SetFieldValue(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(Models.Metadata.Machine.NameKey, name); - SetFieldValue(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(Models.Metadata.Machine.NameKey, item); + + var emptyRom = new Rom(); + emptyRom.SetName(Path.Combine(empty, "_")); + emptyRom.SetFieldValue(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(Models.Metadata.Machine.NameKey, gamename); + + var blankRom = new Rom(); + blankRom.SetName(romname); + blankRom.SetFieldValue(DatItem.MachineKey, blankMachine); + + datFile.Items["null"]?.Add(blankRom); #if NET40_OR_GREATER || NETCOREAPP }); #else