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

Make setter make more sense

Browse Source
This commit is contained in:
Matt Nadareski
2021-02-01 14:07:50 -08:00
parent 691f9baca4
commit f161f14346
5 changed files with 1246 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
SabreTools.DatFiles/Formats/SeparatedValue.cs
View File

@@ -60,46 +60,21 @@ namespace SabreTools.DatFiles.Formats
svr.ReadNextLine();
// Create mapping dictionaries
var datHeaderMappings = new Dictionary<DatHeaderField, string>();
var machineMappings = new Dictionary<MachineField, string>();
var datItemMappings = new Dictionary<DatItemField, string>();
// Now we loop through and get values for everything
for (int i = 0; i < svr.HeaderValues.Count; i++)
{
string value = svr.Line[i];
DatHeaderField dhf = svr.HeaderValues[i].AsDatHeaderField();
if (dhf != DatHeaderField.NULL)
{
datHeaderMappings[dhf] = value;
continue;
}
MachineField mf = svr.HeaderValues[i].AsMachineField();
if (mf != MachineField.NULL)
{
machineMappings[mf] = value;
continue;
}
DatItemField dif = svr.HeaderValues[i].AsDatItemField();
if (dif != DatItemField.NULL)
{
datItemMappings[dif] = value;
continue;
}
}
Setter setter = new Setter();
setter.PopulateSettersFromList(svr.HeaderValues, svr.Line);
// Set DatHeader fields
DatHeader header = new DatHeader();
header.SetFields(datHeaderMappings);
Header.ConditionalCopy(header);
DatHeader datHeader = new DatHeader();
setter.SetFields(datHeader);
Header.ConditionalCopy(datHeader);
// Set Machine and DatItem fields
if (datItemMappings.ContainsKey(DatItemField.Type))
if (setter.DatItemMappings.ContainsKey(DatItemField.Type))
{
DatItem datItem = DatItem.Create(datItemMappings[DatItemField.Type].AsItemType());
Setter.SetFields(datItem, datItemMappings, machineMappings);
DatItem datItem = DatItem.Create(setter.DatItemMappings[DatItemField.Type].AsItemType());
setter.SetFields(datItem);
datItem.Machine = new Machine();
setter.SetFields(datItem.Machine);
datItem.Source = new Source(indexId, filename);
ParseAddHelper(datItem, statsOnly);
}

1220
SabreTools.DatFiles/Setter.cs Normal file
View File

File diff suppressed because it is too large Load Diff

1062
SabreTools.DatItems/Setter.cs
View File

File diff suppressed because it is too large Load Diff

8
SabreTools.Filtering/ExtraIni.cs
View File

@@ -129,11 +129,11 @@ namespace SabreTools.Filtering
continue;
List<DatItem> datItems = datFile.Items[key];
var mappings = machineMap[key];
Setter setter = new Setter { MachineMappings = machineMap[key] };
foreach (var datItem in datItems)
{
Setter.SetFields(datItem.Machine, mappings);
setter.SetFields(datItem.Machine);
}
}
@@ -145,11 +145,11 @@ namespace SabreTools.Filtering
continue;
List<DatItem> datItems = datFile.Items[key];
var mappings = datItemMap[key];
Setter setter = new Setter { DatItemMappings = datItemMap[key] };
foreach (var datItem in datItems)
{
Setter.SetFields(datItem, mappings, null);
setter.SetFields(datItem);
}
}
}

17
SabreTools.Test/DatItems/SetterTests.cs → SabreTools.Test/DatFiles/SetterTests.cs
View File

@@ -1,10 +1,11 @@
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using Xunit;
namespace SabreTools.Test.DatItems
namespace SabreTools.Test.DatFiles
{
public class SetterTests
{
@@ -12,8 +13,11 @@ namespace SabreTools.Test.DatItems
public void SetFieldsDatItemTest()
{
var datItem = CreateDatItem();
var mappings = new Dictionary<DatItemField, string> { [DatItemField.Name] = "bar" };
Setter.SetFields(datItem, mappings, null);
Setter setter = new Setter
{
DatItemMappings = new Dictionary<DatItemField, string> { [DatItemField.Name] = "bar" }
};
setter.SetFields(datItem);
Assert.Equal("bar", datItem.GetName());
}
@@ -21,8 +25,11 @@ namespace SabreTools.Test.DatItems
public void SetFieldsMachineTest()
{
var datItem = CreateDatItem();
var mappings = new Dictionary<MachineField, string> { [MachineField.Name] = "foo" };
Setter.SetFields(datItem, null, mappings);
Setter setter = new Setter
{
MachineMappings = new Dictionary<MachineField, string> { [MachineField.Name] = "foo" }
};
setter.SetFields(datItem.Machine);
Assert.Equal("foo", datItem.Machine.Name);
}