SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Fix PS regex matching (fixes #192)

Browse Source
This commit is contained in:
Matt Nadareski
2020-02-18 11:15:26 -08:00
parent 751fd0cf1e
commit 617eb00f21
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
DICUI.Library/Utilities/DumpEnvironment.cs
View File

@@ -2366,20 +2366,26 @@ namespace DICUI.Utilities
// Try both of the common paths that contain information
string exeName = null;
// Try reading SYSTEM.CNF to find the "BOOT" value
if (File.Exists(systemCnfPath))
{
// Let's try reading SYSTEM.CNF to find the "BOOT" value
try
{
using (StreamReader sr = File.OpenText(systemCnfPath))
{
// Not assuming proper ordering, just in case
// Not assuming any ordering, just in case
string line = sr.ReadLine();
while (!line.StartsWith("BOOT"))
line = sr.ReadLine();
// Once it finds the "BOOT" line, extract the name
exeName = Regex.Match(line, @"BOOT.*?=\s*cdrom.?:\\?(.*?);.*").Groups[1].Value;
// Once it finds the "BOOT" line, extract the name, if possible
var match = Regex.Match(line, @"BOOT.*?=\s*cdrom.?:\\?(.*?)");
if (match != null && match.Groups.Count > 1)
{
exeName = match.Groups[1].Value;
exeName = exeName.Split(';')[0];
}
}
}
catch
@@ -2388,14 +2394,14 @@ namespace DICUI.Utilities
return false;
}
}
else if (File.Exists(psxExePath))
{
// If the SYSTEM.CNF value can't be found, try PSX.EXE
if (string.IsNullOrWhiteSpace(exeName) && File.Exists(psxExePath))
exeName = "PSX.EXE";
}
else
{
// If neither can be found, we return false
if (string.IsNullOrWhiteSpace(exeName))
return false;
}
// Standardized "S" serials
if (exeName.StartsWith("S"))
@@ -2484,7 +2490,7 @@ namespace DICUI.Utilities
if (!File.Exists(systemCnfPath))
return null;
// Let's try reading SYSTEM.CNF to find the "VER" value
// Try reading SYSTEM.CNF to find the "VER" value
try
{
using (StreamReader sr = File.OpenText(systemCnfPath))
@@ -2495,7 +2501,11 @@ namespace DICUI.Utilities
line = sr.ReadLine();
// Once it finds the "VER" line, extract the version
return Regex.Match(line, @"VER\s*=\s*(.*)").Groups[1].Value;
var match = Regex.Match(line, @"VER\s*=\s*(.*)");
if (match != null && match.Groups.Count > 1)
return match.Groups[1].Value;
return null;
}
}
catch