From d58c5d7e8ad98929d95f185d88e7a14c1035b27b Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 15 Nov 2021 20:56:21 +1000
Subject: [PATCH] Use CoreInventory to determine systems hidden in PathConfig

---
 src/BizHawk.Client.Common/config/PathEntry.cs |  7 ++--
 .../config/PathEntryCollection.cs             |  3 ++
 .../config/PathConfig.cs                      | 33 ++++++++-----------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/BizHawk.Client.Common/config/PathEntry.cs b/src/BizHawk.Client.Common/config/PathEntry.cs
index 556465d7bc..d9bfce8cb1 100644
--- a/src/BizHawk.Client.Common/config/PathEntry.cs
+++ b/src/BizHawk.Client.Common/config/PathEntry.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace BizHawk.Client.Common
 {
@@ -25,8 +24,6 @@ namespace BizHawk.Client.Common
 		}
 
 		internal bool IsSystem(string systemID)
-		{
-			return systemID == System || System.Split('_').Contains(systemID);
-		}
+			=> PathEntryCollection.InGroup(systemID, System);
 	}
 }
diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
index 48193b59aa..d5053639a4 100644
--- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs
+++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
@@ -70,6 +70,9 @@ namespace BizHawk.Client.Common
 			return newDispName;
 		}
 
+		public static bool InGroup(string sysID, string group)
+			=> sysID == group || group.Split('_').Contains(sysID);
+
 		public List<PathEntry> Paths { get; }
 
 		[JsonConstructor]
diff --git a/src/BizHawk.Client.EmuHawk/config/PathConfig.cs b/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
index c92187c881..e3b24ea5ea 100644
--- a/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/PathConfig.cs
@@ -7,6 +7,7 @@ using System.Windows.Forms;
 using BizHawk.Client.Common;
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores;
 
 namespace BizHawk.Client.EmuHawk
 {
@@ -18,24 +19,6 @@ namespace BizHawk.Client.EmuHawk
 
 		private readonly string _sysID;
 
-		// All path text boxes should do some kind of error checking
-		// Config path under base, config will default to %exe%
-		private void LockDownCores()
-		{
-			if (VersionInfo.DeveloperBuild)
-			{
-				return;
-			}
-
-			string[] coresToHide = { VSystemID.Raw.AmstradCPC, VSystemID.Raw.ChannelF, VSystemID.Raw.GGL, VSystemID.Raw.MSX, VSystemID.Raw.PS2 };
-
-			foreach (var core in coresToHide)
-			{
-				var tabPage = PathTabControl.TabPages().First(tp => tp.Name == core);
-				PathTabControl.TabPages.Remove(tabPage);
-			}
-		}
-
 		private static AutoCompleteStringCollection AutoCompleteOptions => new AutoCompleteStringCollection
 		{
 			"%recent%",
@@ -153,6 +136,7 @@ namespace BizHawk.Client.EmuHawk
 				.Select(sys => (SysGroup: sys, DisplayName: PathEntryCollection.GetDisplayNameFor(sys)))
 				.OrderBy(tuple => tuple.DisplayName)
 				.ToList();
+
 			// add the Global tab first...
 			tpGlobal.Name = PathEntryCollection.GLOBAL; // required for SaveSettings
 			systems.RemoveAll(tuple => tuple.SysGroup == PathEntryCollection.GLOBAL);
@@ -165,7 +149,17 @@ namespace BizHawk.Client.EmuHawk
 			tpGlobal.Controls[tpGlobal.Controls.Count - 2].Location -= hack1; // Button
 			textBoxWidth -= hack;
 			widgetOffset -= hack;
-			// ...then continue with the others
+
+			// ...then continue with the others (after removing unreleased systems in Release builds)
+			if (!VersionInfo.DeveloperBuild)
+			{
+				var releasedCoreSysIDs = CoreInventory.Instance.AllCores.SelectMany(kvp => kvp.Value.Select(coreInfo => (SysID: kvp.Key, CoreInfo: coreInfo)))
+					.Where(tuple => tuple.CoreInfo.CoreAttr.Released)
+					.Select(tuple => tuple.SysID)
+					.Distinct().ToList();
+				releasedCoreSysIDs.Add(VSystemID.Raw.Libretro); // core not actually marked as released, but we still want to show it
+				systems.RemoveAll(tuple => !releasedCoreSysIDs.Any(sysID => PathEntryCollection.InGroup(sysID, tuple.SysGroup)));
+			}
 			foreach (var (sys, dispName) in systems) AddTabPageForSystem(sys, dispName);
 
 			if (IsTabPendingFocus(PathEntryCollection.GLOBAL))
@@ -242,7 +236,6 @@ namespace BizHawk.Client.EmuHawk
 		private void NewPathConfig_Load(object sender, EventArgs e)
 		{
 			LoadSettings();
-			LockDownCores();
 		}
 
 		private void RecentForRoms_CheckedChanged(object sender, EventArgs e)