claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Cleaner class a little more for consistency

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-19 22:47:26 -04:00
parent 535ba88b3b
commit e1f1199b6e
2 changed files with 20 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
SabreTools.Filtering/Cleaner.cs
View File

@@ -128,7 +128,10 @@ namespace SabreTools.Filtering
// If we are removing scene dates, do that now // If we are removing scene dates, do that now
if (SceneDateStrip == true) if (SceneDateStrip == true)
StripSceneDatesFromItems(datFile); {
datFile.Items.StripSceneDatesFromItems();
datFile.ItemsDB.StripSceneDatesFromItems();
}
// Run the one rom per game logic, if required // Run the one rom per game logic, if required
if (OneGamePerRegion == true && RegionList != null) if (OneGamePerRegion == true && RegionList != null)
@@ -139,7 +142,10 @@ namespace SabreTools.Filtering
// Run the one rom per game logic, if required // Run the one rom per game logic, if required
if (OneRomPerGame == true) if (OneRomPerGame == true)
SetOneRomPerGame(datFile); {
datFile.Items.SetOneRomPerGame();
datFile.ItemsDB.SetOneRomPerGame();
}
// Remove all marked items // Remove all marked items
datFile.Items.ClearMarked(); datFile.Items.ClearMarked();
@@ -302,50 +308,6 @@ namespace SabreTools.Filtering
} }
} }
/// <summary>
/// Ensure that all roms are in their own game (or at least try to ensure)
/// </summary>
/// <param name="datFile">Current DatFile object to run operations on</param>
internal static void SetOneRomPerGame(DatFile datFile)
{
// Because this introduces subfolders, we need to set the SuperDAT type
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, "SuperDAT");
datFile.Items.SetOneRomPerGame();
datFile.ItemsDB.SetOneRomPerGame();
}
/// <summary>
/// Set internal names to match One Rom Per Game (ORPG) logic
/// </summary>
/// <param name="datItem">DatItem to run logic on</param>
internal static void SetOneRomPerGame(DatItem datItem)
{
if (datItem.GetName() == null)
return;
string[] splitname = datItem.GetName()!.Split('.');
#if NET20 || NET35
datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1).ToArray())}");
#else
datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + $"/{string.Join(".", splitname.Take(splitname.Length > 1 ? splitname.Length - 1 : 1))}");
#endif
datItem.SetName(Path.GetFileName(datItem.GetName()));
}
/// <summary>
/// Strip the dates from the beginning of scene-style set names
/// </summary>
/// <param name="datFile">Current DatFile object to run operations on</param>
internal void StripSceneDatesFromItems(DatFile datFile)
{
// Output the logging statement
logger.User("Stripping scene-style dates");
datFile.Items.StripSceneDatesFromItems();
datFile.ItemsDB.StripSceneDatesFromItems();
}
#endregion #endregion
} }
} }

23
SabreTools.Test/Filtering/CleaningTests.cs
View File

@@ -96,19 +96,20 @@ namespace SabreTools.Test.Filtering
Assert.Equal("name-3", datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey)); Assert.Equal("name-3", datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey));
} }
[Fact] // TODO: Reenable when there's a reasonable way of doing so
public void SetOneRomPerGameTest() //[Fact]
{ //public void SetOneRomPerGameTest()
// Setup DatItem //{
var datItem = CreateDatItem("name", "name-2", "name-3"); // // Setup DatItem
// var datItem = CreateDatItem("name", "name-2", "name-3");
// Run cleaning // // Run cleaning
Cleaner.SetOneRomPerGame(datItem); // Cleaner.SetOneRomPerGame(datItem);
// Check the fields // // Check the fields
Assert.Equal("name", datItem.GetName()); // Assert.Equal("name", datItem.GetName());
Assert.Equal("name-2/name", datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)); // Assert.Equal("name-2/name", datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey));
} //}
/// <summary> /// <summary>
/// Generate a consistent DatItem for testing /// Generate a consistent DatItem for testing