From 5336e1b5416121a1818b03aea598f52d81c098f7 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 29 Feb 2020 09:34:30 -0600
Subject: [PATCH] move Sms ActionReplay decoding to its own class, cleanlup

---
 .../cheats/SmsActionReplayDecoder.cs          | 34 +++++++++++++++
 BizHawk.Client.EmuHawk/tools/GameShark.cs     | 41 +++++++------------
 2 files changed, 49 insertions(+), 26 deletions(-)
 create mode 100644 BizHawk.Client.Common/cheats/SmsActionReplayDecoder.cs

diff --git a/BizHawk.Client.Common/cheats/SmsActionReplayDecoder.cs b/BizHawk.Client.Common/cheats/SmsActionReplayDecoder.cs
new file mode 100644
index 0000000000..7cf658a832
--- /dev/null
+++ b/BizHawk.Client.Common/cheats/SmsActionReplayDecoder.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Globalization;
+
+namespace BizHawk.Client.Common.cheats
+{
+	// TODO: validate string and throw
+	public class SmsActionReplayDecoder
+	{
+		private readonly string _code;
+
+		public SmsActionReplayDecoder(string code)
+		{
+			_code = code;
+			Decode();
+		}
+
+		public int Address { get; private set; }
+		public int Value { get; private set; }
+
+		public void Decode()
+		{
+			if (_code.IndexOf("-") != 3 && _code.Length != 9)
+			{
+				throw new InvalidOperationException("Invalid Action Replay Code");
+			}
+
+			var parseString = _code.Remove(0, 2);
+			var ramAddress = parseString.Remove(4, 2).Replace("-", "");
+			var ramValue = parseString.Remove(0, 5);
+			Address = int.Parse(ramAddress, NumberStyles.HexNumber);
+			Value = int.Parse(ramValue, NumberStyles.HexNumber);
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/tools/GameShark.cs b/BizHawk.Client.EmuHawk/tools/GameShark.cs
index c67213f626..742d44d271 100644
--- a/BizHawk.Client.EmuHawk/tools/GameShark.cs
+++ b/BizHawk.Client.EmuHawk/tools/GameShark.cs
@@ -111,25 +111,19 @@ namespace BizHawk.Client.EmuHawk
 						Gen(_singleCheat);
 						break;
 					case "N64":
-						// This determines what kind of Code we have
-						_testo = _singleCheat.Remove(2, 11);
 						N64();
 						break;
 					case "NES":
 						Nes(_singleCheat);
 						break;
 					case "PSX":
-						// This determines what kind of Code we have
-						_testo = _singleCheat.Remove(2, 11);
 						Psx();
 						break;
 					case "SAT":
-						// This determines what kind of Code we have
-						_testo = _singleCheat.Remove(2, 11);
 						Saturn();
 						break;
 					case "SMS":
-						Sms();
+						Sms(_singleCheat);
 						break;
 					case "SNES":
 						Snes();
@@ -2235,6 +2229,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void N64()
 		{
+			// This determines what kind of Code we have
+			_testo = _singleCheat.Remove(2, 11);
+
 			// These codes, more or less work without Needing much work.
 			if (_singleCheat.IndexOf(" ") != 8)
 			{
@@ -2377,6 +2374,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void Psx()
 		{
+			// This determines what kind of Code we have
+			_testo = _singleCheat.Remove(2, 11);
+
 			// These codes, more or less work without Needing much work.
 			if (_singleCheat.IndexOf(" ") != 8)
 			{
@@ -2483,6 +2483,9 @@ namespace BizHawk.Client.EmuHawk
 
 		private void Saturn()
 		{
+			// This determines what kind of Code we have
+			_testo = _singleCheat.Remove(2, 11);
+
 			if (_singleCheat.IndexOf(" ") != 8)
 			{
 				MessageBox.Show("All Saturn GameShark Codes need to contain a space after the eighth character", "Input Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -2570,35 +2573,21 @@ namespace BizHawk.Client.EmuHawk
 			// Action Replay
 			else if (cheat.IndexOf("-") == 3 && cheat.Length == 9)
 			{
-				_parseString = _singleCheat;
-				_parseString = _parseString.Remove(0, 2);
-				_ramAddress = _parseString.Remove(4, 2);
-				_ramAddress = _ramAddress.Replace("-", "");
-				_ramValue = _parseString.Remove(0, 5);
+				var decoder = new SmsActionReplayDecoder(cheat);
+				var watch = Watch.GenerateWatch(MemoryDomains["Main RAM"], decoder.Address, WatchSize.Byte, Common.DisplayType.Hex, false, txtDescription.Text);
+				Global.CheatList.Add(new Cheat(watch, decoder.Value));
 			}
 
 			// It's an Action Replay
-			if (cheat.Length != 9 && cheat.LastIndexOf("-") != 7)
+			else if (cheat.Length != 9 && cheat.LastIndexOf("-") != 7)
 			{
 				MessageBox.Show("All Master System Action Replay Codes need to be nine characters in length.", "Input Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
 			}
 
 			// Game Genie
-			if (cheat.LastIndexOf("-") != 7 && cheat.IndexOf("-") != 3)
+			else if (cheat.LastIndexOf("-") != 7 && cheat.IndexOf("-") != 3)
 			{
 				MessageBox.Show("All Master System Game Genie Codes need to have a dash after the third character and seventh character.", "Input Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-
-			try
-			{
-				var watch = Watch.GenerateWatch(MemoryDomains["Main RAM"], long.Parse(_ramAddress, NumberStyles.HexNumber), WatchSize.Byte, Common.DisplayType.Hex, false, txtDescription.Text);
-				Global.CheatList.Add(new Cheat(watch, int.Parse(_ramValue, NumberStyles.HexNumber)));
-			}
-			catch (Exception ex)
-			{
-				MessageBox.Show($"An Error occured: {ex.GetType()}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 		}