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

[Structs] Create different, single struct

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-16 17:27:32 -07:00
parent 0af0b420d1
commit 588a484e33
6 changed files with 44 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SabreTools.Helper/Tools/DatTools.cs
View File

@@ -173,8 +173,7 @@ namespace SabreTools.Helper
{
Game = gamename,
Type = (line.Trim().StartsWith("disk (") ? "disk" : "rom"),
SystemData = new SystemData { ID = sysid },
SourceData = new SourceData { ID = srcid },
Metadata = new SourceMetadata { SystemID = sysid, SourceID = srcid },
};
string[] gc = line.Trim().Split(' ');
@@ -577,8 +576,7 @@ namespace SabreTools.Helper
Name = rominfo[5],
CRC = rominfo[6].ToLowerInvariant(),
Size = Int64.Parse(rominfo[7]),
SystemData = new SystemData { ID = sysid },
SourceData = new SourceData { ID = srcid },
Metadata = new SourceMetadata { SystemID = sysid, SourceID = srcid },
};
// Sanitize the hashes from null, hex sizes, and "true blank" strings
@@ -1158,8 +1156,7 @@ namespace SabreTools.Helper
SHA1 = sha1,
Nodump = nodump,
Date = date,
SystemData = new SystemData { ID = sysid, Name = filename },
SourceData = new SourceData { ID = srcid },
Metadata = new SourceMetadata { SystemID = sysid, System = filename, SourceID = srcid },
};
if (datdata.Roms.ContainsKey(key))
@@ -1394,8 +1391,7 @@ namespace SabreTools.Helper
SHA1 = sha1,
Nodump = nodump,
Date = date,
SystemData = new SystemData { ID = sysid, Name = filename },
SourceData = new SourceData { ID = srcid },
Metadata = new SourceMetadata { SystemID = sysid, System = filename, SourceID = srcid },
};
if (datdata.Roms.ContainsKey(key))
@@ -1465,7 +1461,7 @@ namespace SabreTools.Helper
foreach (RomData rom in newroms)
{
count++;
string key = (norename ? "" : rom.SystemData.ID.ToString().PadLeft(10, '0') + "-" + rom.SourceData.ID.ToString().PadLeft(10, '0') + "-") + rom.Game.ToLowerInvariant();
string key = (norename ? "" : rom.Metadata.SystemID.ToString().PadLeft(10, '0') + "-" + rom.Metadata.SourceID.ToString().PadLeft(10, '0') + "-") + rom.Game.ToLowerInvariant();
if (sortable.ContainsKey(key))
{
sortable[key].Add(rom);