RomFilter cleanup.

BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

@@ -653,6 +653,7 @@
     <Compile Include="Extensions\ControlExtensions.cs" />
     <Compile Include="Extensions\CoreExtensions.cs" />
     <Compile Include="Extensions\ToolExtensions.cs" />
+    <Compile Include="FileFilterEntry.cs" />
     <Compile Include="FileLoader.cs">
       <SubType>Form</SubType>
     </Compile>

BizHawk.Client.EmuHawk/FileFilterEntry.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public class FileFilterEntry
+	{
+		public string Description { get; }
+		public string[] Filters { get; }
+		public string[] DeveloperFilters { get; }
+
+		public FileFilterEntry(string description, string filters, string developerFilters = null)
+		{
+			Description = description;
+			Filters = filters?.Split(';') ?? Array.Empty<string>();
+			DeveloperFilters = developerFilters?.Split(';') ?? Array.Empty<string>();
+		}
+
+		public IEnumerable<string> EffectiveFilters
+		{
+			get
+			{
+				IEnumerable<string> effectiveFilters = Filters;
+				if (VersionInfo.DeveloperBuild)
+				{
+					effectiveFilters = effectiveFilters.Concat(DeveloperFilters);
+				}
+				return effectiveFilters;
+			}
+		}
+	}
+}

BizHawk.Client.EmuHawk/FileLoader.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 
 using BizHawk.Common;
 using BizHawk.Emulation.Common.IEmulatorExtensions;
-using BizHawk.Emulation.Cores.PCEngine;
 using BizHawk.Client.Common;
 
 namespace BizHawk.Client.EmuHawk
@@ -40,31 +39,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		// This is the list from MainForm->RomFilter()'s non-developer build.  It needs to be kept up-to-date when new cores are added.
+		private IEnumerable<string> KnownRomExtensions =>
-		// adelikat: This is annoying and bad. Maybe we could generate RomFilter from this property?
+			RomFilterEntries.SelectMany(f => f.EffectiveFilters.Where(s => s.StartsWith("*.", StringComparison.Ordinal)).Select(s => s.Substring(1).ToUpperInvariant()));
-		private string[] KnownRomExtensions
-		{
-			get
-			{
-				if (VersionInfo.DeveloperBuild)
-				{
-					return new[]
-					{
-						".NES", ".FDS", ".UNF", ".SMS", ".GG", ".SG", ".GB", ".GBC", ".GBA", ".PCE", ".SGX", ".BIN", ".SMD", ".GEN", ".MD", ".SMC",
-						".SFC", ".A26", ".A78", ".LNX", ".COL", ".ROM", ".M3U", ".CUE", ".CCD", ".SGB", ".Z64", ".V64", ".N64", ".WS", ".WSC", ".XML",
-						".DSK", ".DO", ".PO", ".PSF", ".MINIPSF", ".NSF", ".EXE", ".PRG", ".D64", ".G64", ".CRT", ".TAP", ".32X", ".MDS", ".TZX",
-						".PZX", ".CSW", ".WAV", ".CDT"
-					};
-				}
-
-				return new[] 
-				{
-					".NES", ".FDS", ".UNF", ".SMS", ".GG", ".SG", ".GB", ".GBC", ".GBA", ".PCE", ".SGX", ".BIN", ".SMD", ".GEN", ".MD", ".SMC",
-					".SFC", ".A26", ".A78", ".LNX", ".COL", ".ROM", ".M3U", ".CUE", ".CCD", ".SGB", ".Z64", ".V64", ".N64", ".WS", ".WSC", ".XML",
-					".DSK", ".DO", ".PO", ".PSF", ".MINIPSF", ".NSF", ".PRG", ".D64", ".G64", ".CRT", ".TAP", ".32X", ".MDS", ".TZX", ".PZX", ".CSW", ".WAV"
-				};
-			}
-		}
 
 		private readonly string[] _nonArchive = { ".ISO", ".CUE", ".CCD" };
 
@@ -173,7 +149,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			foreach (string file in fileList)
 			{
-				var ext = Path.GetExtension(file).ToUpper() ?? "";
+				var ext = Path.GetExtension(file).ToUpperInvariant() ?? "";
 				FileInformation fileInformation = new FileInformation(Path.GetDirectoryName(file), Path.GetFileName(file), archive);
 
 				switch (ext)

BizHawk.Client.EmuHawk/MainForm.cs

@@ -2120,79 +2120,67 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
-			var str = sb.ToString().Replace("%ARCH%", "*.zip;*.rar;*.7z;*.gz");
+			var str = sb.ToString().Replace("%ARCH%", ArchiveFilters);
 			str = str.Replace(";", "; ");
 			return str;
 		}
 
