diff --git a/SabreTools.DatFiles/DatFileTool.cs b/SabreTools.DatFiles/DatFileTool.cs index 1262183d..b3774de4 100644 --- a/SabreTools.DatFiles/DatFileTool.cs +++ b/SabreTools.DatFiles/DatFileTool.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using SabreTools.Core.Tools; -using SabreTools.DatFiles.Formats; using SabreTools.DatItems; using SabreTools.DatItems.Formats; using SabreTools.IO.Logging; @@ -21,68 +20,6 @@ namespace SabreTools.DatFiles #endregion - #region Creation - - /// - /// Create a specific type of DatFile to be used based on a format and a base DAT - /// - /// Format of the DAT to be created, default is - /// DatFile containing the information to use in specific operations, default is null - /// DatFile of the specific internal type that corresponds to the inputs - public static DatFile CreateDatFile(DatFormat datFormat = DatFormat.Logiqx, DatFile? baseDat = null) - { - return datFormat switch - { - DatFormat.ArchiveDotOrg => new ArchiveDotOrg(baseDat), - DatFormat.AttractMode => new AttractMode(baseDat), - DatFormat.ClrMamePro => new ClrMamePro(baseDat), - DatFormat.CSV => new CommaSeparatedValue(baseDat), - DatFormat.DOSCenter => new DosCenter(baseDat), - DatFormat.EverdriveSMDB => new EverdriveSMDB(baseDat), - DatFormat.Listrom => new Listrom(baseDat), - DatFormat.Listxml => new Listxml(baseDat), - DatFormat.Logiqx => new Logiqx(baseDat, false), - DatFormat.LogiqxDeprecated => new Logiqx(baseDat, true), - DatFormat.MissFile => new Missfile(baseDat), - DatFormat.OfflineList => new OfflineList(baseDat), - DatFormat.OpenMSX => new OpenMSX(baseDat), - DatFormat.RedumpMD2 => new Md2File(baseDat), - DatFormat.RedumpMD4 => new Md4File(baseDat), - DatFormat.RedumpMD5 => new Md5File(baseDat), - DatFormat.RedumpSFV => new SfvFile(baseDat), - DatFormat.RedumpSHA1 => new Sha1File(baseDat), - DatFormat.RedumpSHA256 => new Sha256File(baseDat), - DatFormat.RedumpSHA384 => new Sha384File(baseDat), - DatFormat.RedumpSHA512 => new Sha512File(baseDat), - DatFormat.RedumpSpamSum => new SpamSumFile(baseDat), - DatFormat.RomCenter => new RomCenter(baseDat), - DatFormat.SabreJSON => new SabreJSON(baseDat), - DatFormat.SabreXML => new SabreXML(baseDat), - DatFormat.SoftwareList => new Formats.SoftwareList(baseDat), - DatFormat.SSV => new SemicolonSeparatedValue(baseDat), - DatFormat.TSV => new TabSeparatedValue(baseDat), - - // We use new-style Logiqx as a backup for generic DatFile - _ => new Logiqx(baseDat, false), - }; - } - - /// - /// Create a new DatFile from an existing DatHeader - /// - /// DatHeader to get the values from - /// DatModifiers to get the values from - public static DatFile CreateDatFile(DatHeader datHeader, DatModifiers datModifiers) - { - DatFormat format = datHeader.GetFieldValue(DatHeader.DatFormatKey); - DatFile datFile = CreateDatFile(format); - datFile.SetHeader(datHeader); - datFile.SetModifiers(datModifiers); - return datFile; - } - - #endregion - #region Sorting and Merging /// diff --git a/SabreTools.DatFiles/Parser.cs b/SabreTools.DatFiles/Parser.cs index 0ce1f225..c722cfd0 100644 --- a/SabreTools.DatFiles/Parser.cs +++ b/SabreTools.DatFiles/Parser.cs @@ -6,6 +6,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; #endif using SabreTools.Core.Tools; +using SabreTools.DatFiles.Formats; using SabreTools.DatItems; using SabreTools.IO; using SabreTools.IO.Extensions; @@ -27,6 +28,64 @@ namespace SabreTools.DatFiles #endregion + /// + /// Create a specific type of DatFile to be used based on a format and a base DAT + /// + /// Format of the DAT to be created, default is + /// DatFile containing the information to use in specific operations, default is null + /// DatFile of the specific internal type that corresponds to the inputs + public static DatFile CreateDatFile(DatFormat datFormat = DatFormat.Logiqx, DatFile? baseDat = null) + { + return datFormat switch + { + DatFormat.ArchiveDotOrg => new ArchiveDotOrg(baseDat), + DatFormat.AttractMode => new AttractMode(baseDat), + DatFormat.ClrMamePro => new ClrMamePro(baseDat), + DatFormat.CSV => new CommaSeparatedValue(baseDat), + DatFormat.DOSCenter => new DosCenter(baseDat), + DatFormat.EverdriveSMDB => new EverdriveSMDB(baseDat), + DatFormat.Listrom => new Listrom(baseDat), + DatFormat.Listxml => new Listxml(baseDat), + DatFormat.Logiqx => new Logiqx(baseDat, false), + DatFormat.LogiqxDeprecated => new Logiqx(baseDat, true), + DatFormat.MissFile => new Missfile(baseDat), + DatFormat.OfflineList => new OfflineList(baseDat), + DatFormat.OpenMSX => new OpenMSX(baseDat), + DatFormat.RedumpMD2 => new Md2File(baseDat), + DatFormat.RedumpMD4 => new Md4File(baseDat), + DatFormat.RedumpMD5 => new Md5File(baseDat), + DatFormat.RedumpSFV => new SfvFile(baseDat), + DatFormat.RedumpSHA1 => new Sha1File(baseDat), + DatFormat.RedumpSHA256 => new Sha256File(baseDat), + DatFormat.RedumpSHA384 => new Sha384File(baseDat), + DatFormat.RedumpSHA512 => new Sha512File(baseDat), + DatFormat.RedumpSpamSum => new SpamSumFile(baseDat), + DatFormat.RomCenter => new RomCenter(baseDat), + DatFormat.SabreJSON => new SabreJSON(baseDat), + DatFormat.SabreXML => new SabreXML(baseDat), + DatFormat.SoftwareList => new Formats.SoftwareList(baseDat), + DatFormat.SSV => new SemicolonSeparatedValue(baseDat), + DatFormat.TSV => new TabSeparatedValue(baseDat), + + // We use new-style Logiqx as a backup for generic DatFile + _ => new Logiqx(baseDat, false), + }; + } + + /// + /// Create a new DatFile from an existing DatHeader + /// + /// DatHeader to get the values from + /// DatModifiers to get the values from + public static DatFile CreateDatFile(DatHeader datHeader, DatModifiers datModifiers) + { + DatFormat format = datHeader.GetFieldValue(DatHeader.DatFormatKey); + DatFile datFile = CreateDatFile(format); + datFile.SetHeader(datHeader); + datFile.SetModifiers(datModifiers); + return datFile; + } + /// /// Parse a DAT and return all found games and roms within /// @@ -70,7 +129,7 @@ namespace SabreTools.DatFiles // Now parse the correct type of DAT try { - DatFile parsingDatFile = DatFileTool.CreateDatFile(datFormat, datFile); + DatFile parsingDatFile = CreateDatFile(datFormat, datFile); parsingDatFile.ParseFile(filename, indexId, keep, statsOnly: statsOnly, throwOnError: throwOnError); } catch (Exception ex) when (!throwOnError) @@ -90,9 +149,9 @@ namespace SabreTools.DatFiles { // Null filenames are invalid if (filename == null) - return DatFileTool.CreateDatFile(); + return CreateDatFile(); - DatFile datFile = DatFileTool.CreateDatFile(); + DatFile datFile = CreateDatFile(); ParseInto(datFile, filename, statsOnly: true, throwOnError: throwOnError); return datFile; } @@ -131,7 +190,7 @@ namespace SabreTools.DatFiles { var input = inputs[i]; _staticLogger.User($"Adding DAT: {input.CurrentPath}"); - datFiles[i] = DatFileTool.CreateDatFile(datFile.Header.CloneFormat(), datFile.Modifiers); + datFiles[i] = CreateDatFile(datFile.Header.CloneFormat(), datFile.Modifiers); ParseInto(datFiles[i], input.CurrentPath, i, keep: true); #if NET40_OR_GREATER || NETCOREAPP }); diff --git a/SabreTools.DatTools/Diffing.cs b/SabreTools.DatTools/Diffing.cs index ef3c9841..0b4b1508 100644 --- a/SabreTools.DatTools/Diffing.cs +++ b/SabreTools.DatTools/Diffing.cs @@ -149,7 +149,7 @@ namespace SabreTools.DatTools for (int j = 0; j < datHeaders.Count; j++) #endif { - DatFile diffData = DatFileTool.CreateDatFile(datHeaders[j], new DatModifiers()); + DatFile diffData = Parser.CreateDatFile(datHeaders[j], new DatModifiers()); diffData.ResetDictionary(); FillWithSourceIndex(datFile, diffData, j); FillWithSourceIndexDB(datFile, diffData, j); @@ -198,7 +198,7 @@ namespace SabreTools.DatTools datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, "datFile.All DATs"); string post = " (Duplicates)"; - DatFile dupeData = DatFileTool.CreateDatFile(datFile.Header, datFile.Modifiers); + DatFile dupeData = Parser.CreateDatFile(datFile.Header, datFile.Modifiers); dupeData.Header.SetFieldValue(DatHeader.FileNameKey, dupeData.Header.GetStringFieldValue(DatHeader.FileNameKey) + post); dupeData.Header.SetFieldValue(Models.Metadata.Header.NameKey, dupeData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + post); dupeData.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, dupeData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + post); @@ -276,7 +276,7 @@ namespace SabreTools.DatTools datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, "datFile.All DATs"); string post = " (Duplicates)"; - DatFile dupeData = DatFileTool.CreateDatFile(datFile.Header, datFile.Modifiers); + DatFile dupeData = Parser.CreateDatFile(datFile.Header, datFile.Modifiers); dupeData.Header.SetFieldValue(DatHeader.FileNameKey, dupeData.Header.GetStringFieldValue(DatHeader.FileNameKey) + post); dupeData.Header.SetFieldValue(Models.Metadata.Header.NameKey, dupeData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + post); dupeData.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, dupeData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + post); @@ -412,7 +412,7 @@ namespace SabreTools.DatTools #endif { string innerpost = $" ({j} - {inputs[j].GetNormalizedFileName(true)} Only)"; - DatFile diffData = DatFileTool.CreateDatFile(datFile.Header, datFile.Modifiers); + DatFile diffData = Parser.CreateDatFile(datFile.Header, datFile.Modifiers); diffData.Header.SetFieldValue(DatHeader.FileNameKey, diffData.Header.GetStringFieldValue(DatHeader.FileNameKey) + innerpost); diffData.Header.SetFieldValue(Models.Metadata.Header.NameKey, diffData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + innerpost); diffData.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, diffData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + innerpost); @@ -505,7 +505,7 @@ namespace SabreTools.DatTools #endif { string innerpost = $" ({j} - {inputs[j].GetNormalizedFileName(true)} Only)"; - DatFile diffData = DatFileTool.CreateDatFile(datFile.Header, datFile.Modifiers); + DatFile diffData = Parser.CreateDatFile(datFile.Header, datFile.Modifiers); diffData.Header.SetFieldValue(DatHeader.FileNameKey, diffData.Header.GetStringFieldValue(DatHeader.FileNameKey) + innerpost); diffData.Header.SetFieldValue(Models.Metadata.Header.NameKey, diffData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + innerpost); diffData.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, diffData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + innerpost); @@ -629,7 +629,7 @@ namespace SabreTools.DatTools datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, "All DATs"); string post = " (No Duplicates)"; - DatFile outerDiffData = DatFileTool.CreateDatFile(datFile.Header, datFile.Modifiers); + DatFile outerDiffData = Parser.CreateDatFile(datFile.Header, datFile.Modifiers); outerDiffData.Header.SetFieldValue(DatHeader.FileNameKey, outerDiffData.Header.GetStringFieldValue(DatHeader.FileNameKey) + post); outerDiffData.Header.SetFieldValue(Models.Metadata.Header.NameKey, outerDiffData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + post); outerDiffData.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, outerDiffData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + post); @@ -705,7 +705,7 @@ namespace SabreTools.DatTools datFile.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, "All DATs"); string post = " (No Duplicates)"; - DatFile outerDiffData = DatFileTool.CreateDatFile(datFile.Header, datFile.Modifiers); + DatFile outerDiffData = Parser.CreateDatFile(datFile.Header, datFile.Modifiers); outerDiffData.Header.SetFieldValue(DatHeader.FileNameKey, outerDiffData.Header.GetStringFieldValue(DatHeader.FileNameKey) + post); outerDiffData.Header.SetFieldValue(Models.Metadata.Header.NameKey, outerDiffData.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + post); outerDiffData.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, outerDiffData.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + post); diff --git a/SabreTools.DatTools/Splitter.cs b/SabreTools.DatTools/Splitter.cs index e6204d41..417b7302 100644 --- a/SabreTools.DatTools/Splitter.cs +++ b/SabreTools.DatTools/Splitter.cs @@ -54,12 +54,12 @@ namespace SabreTools.DatTools string newExtBString = string.Join(",", newExtB); // Set all of the appropriate outputs for each of the subsets - DatFile extADat = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile extADat = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); extADat.Header.SetFieldValue(DatHeader.FileNameKey, extADat.Header.GetStringFieldValue(DatHeader.FileNameKey) + $" ({newExtAString})"); extADat.Header.SetFieldValue(Models.Metadata.Header.NameKey, extADat.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" ({newExtAString})"); extADat.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, extADat.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" ({newExtAString})"); - DatFile extBDat = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile extBDat = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); extBDat.Header.SetFieldValue(DatHeader.FileNameKey, extBDat.Header.GetStringFieldValue(DatHeader.FileNameKey) + $" ({newExtBString})"); extBDat.Header.SetFieldValue(Models.Metadata.Header.NameKey, extBDat.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" ({newExtBString})"); extBDat.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, extBDat.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" ({newExtBString})"); @@ -131,12 +131,12 @@ namespace SabreTools.DatTools string newExtBString = string.Join(",", newExtB); // Set all of the appropriate outputs for each of the subsets - DatFile extADat = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile extADat = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); extADat.Header.SetFieldValue(DatHeader.FileNameKey, extADat.Header.GetStringFieldValue(DatHeader.FileNameKey) + $" ({newExtAString})"); extADat.Header.SetFieldValue(Models.Metadata.Header.NameKey, extADat.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" ({newExtAString})"); extADat.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, extADat.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" ({newExtAString})"); - DatFile extBDat = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile extBDat = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); extBDat.Header.SetFieldValue(DatHeader.FileNameKey, extBDat.Header.GetStringFieldValue(DatHeader.FileNameKey) + $" ({newExtBString})"); extBDat.Header.SetFieldValue(Models.Metadata.Header.NameKey, extBDat.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" ({newExtBString})"); extBDat.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, extBDat.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" ({newExtBString})"); @@ -232,7 +232,7 @@ namespace SabreTools.DatTools Dictionary fieldDats = []; foreach (var kvp in mappings) { - fieldDats[kvp.Key] = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + fieldDats[kvp.Key] = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); fieldDats[kvp.Key].Header.SetFieldValue(DatHeader.FileNameKey, fieldDats[kvp.Key].Header.GetStringFieldValue(DatHeader.FileNameKey) + kvp.Value); fieldDats[kvp.Key].Header.SetFieldValue(Models.Metadata.Header.NameKey, fieldDats[kvp.Key].Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + kvp.Value); fieldDats[kvp.Key].Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, fieldDats[kvp.Key].Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + kvp.Value); @@ -349,7 +349,7 @@ namespace SabreTools.DatTools Dictionary fieldDats = []; foreach (var kvp in mappings) { - fieldDats[kvp.Key] = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + fieldDats[kvp.Key] = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); fieldDats[kvp.Key].Header.SetFieldValue(DatHeader.FileNameKey, fieldDats[kvp.Key].Header.GetStringFieldValue(DatHeader.FileNameKey) + kvp.Value); fieldDats[kvp.Key].Header.SetFieldValue(Models.Metadata.Header.NameKey, fieldDats[kvp.Key].Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + kvp.Value); fieldDats[kvp.Key].Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, fieldDats[kvp.Key].Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + kvp.Value); @@ -492,7 +492,7 @@ namespace SabreTools.DatTools datFile.BucketBy(ItemKey.Machine, lower: false, norename: true); // Create a temporary DAT to add things to - DatFile tempDat = DatFileTool.CreateDatFile(datFile.Header, datFile.Modifiers); + DatFile tempDat = Parser.CreateDatFile(datFile.Header, datFile.Modifiers); tempDat.Header.SetFieldValue(Models.Metadata.Header.NameKey, null); // Sort the input keys @@ -512,7 +512,7 @@ namespace SabreTools.DatTools if (tempDat.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) != null && tempDat.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) != Path.GetDirectoryName(key)) { // Reset the DAT for the next items - tempDat = DatFileTool.CreateDatFile(datFile.Header, datFile.Modifiers); + tempDat = Parser.CreateDatFile(datFile.Header, datFile.Modifiers); tempDat.Header.SetFieldValue(Models.Metadata.Header.NameKey, null); } @@ -615,12 +615,12 @@ namespace SabreTools.DatTools // Create each of the respective output DATs InternalStopwatch watch = new($"Splitting DAT by size"); - DatFile lessThan = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile lessThan = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); lessThan.Header.SetFieldValue(DatHeader.FileNameKey, lessThan.Header.GetStringFieldValue(DatHeader.FileNameKey) + $" (less than {radix})"); lessThan.Header.SetFieldValue(Models.Metadata.Header.NameKey, lessThan.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" (less than {radix})"); lessThan.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, lessThan.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" (less than {radix})"); - DatFile greaterThan = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile greaterThan = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); greaterThan.Header.SetFieldValue(DatHeader.FileNameKey, greaterThan.Header.GetStringFieldValue(DatHeader.FileNameKey) + $" (equal-greater than {radix})"); greaterThan.Header.SetFieldValue(Models.Metadata.Header.NameKey, greaterThan.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" (equal-greater than {radix})"); greaterThan.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, greaterThan.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" (equal-greater than {radix})"); @@ -681,12 +681,12 @@ namespace SabreTools.DatTools // Create each of the respective output DATs var watch = new InternalStopwatch($"Splitting DAT by size"); - DatFile lessThan = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile lessThan = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); lessThan.Header.SetFieldValue(DatHeader.FileNameKey, lessThan.Header.GetStringFieldValue(DatHeader.FileNameKey) + $" (less than {radix})"); lessThan.Header.SetFieldValue(Models.Metadata.Header.NameKey, lessThan.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" (less than {radix})"); lessThan.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, lessThan.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" (less than {radix})"); - DatFile greaterThan = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile greaterThan = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); greaterThan.Header.SetFieldValue(DatHeader.FileNameKey, greaterThan.Header.GetStringFieldValue(DatHeader.FileNameKey) + $" (equal-greater than {radix})"); greaterThan.Header.SetFieldValue(Models.Metadata.Header.NameKey, greaterThan.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" (equal-greater than {radix})"); greaterThan.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, greaterThan.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" (equal-greater than {radix})"); @@ -782,7 +782,7 @@ namespace SabreTools.DatTools // Initialize everything long currentSize = 0; long currentIndex = 0; - DatFile currentDat = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + DatFile currentDat = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); currentDat.Header.SetFieldValue(DatHeader.FileNameKey, currentDat.Header.GetStringFieldValue(DatHeader.FileNameKey) + $"_{currentIndex}"); currentDat.Header.SetFieldValue(Models.Metadata.Header.NameKey, currentDat.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $"_{currentIndex}"); currentDat.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, currentDat.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $"_{currentIndex}"); @@ -825,7 +825,7 @@ namespace SabreTools.DatTools datFiles.Add(currentDat); currentSize = 0; currentIndex++; - currentDat = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + currentDat = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); currentDat.Header.SetFieldValue(DatHeader.FileNameKey, currentDat.Header.GetStringFieldValue(DatHeader.FileNameKey) + $"_{currentIndex}"); currentDat.Header.SetFieldValue(Models.Metadata.Header.NameKey, currentDat.Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $"_{currentIndex}"); currentDat.Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, currentDat.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $"_{currentIndex}"); @@ -869,7 +869,7 @@ namespace SabreTools.DatTools // Setup all of the DatFiles foreach (ItemType itemType in outputTypes) { - typeDats[itemType] = DatFileTool.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); + typeDats[itemType] = Parser.CreateDatFile((DatHeader)datFile.Header.Clone(), datFile.Modifiers); typeDats[itemType].Header.SetFieldValue(DatHeader.FileNameKey, typeDats[itemType].Header.GetStringFieldValue(DatHeader.FileNameKey) + $" ({itemType})"); typeDats[itemType].Header.SetFieldValue(Models.Metadata.Header.NameKey, typeDats[itemType].Header.GetStringFieldValue(Models.Metadata.Header.NameKey) + $" ({itemType})"); typeDats[itemType].Header.SetFieldValue(Models.Metadata.Header.DescriptionKey, typeDats[itemType].Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey) + $" ({itemType})"); diff --git a/SabreTools.DatTools/Writer.cs b/SabreTools.DatTools/Writer.cs index a53b8166..7967bdd9 100644 --- a/SabreTools.DatTools/Writer.cs +++ b/SabreTools.DatTools/Writer.cs @@ -171,7 +171,7 @@ namespace SabreTools.DatTools string outfile = outfiles[datFormat]; try { - DatFile writingDatFile = DatFileTool.CreateDatFile(datFormat, datFile); + DatFile writingDatFile = Parser.CreateDatFile(datFormat, datFile); writingDatFile.WriteToFile(outfile, ignoreblanks: true, throwOnError); } catch (Exception ex) when (!throwOnError) diff --git a/SabreTools/Features/Batch.cs b/SabreTools/Features/Batch.cs index 42dd3e71..62abe3a9 100644 --- a/SabreTools/Features/Batch.cs +++ b/SabreTools/Features/Batch.cs @@ -895,7 +895,7 @@ Reset the internal state: reset();"; /// private class BatchState { - public DatFile DatFile { get; set; } = DatFileTool.CreateDatFile(); + public DatFile DatFile { get; set; } = Parser.CreateDatFile(); public int Index { get; set; } = 0; public string? OutputDirectory { get; set; } = null; @@ -905,7 +905,7 @@ Reset the internal state: reset();"; public void Reset() { Index = 0; - DatFile = DatFileTool.CreateDatFile(); + DatFile = Parser.CreateDatFile(); OutputDirectory = null; } } diff --git a/SabreTools/Features/DatFromDir.cs b/SabreTools/Features/DatFromDir.cs index 2381515a..8cf7aca5 100644 --- a/SabreTools/Features/DatFromDir.cs +++ b/SabreTools/Features/DatFromDir.cs @@ -71,7 +71,7 @@ namespace SabreTools.Features Remover!.PopulateExclusionsFromList(["DatItem.Date"]); // Create a new DATFromDir object and process the inputs - DatFile basedat = DatFileTool.CreateDatFile(Header!, Modifiers!); + DatFile basedat = Parser.CreateDatFile(Header!, Modifiers!); basedat.Header.SetFieldValue(Models.Metadata.Header.DateKey, DateTime.Now.ToString("yyyy-MM-dd")); // Update the cleaner based on certain flags @@ -84,7 +84,7 @@ namespace SabreTools.Features if (Directory.Exists(path) || File.Exists(path)) { // Clone the base Dat for information - DatFile datdata = DatFileTool.CreateDatFile(basedat.Header, basedat.Modifiers); + DatFile datdata = Parser.CreateDatFile(basedat.Header, basedat.Modifiers); // Get the base path and fill the header, if needed string basePath = Path.GetFullPath(path); diff --git a/SabreTools/Features/Sort.cs b/SabreTools/Features/Sort.cs index 740a6477..7bfdf911 100644 --- a/SabreTools/Features/Sort.cs +++ b/SabreTools/Features/Sort.cs @@ -93,7 +93,7 @@ namespace SabreTools.Features { foreach (ParentablePath datfile in datfilePaths) { - DatFile datdata = DatFileTool.CreateDatFile(); + DatFile datdata = Parser.CreateDatFile(); Parser.ParseInto(datdata, datfile.CurrentPath, int.MaxValue, keep: true); // Skip if nothing was parsed @@ -133,7 +133,7 @@ namespace SabreTools.Features var watch = new InternalStopwatch("Populating internal DAT"); // Add all of the input DATs into one huge internal DAT - DatFile datdata = DatFileTool.CreateDatFile(); + DatFile datdata = Parser.CreateDatFile(); foreach (ParentablePath datfile in datfilePaths) { Parser.ParseInto(datdata, datfile.CurrentPath, int.MaxValue, keep: true); diff --git a/SabreTools/Features/Split.cs b/SabreTools/Features/Split.cs index 6414dccb..6bc40668 100644 --- a/SabreTools/Features/Split.cs +++ b/SabreTools/Features/Split.cs @@ -64,7 +64,7 @@ namespace SabreTools.Features foreach (ParentablePath file in files) { // Create and fill the new DAT - DatFile internalDat = DatFileTool.CreateDatFile(Header!, Modifiers!); + DatFile internalDat = Parser.CreateDatFile(Header!, Modifiers!); Parser.ParseInto(internalDat, file.CurrentPath); // Get the output directory diff --git a/SabreTools/Features/Update.cs b/SabreTools/Features/Update.cs index 6eb448ce..58e932a3 100644 --- a/SabreTools/Features/Update.cs +++ b/SabreTools/Features/Update.cs @@ -147,7 +147,7 @@ namespace SabreTools.Features } // Create a DAT to capture inputs - DatFile userInputDat = DatFileTool.CreateDatFile(Header!, Modifiers); + DatFile userInputDat = Parser.CreateDatFile(Header!, Modifiers); // Populate using the correct set List datHeaders = GetDatHeaders(updateMode, inputPaths, basePaths, userInputDat); @@ -301,7 +301,7 @@ namespace SabreTools.Features #endif { // Parse the path to a new DatFile - DatFile repDat = DatFileTool.CreateDatFile(Header!, Modifiers); + DatFile repDat = Parser.CreateDatFile(Header!, Modifiers); Parser.ParseInto(repDat, inputPath.CurrentPath, indexId: 1, keep: true); // Perform additional processing steps @@ -337,7 +337,7 @@ namespace SabreTools.Features #endif { // Parse the path to a new DatFile - DatFile repDat = DatFileTool.CreateDatFile(Header!, Modifiers); + DatFile repDat = Parser.CreateDatFile(Header!, Modifiers); Parser.ParseInto(repDat, inputPath.CurrentPath, indexId: 1, keep: true); // Perform additional processing steps @@ -460,7 +460,7 @@ namespace SabreTools.Features #endif { // Create a new base DatFile - DatFile datFile = DatFileTool.CreateDatFile(Header!, Modifiers!); + DatFile datFile = Parser.CreateDatFile(Header!, Modifiers!); _logger.User($"Processing '{Path.GetFileName(inputPath.CurrentPath)}'"); // Check the current format diff --git a/SabreTools/Features/Verify.cs b/SabreTools/Features/Verify.cs index 5bcd2e72..d8c20b33 100644 --- a/SabreTools/Features/Verify.cs +++ b/SabreTools/Features/Verify.cs @@ -62,7 +62,7 @@ namespace SabreTools.Features foreach (ParentablePath datfile in datfilePaths) { // Parse in from the file - DatFile datdata = DatFileTool.CreateDatFile(); + DatFile datdata = Parser.CreateDatFile(); Parser.ParseInto(datdata, datfile.CurrentPath, int.MaxValue, keep: true); // Perform additional processing steps @@ -111,7 +111,7 @@ namespace SabreTools.Features var watch = new InternalStopwatch("Populating internal DAT"); // Add all of the input DATs into one huge internal DAT - DatFile datdata = DatFileTool.CreateDatFile(); + DatFile datdata = Parser.CreateDatFile(); foreach (ParentablePath datfile in datfilePaths) { Parser.ParseInto(datdata, datfile.CurrentPath, int.MaxValue, keep: true);