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

[RomManipulation] Values can be empty or null

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-02 10:29:46 -07:00
parent 76d873b0e1
commit 7b0d198ef0
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SabreHelper/RomManipulation.cs
View File

@@ -818,7 +818,7 @@ namespace SabreTools.Helper
switch (flagreader.GetAttribute("name")) switch (flagreader.GetAttribute("name"))
{ {
case "type": case "type":
datdata.Type = (datdata.Type == "" ? content : datdata.Type); datdata.Type = (String.IsNullOrEmpty(datdata.Type) ? content : datdata.Type);
superdat = superdat || content.Contains("SuperDAT"); superdat = superdat || content.Contains("SuperDAT");
break; break;
case "forcemerging": case "forcemerging":
@@ -1375,15 +1375,15 @@ namespace SabreTools.Helper
if (rom.Type == "rom" && lastrom.Type == "rom") if (rom.Type == "rom" && lastrom.Type == "rom")
{ {
dupefound = ((rom.Size == lastrom.Size) && dupefound = ((rom.Size == lastrom.Size) &&
((rom.CRC == "" || lastrom.CRC == "") || rom.CRC == lastrom.CRC) && ((String.IsNullOrEmpty(rom.CRC) || String.IsNullOrEmpty(lastrom.CRC)) || rom.CRC == lastrom.CRC) &&
((rom.MD5 == "" || lastrom.MD5 == "") || rom.MD5 == lastrom.MD5) && ((String.IsNullOrEmpty(rom.MD5) || String.IsNullOrEmpty(lastrom.MD5)) || rom.MD5 == lastrom.MD5) &&
((rom.SHA1 == "" || lastrom.SHA1 == "") || rom.SHA1 == lastrom.SHA1) ((String.IsNullOrEmpty(rom.SHA1) || String.IsNullOrEmpty(lastrom.SHA1)) || rom.SHA1 == lastrom.SHA1)
); );
} }
else if (rom.Type == "disk" && lastrom.Type == "disk") else if (rom.Type == "disk" && lastrom.Type == "disk")
{ {
dupefound = (((rom.MD5 == "" || lastrom.MD5 == "") || rom.MD5 == lastrom.MD5) && dupefound = (((String.IsNullOrEmpty(rom.MD5) || String.IsNullOrEmpty(lastrom.MD5)) || rom.MD5 == lastrom.MD5) &&
((rom.SHA1 == "" || lastrom.SHA1 == "") || rom.SHA1 == lastrom.SHA1) ((String.IsNullOrEmpty(rom.SHA1) || String.IsNullOrEmpty(lastrom.SHA1)) || rom.SHA1 == lastrom.SHA1)
); );
} }
@@ -1396,9 +1396,9 @@ namespace SabreTools.Helper
savedrom = lastrom; savedrom = lastrom;
pos = i; pos = i;
savedrom.CRC = (savedrom.CRC == "" && rom.CRC != "" ? rom.CRC : savedrom.CRC); savedrom.CRC = (String.IsNullOrEmpty(savedrom.CRC) && !String.IsNullOrEmpty(rom.CRC) ? rom.CRC : savedrom.CRC);
savedrom.MD5 = (savedrom.MD5 == "" && rom.MD5 != "" ? rom.MD5 : savedrom.MD5); savedrom.MD5 = (String.IsNullOrEmpty(savedrom.MD5) && !String.IsNullOrEmpty(rom.CRC) ? rom.MD5 : savedrom.MD5);
savedrom.SHA1 = (savedrom.SHA1 == "" && rom.SHA1 != "" ? rom.SHA1 : savedrom.SHA1); savedrom.SHA1 = (String.IsNullOrEmpty(savedrom.MD5) && !String.IsNullOrEmpty(rom.CRC) ? rom.SHA1 : savedrom.SHA1);
// If the duplicate is external already or should be, set it // If the duplicate is external already or should be, set it
if (savedrom.Dupe >= DupeType.ExternalHash || savedrom.SystemID != rom.SystemID || savedrom.SourceID != rom.SourceID) if (savedrom.Dupe >= DupeType.ExternalHash || savedrom.SystemID != rom.SystemID || savedrom.SourceID != rom.SourceID)
@@ -1514,7 +1514,7 @@ namespace SabreTools.Helper
List<RomData> newroms = roms; List<RomData> newroms = roms;
if (mergeroms) if (mergeroms)
{ {
newroms = RomManipulation.Merge(newroms, logger); newroms = Merge(newroms, logger);
} }
foreach (RomData rom in newroms) foreach (RomData rom in newroms)