+		public static FileFilterEntry[] RomFilterEntries { get; } =
+		{
+			new FileFilterEntry("Music Files", null, developerFilters: "*.psf;*.minipsf;*.sid;*.nsf"),
+			new FileFilterEntry("Disc Images", "*.cue;*.ccd;*.mds;*.m3u"),
+			new FileFilterEntry("NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%"),
+			new FileFilterEntry("Super NES", "*.smc;*.sfc;*.xml;%ARCH%"),
+			new FileFilterEntry("PlayStation", "*.cue;*.ccd;*.mds;*.m3u"),
+			new FileFilterEntry("PSX Executables (experimental)", null, developerFilters: "*.exe"),
+			new FileFilterEntry("PSF Playstation Sound File", "*.psf;*.minipsf"),
+			new FileFilterEntry("Nintendo 64", "*.z64;*.v64;*.n64"),
+			new FileFilterEntry("Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%"),
+			new FileFilterEntry("Gameboy Advance", "*.gba;%ARCH%"),
+			new FileFilterEntry("Master System", "*.sms;*.gg;*.sg;%ARCH%"),
+			new FileFilterEntry("PC Engine", "*.pce;*.sgx;*.cue;*.ccd;*.mds;%ARCH%"),
+			new FileFilterEntry("Atari 2600", "*.a26;%ARCH%", developerFilters: "*.bin"),
+			new FileFilterEntry("Atari 7800", "*.a78;%ARCH%", developerFilters: "*.bin"),
+			new FileFilterEntry("Atari Lynx", "*.lnx;%ARCH%"),
+			new FileFilterEntry("Colecovision", "*.col;%ARCH%"),
+			new FileFilterEntry("Intellivision", "*.int;*.bin;*.rom;%ARCH%"),
+			new FileFilterEntry("TI-83", "*.rom;%ARCH%"),
+			new FileFilterEntry("Archive Files", "%ARCH%"),
+			new FileFilterEntry("Genesis", "*.gen;*.md;*.smd;*.32x;*.bin;*.cue;*.ccd;%ARCH%"),
+			new FileFilterEntry("SID Commodore 64 Music File", null, developerFilters: "*.sid;%ARCH%"),
+			new FileFilterEntry("WonderSwan", "*.ws;*.wsc;%ARCH%"),
+			new FileFilterEntry("Apple II", "*.dsk;*.do;*.po;%ARCH%"),
+			new FileFilterEntry("Virtual Boy", "*.vb;%ARCH%"),
+			new FileFilterEntry("Neo Geo Pocket", "*.ngp;*.ngc;%ARCH%"),
+			new FileFilterEntry("Commodore 64", "*.prg;*.d64;*.g64;*.crt;*.tap;%ARCH%"),
+			new FileFilterEntry("Amstrad CPC", null, developerFilters: "*.cdt;*.dsk;%ARCH%"),
+			new FileFilterEntry("Sinclair ZX Spectrum", "*.tzx;*.tap;*.dsk;*.pzx;*.csw;*.wav;%ARCH%")
+		};
+
+		public const string ArchiveFilters = "*.zip;*.rar;*.7z;*.gz";
+
 		public static string RomFilter
 		{
 			get
 			{
-				if (VersionInfo.DeveloperBuild)
+				string GetRomFilterStrings()
 				{
-					return FormatFilter(
+					var values = new HashSet<string>(RomFilterEntries.SelectMany(f => f.EffectiveFilters));
-						"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.pce;*.sgx;*.bin;*.smd;*.rom;*.a26;*.a78;*.lnx;*.m3u;*.cue;*.ccd;*.mds;*.exe;*.gb;*.gbc;*.gba;*.gen;*.md;*.32x;*.col;*.int;*.smc;*.sfc;*.prg;*.d64;*.g64;*.crt;*.tap;*.sgb;*.xml;*.z64;*.v64;*.n64;*.ws;*.wsc;*.dsk;*.do;*.po;*.vb;*.ngp;*.ngc;*.psf;*.minipsf;*.nsf;*.tzx;*.pzx;*.csw;*.wav;*.cdt;%ARCH%",
+					if (values.Remove("%ARCH%"))
-						"Music Files", "*.psf;*.minipsf;*.sid;*.nsf",
+					{
-						"Disc Images", "*.cue;*.ccd;*.mds;*.m3u",
+						values.UnionWith(ArchiveFilters.Split(';'));
-						"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
+					}
-						"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
+					return string.Join(";", values.OrderBy(n => n));
-						"Master System", "*.sms;*.gg;*.sg;%ARCH%",
-						"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;*.mds;%ARCH%",
-						"TI-83", "*.rom;%ARCH%",
-						"Archive Files", "%ARCH%",
-						"Savestate", "*.state",
-						"Atari 2600", "*.a26;*.bin;%ARCH%",
-						"Atari 7800", "*.a78;*.bin;%ARCH%",
-						"Atari Lynx", "*.lnx;%ARCH%",
-						"Genesis", "*.gen;*.smd;*.bin;*.md;*.32x;*.cue;*.ccd;%ARCH%",
-						"Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%",
-						"Gameboy Advance", "*.gba;%ARCH%",
-						"Colecovision", "*.col;%ARCH%",
-						"Intellivision", "*.int;*.bin;*.rom;%ARCH%",
-						"PlayStation", "*.cue;*.ccd;*.mds;*.m3u",
-						"PSX Executables (experimental)", "*.exe",
-						"PSF Playstation Sound File", "*.psf;*.minipsf",
-						"Commodore 64", "*.prg;*.d64;*.g64;*.crt;*.tap;%ARCH%",
-						"SID Commodore 64 Music File", "*.sid;%ARCH%",
-						"Nintendo 64", "*.z64;*.v64;*.n64",
-						"WonderSwan", "*.ws;*.wsc;%ARCH%",
-						"Apple II", "*.dsk;*.do;*.po;%ARCH%",
-						"Virtual Boy", "*.vb;%ARCH%",
-						"Neo Geo Pocket", "*.ngp;*.ngc;%ARCH%",
-						"Sinclair ZX Spectrum", "*.tzx;*.tap;*.dsk;*.pzx;*.csw;*.wav;%ARCH%",
-						"Amstrad CPC", "*.cdt;*.dsk;%ARCH%",
-						"All Files", "*.*");
 				}
 
-				return FormatFilter(
+				var allFilters = new List<FileFilterEntry>();
-					"Rom Files", "*.nes;*.fds;*.unf;*.sms;*.gg;*.sg;*.gb;*.gbc;*.gba;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.32x;*.smc;*.sfc;*.a26;*.a78;*.lnx;*.col;*.int;*.rom;*.m3u;*.cue;*.ccd;*.mds;*.sgb;*.z64;*.v64;*.n64;*.ws;*.wsc;*.xml;*.dsk;*.do;*.po;*.psf;*.ngp;*.ngc;*.prg;*.d64;*.g64;*.minipsf;*.nsf;*.tzx;*.pzx;*.csw;*.wav;%ARCH%",
+
-					"Disc Images", "*.cue;*.ccd;*.mds;*.m3u",
+				allFilters.Add(new FileFilterEntry("Rom Files", GetRomFilterStrings()));
-					"NES", "*.nes;*.fds;*.unf;*.nsf;%ARCH%",
+				allFilters.AddRange(RomFilterEntries.Where(f => f.EffectiveFilters.Any()));
-					"Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
+				allFilters.Add(new FileFilterEntry("Savestate", "*.state"));
-					"PlayStation", "*.cue;*.ccd;*.mds;*.m3u",
+				allFilters.Add(new FileFilterEntry("All Files", "*.*"));
-					"PSF Playstation Sound File", "*.psf;*.minipsf",
+
-					"Nintendo 64", "*.z64;*.v64;*.n64",
+				return FormatFilter(allFilters.SelectMany(f => new[] { f.Description, string.Join(";", f.EffectiveFilters) }).ToArray());
-					"Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%",
-					"Gameboy Advance", "*.gba;%ARCH%",
-					"Master System", "*.sms;*.gg;*.sg;%ARCH%",
-					"PC Engine", "*.pce;*.sgx;*.cue;*.ccd;*.mds;%ARCH%",
-					"Atari 2600", "*.a26;%ARCH%",
-					"Atari 7800", "*.a78;%ARCH%",
-					"Atari Lynx", "*.lnx;%ARCH%",
-					"Colecovision", "*.col;%ARCH%",
-					"Intellivision", "*.int;*.bin;*.rom;%ARCH%",
-					"TI-83", "*.rom;%ARCH%",
-					"Archive Files", "%ARCH%",
-					"Savestate", "*.state",
-					"Genesis", "*.gen;*.md;*.smd;*.32x;*.bin;*.cue;*.ccd;%ARCH%",
-					"WonderSwan", "*.ws;*.wsc;%ARCH%",
-					"Apple II", "*.dsk;*.do;*.po;%ARCH%",
-					"Virtual Boy", "*.vb;%ARCH%",
-					"Neo Geo Pocket", "*.ngp;*.ngc;%ARCH%",
-					"Commodore 64", "*.prg;*.d64;*.g64;*.crt;*.tap;%ARCH%",
-					"Sinclair ZX Spectrum", "*.tzx;*.tap;*.dsk;*.pzx;*.csw;*.wav;%ARCH%",
-					"All Files", "*.*");
 			}
 		}