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] Fix case-based issues in merging

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-30 11:39:33 -07:00
parent 9b39fdc27a
commit 6c72e0cbe2
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SabreHelper/RomManipulation.cs
View File

@@ -210,13 +210,13 @@ namespace SabreTools.Helper
Int64.TryParse(gc[i].Replace("\"", ""), out rom.Size); Int64.TryParse(gc[i].Replace("\"", ""), out rom.Size);
break; break;
case "crc": case "crc":
rom.CRC = gc[i].Replace("\"", ""); rom.CRC = gc[i].Replace("\"", "").ToLowerInvariant();
break; break;
case "md5": case "md5":
rom.MD5 = gc[i].Replace("\"", ""); rom.MD5 = gc[i].Replace("\"", "").ToLowerInvariant();
break; break;
case "sha1": case "sha1":
rom.SHA1 = gc[i].Replace("\"", ""); rom.SHA1 = gc[i].Replace("\"", "").ToLowerInvariant();
break; break;
} }
@@ -261,13 +261,13 @@ namespace SabreTools.Helper
Int64.TryParse(val, out rom.Size); Int64.TryParse(val, out rom.Size);
break; break;
case "crc": case "crc":
rom.CRC = val; rom.CRC = val.ToLowerInvariant();
break; break;
case "md5": case "md5":
rom.MD5 = val; rom.MD5 = val.ToLowerInvariant();
break; break;
case "sha1": case "sha1":
rom.SHA1 = val; rom.SHA1 = val.ToLowerInvariant();
break; break;
} }
@@ -279,6 +279,7 @@ namespace SabreTools.Helper
// Now add the rom to the dictionary // Now add the rom to the dictionary
string key = rom.Size + "-" + rom.CRC; string key = rom.Size + "-" + rom.CRC;
Console.WriteLine(key);
if (datdata.Roms.ContainsKey(key)) if (datdata.Roms.ContainsKey(key))
{ {
datdata.Roms[key].Add(rom); datdata.Roms[key].Add(rom);
@@ -505,7 +506,7 @@ namespace SabreTools.Helper
{ {
Game = rominfo[3], Game = rominfo[3],
Name = rominfo[5], Name = rominfo[5],
CRC = rominfo[6], CRC = rominfo[6].ToLowerInvariant(),
Size = Int64.Parse(rominfo[7]), Size = Int64.Parse(rominfo[7]),
SystemID = sysid, SystemID = sysid,
SourceID = srcid, SourceID = srcid,