mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Fix build... (understatement)
This commit is contained in:
Matt Nadareski
@@ -459,7 +459,7 @@ namespace SabreTools.DatFiles
|
||||
if (!string.IsNullOrWhiteSpace(disk.SHA1))
|
||||
{
|
||||
name = Utilities.GetDepotPath(disk.SHA1, Header.OutputDepot.Depth).Replace('\\', '/');
|
||||
item.SetFields(new Dictionary<Field, string> { [Field.DatItem_Name] = $"{pre}{name}{post}" } );
|
||||
item.SetFields(new Dictionary<DatItemField, string> { [DatItemField.Name] = $"{pre}{name}{post}" }, null);
|
||||
}
|
||||
}
|
||||
else if (item.ItemType == ItemType.Media)
|
||||
@@ -470,7 +470,7 @@ namespace SabreTools.DatFiles
|
||||
if (!string.IsNullOrWhiteSpace(media.SHA1))
|
||||
{
|
||||
name = Utilities.GetDepotPath(media.SHA1, Header.OutputDepot.Depth).Replace('\\', '/');
|
||||
item.SetFields(new Dictionary<Field, string> { [Field.DatItem_Name] = $"{pre}{name}{post}" });
|
||||
item.SetFields(new Dictionary<DatItemField, string> { [DatItemField.Name] = $"{pre}{name}{post}" }, null);
|
||||
}
|
||||
}
|
||||
else if (item.ItemType == ItemType.Rom)
|
||||
@@ -481,7 +481,7 @@ namespace SabreTools.DatFiles
|
||||
if (!string.IsNullOrWhiteSpace(rom.SHA1))
|
||||
{
|
||||
name = Utilities.GetDepotPath(rom.SHA1, Header.OutputDepot.Depth).Replace('\\', '/');
|
||||
item.SetFields(new Dictionary<Field, string> { [Field.DatItem_Name] = $"{pre}{name}{post}" });
|
||||
item.SetFields(new Dictionary<DatItemField, string> { [DatItemField.Name] = $"{pre}{name}{post}" }, null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -505,7 +505,7 @@ namespace SabreTools.DatFiles
|
||||
name = Path.Combine(item.Machine.Name, name);
|
||||
|
||||
// Now assign back the item name
|
||||
item.SetFields(new Dictionary<Field, string> { [Field.DatItem_Name] = pre + name + post });
|
||||
item.SetFields(new Dictionary<DatItemField, string> { [DatItemField.Name] = pre + name + post }, null);
|
||||
|
||||
// Restore all relevant values
|
||||
if (forceRemoveQuotes)
|
||||
|
||||
@@ -406,121 +406,121 @@ namespace SabreTools.DatFiles
|
||||
/// Set fields with given values
|
||||
/// </summary>
|
||||
/// <param name="mappings">Mappings dictionary</param>
|
||||
public void SetFields(Dictionary<Field, string> mappings)
|
||||
public void SetFields(Dictionary<DatHeaderField, string> mappings)
|
||||
{
|
||||
#region Common
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_FileName))
|
||||
FileName = mappings[Field.DatHeader_FileName];
|
||||
if (mappings.Keys.Contains(DatHeaderField.FileName))
|
||||
FileName = mappings[DatHeaderField.FileName];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Name))
|
||||
Name = mappings[Field.DatHeader_Name];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Name))
|
||||
Name = mappings[DatHeaderField.Name];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Description))
|
||||
Description = mappings[Field.DatHeader_Description];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Description))
|
||||
Description = mappings[DatHeaderField.Description];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_RootDir))
|
||||
RootDir = mappings[Field.DatHeader_RootDir];
|
||||
if (mappings.Keys.Contains(DatHeaderField.RootDir))
|
||||
RootDir = mappings[DatHeaderField.RootDir];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Category))
|
||||
Category = mappings[Field.DatHeader_Category];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Category))
|
||||
Category = mappings[DatHeaderField.Category];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Version))
|
||||
Version = mappings[Field.DatHeader_Version];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Version))
|
||||
Version = mappings[DatHeaderField.Version];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Date))
|
||||
Date = mappings[Field.DatHeader_Date];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Date))
|
||||
Date = mappings[DatHeaderField.Date];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Author))
|
||||
Author = mappings[Field.DatHeader_Author];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Author))
|
||||
Author = mappings[DatHeaderField.Author];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Email))
|
||||
Email = mappings[Field.DatHeader_Email];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Email))
|
||||
Email = mappings[DatHeaderField.Email];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Homepage))
|
||||
Homepage = mappings[Field.DatHeader_Homepage];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Homepage))
|
||||
Homepage = mappings[DatHeaderField.Homepage];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Url))
|
||||
Url = mappings[Field.DatHeader_Url];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Url))
|
||||
Url = mappings[DatHeaderField.Url];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Comment))
|
||||
Comment = mappings[Field.DatHeader_Comment];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Comment))
|
||||
Comment = mappings[DatHeaderField.Comment];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_HeaderSkipper))
|
||||
HeaderSkipper = mappings[Field.DatHeader_HeaderSkipper];
|
||||
if (mappings.Keys.Contains(DatHeaderField.HeaderSkipper))
|
||||
HeaderSkipper = mappings[DatHeaderField.HeaderSkipper];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Type))
|
||||
Type = mappings[Field.DatHeader_Type];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Type))
|
||||
Type = mappings[DatHeaderField.Type];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_ForceMerging))
|
||||
ForceMerging = mappings[Field.DatHeader_ForceMerging].AsMergingFlag();
|
||||
if (mappings.Keys.Contains(DatHeaderField.ForceMerging))
|
||||
ForceMerging = mappings[DatHeaderField.ForceMerging].AsMergingFlag();
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_ForceNodump))
|
||||
ForceNodump = mappings[Field.DatHeader_ForceNodump].AsNodumpFlag();
|
||||
if (mappings.Keys.Contains(DatHeaderField.ForceNodump))
|
||||
ForceNodump = mappings[DatHeaderField.ForceNodump].AsNodumpFlag();
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_ForcePacking))
|
||||
ForcePacking = mappings[Field.DatHeader_ForcePacking].AsPackingFlag();
|
||||
if (mappings.Keys.Contains(DatHeaderField.ForcePacking))
|
||||
ForcePacking = mappings[DatHeaderField.ForcePacking].AsPackingFlag();
|
||||
|
||||
#endregion
|
||||
|
||||
#region ListXML
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Debug))
|
||||
Debug = mappings[Field.DatHeader_Debug].AsYesNo();
|
||||
if (mappings.Keys.Contains(DatHeaderField.Debug))
|
||||
Debug = mappings[DatHeaderField.Debug].AsYesNo();
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_MameConfig))
|
||||
MameConfig = mappings[Field.DatHeader_MameConfig];
|
||||
if (mappings.Keys.Contains(DatHeaderField.MameConfig))
|
||||
MameConfig = mappings[DatHeaderField.MameConfig];
|
||||
|
||||
#endregion
|
||||
|
||||
#region Logiqx
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_Build))
|
||||
Build = mappings[Field.DatHeader_Build];
|
||||
if (mappings.Keys.Contains(DatHeaderField.Build))
|
||||
Build = mappings[DatHeaderField.Build];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_RomMode))
|
||||
RomMode = mappings[Field.DatHeader_RomMode].AsMergingFlag();
|
||||
if (mappings.Keys.Contains(DatHeaderField.RomMode))
|
||||
RomMode = mappings[DatHeaderField.RomMode].AsMergingFlag();
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_BiosMode))
|
||||
BiosMode = mappings[Field.DatHeader_BiosMode].AsMergingFlag();
|
||||
if (mappings.Keys.Contains(DatHeaderField.BiosMode))
|
||||
BiosMode = mappings[DatHeaderField.BiosMode].AsMergingFlag();
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_SampleMode))
|
||||
SampleMode = mappings[Field.DatHeader_SampleMode].AsMergingFlag();
|
||||
if (mappings.Keys.Contains(DatHeaderField.SampleMode))
|
||||
SampleMode = mappings[DatHeaderField.SampleMode].AsMergingFlag();
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_LockRomMode))
|
||||
LockRomMode = mappings[Field.DatHeader_LockRomMode].AsYesNo();
|
||||
if (mappings.Keys.Contains(DatHeaderField.LockRomMode))
|
||||
LockRomMode = mappings[DatHeaderField.LockRomMode].AsYesNo();
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_LockBiosMode))
|
||||
LockBiosMode = mappings[Field.DatHeader_LockBiosMode].AsYesNo();
|
||||
if (mappings.Keys.Contains(DatHeaderField.LockBiosMode))
|
||||
LockBiosMode = mappings[DatHeaderField.LockBiosMode].AsYesNo();
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_LockSampleMode))
|
||||
LockSampleMode = mappings[Field.DatHeader_LockSampleMode].AsYesNo();
|
||||
if (mappings.Keys.Contains(DatHeaderField.LockSampleMode))
|
||||
LockSampleMode = mappings[DatHeaderField.LockSampleMode].AsYesNo();
|
||||
|
||||
#endregion
|
||||
|
||||
#region OfflineList
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_System))
|
||||
System = mappings[Field.DatHeader_System];
|
||||
if (mappings.Keys.Contains(DatHeaderField.System))
|
||||
System = mappings[DatHeaderField.System];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_ScreenshotsWidth))
|
||||
ScreenshotsWidth = mappings[Field.DatHeader_ScreenshotsWidth];
|
||||
if (mappings.Keys.Contains(DatHeaderField.ScreenshotsWidth))
|
||||
ScreenshotsWidth = mappings[DatHeaderField.ScreenshotsWidth];
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_ScreenshotsHeight))
|
||||
ScreenshotsHeight = mappings[Field.DatHeader_ScreenshotsHeight];
|
||||
if (mappings.Keys.Contains(DatHeaderField.ScreenshotsHeight))
|
||||
ScreenshotsHeight = mappings[DatHeaderField.ScreenshotsHeight];
|
||||
|
||||
// TODO: Add DatHeader_Info*
|
||||
// TDOO: Add DatHeader_CanOpen*
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_RomTitle))
|
||||
RomTitle = mappings[Field.DatHeader_RomTitle];
|
||||
if (mappings.Keys.Contains(DatHeaderField.RomTitle))
|
||||
RomTitle = mappings[DatHeaderField.RomTitle];
|
||||
|
||||
#endregion
|
||||
|
||||
#region RomCenter
|
||||
|
||||
if (mappings.Keys.Contains(Field.DatHeader_RomCenterVersion))
|
||||
RomCenterVersion = mappings[Field.DatHeader_RomCenterVersion];
|
||||
if (mappings.Keys.Contains(DatHeaderField.RomCenterVersion))
|
||||
RomCenterVersion = mappings[DatHeaderField.RomCenterVersion];
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
@@ -308,7 +308,7 @@ namespace SabreTools.DatFiles.Formats
|
||||
|
||||
// Regular attributes
|
||||
case "name":
|
||||
item.SetFields(new Dictionary<Field, string> { [Field.DatItem_Name] = attrVal } );
|
||||
item.SetFields(new Dictionary<DatItemField, string> { [DatItemField.Name] = attrVal }, null);
|
||||
break;
|
||||
|
||||
case "size":
|
||||
|
||||
@@ -65,27 +65,47 @@ namespace SabreTools.DatFiles.Formats
|
||||
// Get the current line, split and parse
|
||||
svr.ReadNextLine();
|
||||
|
||||
// Create mapping dictionary
|
||||
var mappings = new Dictionary<Field, string>();
|
||||
// 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++)
|
||||
{
|
||||
Field key = svr.HeaderValues[i].AsField();
|
||||
string value = svr.Line[i];
|
||||
mappings[key] = value;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
// Set DatHeader fields
|
||||
DatHeader header = new DatHeader();
|
||||
header.SetFields(mappings);
|
||||
header.SetFields(datHeaderMappings);
|
||||
Header.ConditionalCopy(header);
|
||||
|
||||
// Set Machine and DatItem fields
|
||||
if (mappings.ContainsKey(Field.DatItem_Type))
|
||||
if (datItemMappings.ContainsKey(DatItemField.Type))
|
||||
{
|
||||
DatItem datItem = DatItem.Create(mappings[Field.DatItem_Type].AsItemType());
|
||||
datItem.SetFields(mappings);
|
||||
DatItem datItem = DatItem.Create(datItemMappings[DatItemField.Type].AsItemType());
|
||||
datItem.SetFields(datItemMappings, machineMappings);
|
||||
datItem.Source = new Source(indexId, filename);
|
||||
ParseAddHelper(datItem);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user