From 4103a8bab2ef7c730e89428b8dacf2e0d7f821fa Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Tue, 23 Feb 2021 02:20:27 +1000
Subject: [PATCH] Cleanup usages of FirmwareID fields

---
 src/BizHawk.Client.Common/CoreFileProvider.cs     |  4 ++--
 .../movie/MovieConversionExtensions.cs            |  3 +--
 .../config/FirmwaresConfig.cs                     | 15 ++++++++-------
 .../Database/FirmwareID.cs                        |  2 ++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/BizHawk.Client.Common/CoreFileProvider.cs b/src/BizHawk.Client.Common/CoreFileProvider.cs
index a101323d59..f3d39922b6 100644
--- a/src/BizHawk.Client.Common/CoreFileProvider.cs
+++ b/src/BizHawk.Client.Common/CoreFileProvider.cs
@@ -40,13 +40,13 @@ namespace BizHawk.Client.Common
 		{
 			if (required)
 			{
-				var fullMsg = $"Couldn't find required firmware \"{id.System}:{id.Firmware}\".  This is fatal{(msg != null ? $": {msg}" : ".")}";
+				var fullMsg = $"Couldn't find required firmware {id}.  This is fatal{(msg != null ? $": {msg}" : ".")}";
 				throw new MissingFirmwareException(fullMsg);
 			}
 
 			if (msg != null)
 			{
-				var fullMsg = $"Couldn't find firmware \"{id.System}:{id.Firmware}\".  Will attempt to continue: {msg}";
+				var fullMsg = $"Couldn't find firmware {id}.  Will attempt to continue: {msg}";
 				_showWarning(fullMsg);
 			}
 		}
diff --git a/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs b/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
index 83114521d5..4fb04c2286 100644
--- a/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
+++ b/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs
@@ -239,8 +239,7 @@ namespace BizHawk.Client.Common
 			{
 				foreach (var firmware in firmwareManager.RecentlyServed)
 				{
-					var key = $"{firmware.ID.System}_Firmware_{firmware.ID.Firmware}";
-
+					var key = firmware.ID.MovieHeaderKey;
 					if (!movie.HeaderEntries.ContainsKey(key))
 					{
 						movie.HeaderEntries.Add(key, firmware.Hash);
diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
index 38b2eeb27a..0e78da8639 100644
--- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
@@ -172,6 +172,7 @@ namespace BizHawk.Client.EmuHawk
 			var groups = new Dictionary<string, ListViewGroup>();
 			foreach (var fr in FirmwareDatabase.FirmwareRecords)
 			{
+				var sysID = fr.ID.System;
 				var lvi = new ListViewItem
 				{
 					Tag = fr,
@@ -179,7 +180,7 @@ namespace BizHawk.Client.EmuHawk
 					ImageIndex = IdUnsure,
 					ToolTipText = null
 				};
-				lvi.SubItems.Add(fr.ID.System);
+				lvi.SubItems.Add(sysID);
 				lvi.SubItems.Add(fr.ID.Firmware);
 				lvi.SubItems.Add(fr.Description);
 				lvi.SubItems.Add(""); // resolved with
@@ -191,15 +192,15 @@ namespace BizHawk.Client.EmuHawk
 				lvFirmwares.Items.Add(lvi);
 
 				// build the groups in the ListView as we go:
-				if (!groups.ContainsKey(fr.ID.System))
+				if (!groups.ContainsKey(sysID))
 				{
-					if (!SystemGroupNames.TryGetValue(fr.ID.System, out var name))
+					if (!SystemGroupNames.TryGetValue(sysID, out var name))
 						name = "FIX ME (FirmwaresConfig.cs)";
-					lvFirmwares.Groups.Add(fr.ID.System, name);
+					lvFirmwares.Groups.Add(sysID, name);
 					var lvg = lvFirmwares.Groups[lvFirmwares.Groups.Count - 1];
-					groups[fr.ID.System] = lvg;
+					groups[sysID] = lvg;
 				}
-				lvi.Group = groups[fr.ID.System];
+				lvi.Group = groups[sysID];
 			}
 
 			// now that we have some items in the ListView, we can size some columns to sensible widths
@@ -533,7 +534,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				lblFirmware =
 				{
-					Text = $"{fr.ID.System} : {fr.ID.Firmware} ({fr.Description})"
+					Text = $"{fr.ID} ({fr.Description})"
 				}
 			};
 
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareID.cs b/src/BizHawk.Emulation.Common/Database/FirmwareID.cs
index e5acbc162e..ce36bd506d 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareID.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareID.cs
@@ -12,6 +12,8 @@ namespace BizHawk.Emulation.Common
 
 		public readonly string Firmware;
 
+		public string MovieHeaderKey => $"{System}_Firmware_{Firmware}";
+
 		public readonly string System;
 
 		public FirmwareID(string system, string firmware)