diff --git a/SabreTools.DatFiles/DatFile.Updating.cs b/SabreTools.DatFiles/DatFile.Updating.cs index 5c0646a6..b8863c2c 100644 --- a/SabreTools.DatFiles/DatFile.Updating.cs +++ b/SabreTools.DatFiles/DatFile.Updating.cs @@ -386,31 +386,6 @@ namespace SabreTools.DatFiles return outerDiffData; } - /// - /// Fill a DatFile with all items with a particular ItemType - /// - /// DatFile to add found items to - /// ItemType to retrieve items for - /// DatFile containing all items with the ItemType/returns> - public void FillWithItemType(DatFile indexDat, ItemType itemType) - { - // Loop through and add the items for this index to the output - Parallel.ForEach(Items.Keys, Globals.ParallelOptions, key => - { - List items = DatItem.Merge(Items[key]); - - // If the rom list is empty or null, just skip it - if (items == null || items.Count == 0) - return; - - foreach (DatItem item in items) - { - if (item.ItemType == itemType) - indexDat.Items.Add(key, item); - } - }); - } - /// /// Fill a DatFile with all items with a particular source index ID /// diff --git a/SabreTools.DatFiles/DatFile.Splitting.cs b/SabreTools.DatFiles/DatTool.Splitting.cs similarity index 76% rename from SabreTools.DatFiles/DatFile.Splitting.cs rename to SabreTools.DatFiles/DatTool.Splitting.cs index 6f5d661c..d4b2d75d 100644 --- a/SabreTools.DatFiles/DatFile.Splitting.cs +++ b/SabreTools.DatFiles/DatTool.Splitting.cs @@ -13,19 +13,21 @@ using NaturalSort; // This file represents all methods related to splitting a DatFile into multiple namespace SabreTools.DatFiles { + // TODO: Re-evaluate if these should be made static instead of instanced // TODO: Implement Level split - public abstract partial class DatFile + public partial class DatTool { /// /// Split a DAT by input extensions /// + /// Current DatFile object to split /// List of extensions to split on (first DAT) /// List of extensions to split on (second DAT) /// Extension Set A and Extension Set B DatFiles - public (DatFile extADat, DatFile extBDat) SplitByExtension(List extA, List extB) + public (DatFile extADat, DatFile extBDat) SplitByExtension(DatFile datFile, List extA, List extB) { // If roms is empty, return false - if (Items.TotalCount == 0) + if (datFile.Items.TotalCount == 0) return (null, null); // Make sure all of the extensions don't have a dot at the beginning @@ -36,20 +38,20 @@ namespace SabreTools.DatFiles string newExtBString = string.Join(",", newExtB); // Set all of the appropriate outputs for each of the subsets - DatFile extADat = Create(Header.CloneStandard()); + DatFile extADat = DatFile.Create(datFile.Header.CloneStandard()); extADat.Header.FileName += $" ({newExtAString})"; extADat.Header.Name += $" ({newExtAString})"; extADat.Header.Description += $" ({newExtAString})"; - DatFile extBDat = Create(Header.CloneStandard()); + DatFile extBDat = DatFile.Create(datFile.Header.CloneStandard()); extBDat.Header.FileName += $" ({newExtBString})"; extBDat.Header.Name += $" ({newExtBString})"; extBDat.Header.Description += $" ({newExtBString})"; // Now separate the roms accordingly - Parallel.ForEach(Items.Keys, Globals.ParallelOptions, key => + Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key => { - List items = Items[key]; + List items = datFile.Items[key]; foreach (DatItem item in items) { if (newExtA.Contains(PathExtensions.GetNormalizedExtension(item.GetName() ?? string.Empty))) @@ -75,8 +77,9 @@ namespace SabreTools.DatFiles /// /// Split a DAT by best available hashes /// + /// Current DatFile object to split /// Dictionary of Field to DatFile mappings - public Dictionary SplitByHash() + public Dictionary SplitByHash(DatFile datFile) { // Create each of the respective output DATs logger.User("Creating and populating new DATs"); @@ -85,57 +88,57 @@ namespace SabreTools.DatFiles Dictionary fieldDats = new Dictionary(); // TODO: Can this be made into a loop? - fieldDats[Field.DatItem_Status] = Create(Header.CloneStandard()); + fieldDats[Field.DatItem_Status] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.DatItem_Status].Header.FileName += " (Nodump)"; fieldDats[Field.DatItem_Status].Header.Name += " (Nodump)"; fieldDats[Field.DatItem_Status].Header.Description += " (Nodump)"; - fieldDats[Field.DatItem_SHA512] = Create(Header.CloneStandard()); + fieldDats[Field.DatItem_SHA512] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.DatItem_SHA512].Header.FileName += " (SHA-512)"; fieldDats[Field.DatItem_SHA512].Header.Name += " (SHA-512)"; fieldDats[Field.DatItem_SHA512].Header.Description += " (SHA-512)"; - fieldDats[Field.DatItem_SHA384] = Create(Header.CloneStandard()); + fieldDats[Field.DatItem_SHA384] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.DatItem_SHA384].Header.FileName += " (SHA-384)"; fieldDats[Field.DatItem_SHA384].Header.Name += " (SHA-384)"; fieldDats[Field.DatItem_SHA384].Header.Description += " (SHA-384)"; - fieldDats[Field.DatItem_SHA256] = Create(Header.CloneStandard()); + fieldDats[Field.DatItem_SHA256] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.DatItem_SHA256].Header.FileName += " (SHA-256)"; fieldDats[Field.DatItem_SHA256].Header.Name += " (SHA-256)"; fieldDats[Field.DatItem_SHA256].Header.Description += " (SHA-256)"; - fieldDats[Field.DatItem_SHA1] = Create(Header.CloneStandard()); + fieldDats[Field.DatItem_SHA1] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.DatItem_SHA1].Header.FileName += " (SHA-1)"; fieldDats[Field.DatItem_SHA1].Header.Name += " (SHA-1)"; fieldDats[Field.DatItem_SHA1].Header.Description += " (SHA-1)"; #if NET_FRAMEWORK - fieldDats[Field.DatItem_RIPEMD160] = Create(Header.CloneStandard()); + fieldDats[Field.DatItem_RIPEMD160] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.DatItem_RIPEMD160].Header.FileName += " (RIPEMD160)"; fieldDats[Field.DatItem_RIPEMD160].Header.Name += " (RIPEMD160)"; fieldDats[Field.DatItem_RIPEMD160].Header.Description += " (RIPEMD160)"; #endif - fieldDats[Field.DatItem_MD5] = Create(Header.CloneStandard()); + fieldDats[Field.DatItem_MD5] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.DatItem_MD5].Header.FileName += " (MD5)"; fieldDats[Field.DatItem_MD5].Header.Name += " (MD5)"; fieldDats[Field.DatItem_MD5].Header.Description += " (MD5)"; - fieldDats[Field.DatItem_CRC] = Create(Header.CloneStandard()); + fieldDats[Field.DatItem_CRC] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.DatItem_CRC].Header.FileName += " (CRC)"; fieldDats[Field.DatItem_CRC].Header.Name += " (CRC)"; fieldDats[Field.DatItem_CRC].Header.Description += " (CRC)"; - fieldDats[Field.NULL] = Create(Header.CloneStandard()); + fieldDats[Field.NULL] = DatFile.Create(datFile.Header.CloneStandard()); fieldDats[Field.NULL].Header.FileName += " (Other)"; fieldDats[Field.NULL].Header.Name += " (Other)"; fieldDats[Field.NULL].Header.Description += " (Other)"; // Now populate each of the DAT objects in turn - Parallel.ForEach(Items.Keys, Globals.ParallelOptions, key => + Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key => { - List items = Items[key]; + List items = datFile.Items[key]; foreach (DatItem item in items) { // If the file is not a Disk, Media, or Rom, continue @@ -211,21 +214,22 @@ namespace SabreTools.DatFiles /// /// Split a SuperDAT by lowest available directory level /// + /// Current DatFile object to split /// Name of the directory to write the DATs out to /// True if short names should be used, false otherwise /// True if original filenames should be used as the base for output filename, false otherwise /// True if split succeeded, false otherwise - public bool SplitByLevel(string outDir, bool shortname, bool basedat) + public bool SplitByLevel(DatFile datFile, string outDir, bool shortname, bool basedat) { // First, bucket by games so that we can do the right thing - Items.BucketBy(Field.Machine_Name, DedupeType.None, lower: false, norename: true); + datFile.Items.BucketBy(Field.Machine_Name, DedupeType.None, lower: false, norename: true); // Create a temporary DAT to add things to - DatFile tempDat = Create(Header); + DatFile tempDat = DatFile.Create(datFile.Header); tempDat.Header.Name = null; // Sort the input keys - List keys = Items.Keys.ToList(); + List keys = datFile.Items.Keys.ToList(); keys.Sort(SplitByLevelSort); // Then, we loop over the games @@ -235,12 +239,12 @@ namespace SabreTools.DatFiles if (tempDat.Header.Name != null && tempDat.Header.Name != Path.GetDirectoryName(key)) { // Reset the DAT for the next items - tempDat = Create(Header); + tempDat = DatFile.Create(datFile.Header); tempDat.Header.Name = null; } // Clean the input list and set all games to be pathless - List items = Items[key]; + List items = datFile.Items[key]; items.ForEach(item => item.Machine.Name = Path.GetFileName(item.Machine.Name)); items.ForEach(item => item.Machine.Description = Path.GetFileName(item.Machine.Description)); @@ -275,11 +279,12 @@ namespace SabreTools.DatFiles /// /// Helper function for SplitByLevel to clean and write out a DAT /// + /// Current DatFile object to split /// DAT to clean and write out /// Directory to write out to /// True if short naming scheme should be used, false otherwise /// True if original filenames should be used as the base for output filename, false otherwise - private void SplitByLevelHelper(DatFile newDatFile, string outDir, bool shortname, bool restore) + private void SplitByLevelHelper(DatFile datFile, DatFile newDatFile, string outDir, bool shortname, bool restore) { // Get the name from the DAT to use separately string name = newDatFile.Header.Name; @@ -287,46 +292,46 @@ namespace SabreTools.DatFiles // Now set the new output values newDatFile.Header.FileName = WebUtility.HtmlDecode(string.IsNullOrWhiteSpace(name) - ? Header.FileName + ? datFile.Header.FileName : (shortname ? Path.GetFileName(name) : expName ) ); - newDatFile.Header.FileName = (restore ? $"{Header.FileName} ({newDatFile.Header.FileName})" : newDatFile.Header.FileName); - newDatFile.Header.Name = $"{Header.Name} ({expName})"; - newDatFile.Header.Description = (string.IsNullOrWhiteSpace(Header.Description) ? newDatFile.Header.Name : $"{Header.Description} ({expName})"); + newDatFile.Header.FileName = restore ? $"{datFile.Header.FileName} ({newDatFile.Header.FileName})" : newDatFile.Header.FileName; + newDatFile.Header.Name = $"{datFile.Header.Name} ({expName})"; + newDatFile.Header.Description = string.IsNullOrWhiteSpace(datFile.Header.Description) ? newDatFile.Header.Name : $"{datFile.Header.Description} ({expName})"; newDatFile.Header.Type = null; // Write out the temporary DAT to the proper directory - DatTool dt = new DatTool(); - dt.Write(newDatFile, outDir); + Write(newDatFile, outDir); } /// /// Split a DAT by size of Rom /// + /// Current DatFile object to split /// Long value representing the split point /// Less Than and Greater Than DatFiles - public (DatFile lessThan, DatFile greaterThan) SplitBySize(long radix) + public (DatFile lessThan, DatFile greaterThan) SplitBySize(DatFile datFile, long radix) { // Create each of the respective output DATs logger.User("Creating and populating new DATs"); - DatFile lessThan = Create(Header.CloneStandard()); + DatFile lessThan = DatFile.Create(datFile.Header.CloneStandard()); lessThan.Header.FileName += $" (less than {radix})"; lessThan.Header.Name += $" (less than {radix})"; lessThan.Header.Description += $" (less than {radix})"; - DatFile greaterThan = Create(Header.CloneStandard()); + DatFile greaterThan = DatFile.Create(datFile.Header.CloneStandard()); greaterThan.Header.FileName += $" (equal-greater than {radix})"; greaterThan.Header.Name += $" (equal-greater than {radix})"; greaterThan.Header.Description += $" (equal-greater than {radix})"; // Now populate each of the DAT objects in turn - Parallel.ForEach(Items.Keys, Globals.ParallelOptions, key => + Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key => { - List items = Items[key]; + List items = datFile.Items[key]; foreach (DatItem item in items) { // If the file is not a Rom, it automatically goes in the "lesser" dat @@ -354,8 +359,9 @@ namespace SabreTools.DatFiles /// /// Split a DAT by type of DatItem /// + /// Current DatFile object to split /// Dictionary of ItemType to DatFile mappings - public Dictionary SplitByType() + public Dictionary SplitByType(DatFile datFile) { // Create each of the respective output DATs logger.User("Creating and populating new DATs"); @@ -375,7 +381,7 @@ namespace SabreTools.DatFiles // Setup all of the DatFiles foreach (ItemType itemType in outputTypes) { - typeDats[itemType] = Create(Header.CloneStandard()); + typeDats[itemType] = DatFile.Create(datFile.Header.CloneStandard()); typeDats[itemType].Header.FileName += $" ({itemType})"; typeDats[itemType].Header.Name += $" ({itemType})"; typeDats[itemType].Header.Description += $" ({itemType})"; @@ -384,10 +390,36 @@ namespace SabreTools.DatFiles // Now populate each of the DAT objects in turn Parallel.ForEach(outputTypes, Globals.ParallelOptions, itemType => { - FillWithItemType(typeDats[itemType], itemType); + FillWithItemType(datFile, typeDats[itemType], itemType); }); return typeDats; } + + /// + /// Fill a DatFile with all items with a particular ItemType + /// + /// Current DatFile object to split + /// DatFile to add found items to + /// ItemType to retrieve items for + /// DatFile containing all items with the ItemType/returns> + private void FillWithItemType(DatFile datFile, DatFile indexDat, ItemType itemType) + { + // Loop through and add the items for this index to the output + Parallel.ForEach(datFile.Items.Keys, Globals.ParallelOptions, key => + { + List items = DatItem.Merge(datFile.Items[key]); + + // If the rom list is empty or null, just skip it + if (items == null || items.Count == 0) + return; + + foreach (DatItem item in items) + { + if (item.ItemType == itemType) + indexDat.Items.Add(key, item); + } + }); + } } } \ No newline at end of file diff --git a/SabreTools/Features/Split.cs b/SabreTools/Features/Split.cs index 0dcc32d7..a0fc8055 100644 --- a/SabreTools/Features/Split.cs +++ b/SabreTools/Features/Split.cs @@ -50,7 +50,7 @@ namespace SabreTools.Features // Get only files from the inputs List files = DirectoryExtensions.GetFilesOnly(Inputs, appendparent: true); - // Get the DatTool for parsing + // Get the DatTool for operations DatTool dt = new DatTool(); // Loop over the input files @@ -66,7 +66,7 @@ namespace SabreTools.Features // Extension splitting if (splittingMode.HasFlag(SplittingMode.Extension)) { - (DatFile extADat, DatFile extBDat) = internalDat.SplitByExtension(GetList(features, ExtAListValue), GetList(features, ExtBListValue)); + (DatFile extADat, DatFile extBDat) = dt.SplitByExtension(internalDat, GetList(features, ExtAListValue), GetList(features, ExtBListValue)); InternalStopwatch watch = new InternalStopwatch("Outputting extension-split DATs"); @@ -80,7 +80,7 @@ namespace SabreTools.Features // Hash splitting if (splittingMode.HasFlag(SplittingMode.Hash)) { - Dictionary typeDats = internalDat.SplitByHash(); + Dictionary typeDats = dt.SplitByHash(internalDat); InternalStopwatch watch = new InternalStopwatch("Outputting hash-split DATs"); @@ -97,7 +97,8 @@ namespace SabreTools.Features if (splittingMode.HasFlag(SplittingMode.Level)) { logger.Warning("This feature is not implemented: level-split"); - internalDat.SplitByLevel( + dt.SplitByLevel( + internalDat, OutputDir, GetBoolean(features, ShortValue), GetBoolean(features, BaseValue)); @@ -106,7 +107,7 @@ namespace SabreTools.Features // Size splitting if (splittingMode.HasFlag(SplittingMode.Size)) { - (DatFile lessThan, DatFile greaterThan) = internalDat.SplitBySize(GetInt64(features, RadixInt64Value)); + (DatFile lessThan, DatFile greaterThan) = dt.SplitBySize(internalDat, GetInt64(features, RadixInt64Value)); InternalStopwatch watch = new InternalStopwatch("Outputting size-split DATs"); @@ -120,7 +121,7 @@ namespace SabreTools.Features // Type splitting if (splittingMode.HasFlag(SplittingMode.Type)) { - Dictionary typeDats = internalDat.SplitByType(); + Dictionary typeDats = dt.SplitByType(internalDat); InternalStopwatch watch = new InternalStopwatch("Outputting ItemType DATs");