From 78e8df1d8b8e2eb1ef0fa6f7bfb86fd7af0368b2 Mon Sep 17 00:00:00 2001 From: Michael Green <84688932+michael-j-green@users.noreply.github.com> Date: Sat, 18 Feb 2023 23:43:44 +1100 Subject: [PATCH] =?UTF-8?q?fix:=20compare=20both=20md5=20and=20sha1=20when?= =?UTF-8?q?=20search=20for=20rom=E2=80=99s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gaseous-identifier/Program.cs | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/gaseous-identifier/Program.cs b/gaseous-identifier/Program.cs index 24e5a39..382be23 100644 --- a/gaseous-identifier/Program.cs +++ b/gaseous-identifier/Program.cs @@ -130,19 +130,30 @@ foreach (string romFile in romPathContents) { // match gameFound = true; - Console.WriteLine(romObject.Name); - - gaseous_identifier.objects.RomSignatureObject.Game gameSignature = gameObject; - gameSignature.Roms.Clear(); - gameSignature.Roms.Add(romObject); - - var jsonSerializerSettings = new JsonSerializerSettings(); - jsonSerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter()); - jsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore; - Console.WriteLine(Newtonsoft.Json.JsonConvert.SerializeObject(gameSignature, Newtonsoft.Json.Formatting.Indented, jsonSerializerSettings)); - break; } } + if (romObject.Sha1 != null) + { + if (md5Hash == romObject.Sha1.ToLowerInvariant()) + { + // match + gameFound = true; + } + } + if (gameFound == true) + { + Console.WriteLine(romObject.Name); + + gaseous_identifier.objects.RomSignatureObject.Game gameSignature = gameObject; + gameSignature.Roms.Clear(); + gameSignature.Roms.Add(romObject); + + var jsonSerializerSettings = new JsonSerializerSettings(); + jsonSerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter()); + jsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore; + Console.WriteLine(Newtonsoft.Json.JsonConvert.SerializeObject(gameSignature, Newtonsoft.Json.Formatting.Indented, jsonSerializerSettings)); + break; + } } if (gameFound == true) { break; } }