From 2f37f51c0ca55d6b6717cc2a3d9717c7473de103 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 27 Jan 2020 11:58:08 -0800 Subject: [PATCH] Simplify serial matching for PS1/PS2 (fixes #186) --- DICUI.Library/Utilities/DumpEnvironment.cs | 59 ++++++++++------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/DICUI.Library/Utilities/DumpEnvironment.cs index 88b63c01..945dfc05 100644 --- a/DICUI.Library/Utilities/DumpEnvironment.cs +++ b/DICUI.Library/Utilities/DumpEnvironment.cs @@ -1958,38 +1958,35 @@ namespace DICUI.Utilities return false; } - // Try to get the region fro mthe name - string lowerExeName = exeName.ToLowerInvariant(); - if (lowerExeName.Contains("scus") - || lowerExeName.Contains("slus")) + // Standardized "S" serials + if (exeName.StartsWith("S")) { - region = Region.USA; - } - else if (lowerExeName.Contains("sces") - || lowerExeName.Contains("sles")) - { - region = Region.Europe; - } - else if (lowerExeName.Contains("scps") - || lowerExeName.Contains("scpm") - || lowerExeName.Contains("slps") - || lowerExeName.Contains("slpm") - || lowerExeName.Contains("pbgp") - || lowerExeName.Contains("czp2") - || lowerExeName.Contains("hsn") - || lowerExeName.Contains("gn")) - { - region = Region.Japan; - } - else if (lowerExeName.Contains("scka") - || lowerExeName.Contains("slka")) - { - region = Region.Korea; - } - else if (lowerExeName.Contains("scaj") - || lowerExeName.Contains("sccs")) - { - region = Region.China; + // string publisher = exeName[0] + exeName[1]; + // char secondRegion = exeName[3]; + switch (exeName[2]) + { + case 'A': + region = Region.Asia; + break; + case 'C': + region = Region.China; + break; + case 'E': + region = Region.Europe; + break; + case 'J': + region = Region.JapanKorea; + break; + case 'K': + region = Region.Korea; + break; + case 'P': + region = Region.Japan; + break; + case 'U': + region = Region.USA; + break; + } } // Now that we have the EXE name, try to get the fileinfo for it