claunia/RomVault
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chdman fixes for mono/unix

Browse Source 
- call chdman as chdman and not chdman.exe
- fix parsing issue with chdman stderr output
This commit is contained in:
Jim Westfall
2014-10-28 18:37:16 -07:00
parent 0801ddc7f0
commit e27dfd039d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ROMVault2/SupportedFiles/CHD/CHD.cs
View File

@@ -245,10 +245,14 @@ namespace ROMVault2.SupportedFiles.CHD
_result = ""; _result = "";
_resultType = CHDManCheck.Unset; _resultType = CHDManCheck.Unset;
string chdPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "chdman.exe"); string chdExe = "chdman.exe";
if (Settings.MonoFileIO)
chdExe = "chdman";
string chdPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, chdExe);
if (!File.Exists(chdPath)) if (!File.Exists(chdPath))
{ {
result = "chdman not found"; result = chdExe + " Not Found.";
return CHDManCheck.ChdmanNotFound; return CHDManCheck.ChdmanNotFound;
} }
@@ -421,7 +425,7 @@ namespace ROMVault2.SupportedFiles.CHD
// check for Verifying message // check for Verifying message
if (sOut.Length >= 24) if (sOut.Length >= 24)
if (sOut.Substring(0, 11) == "Verifying, " && sOut.Substring(sOut.Length - 13, 13) == " complete... ") if (System.Text.RegularExpressions.Regex.IsMatch(sOut, "Verifying, \\d+\\.\\d+\\% complete\\.\\.\\."))
{ {
//_resultType = CHDManCheck.Good; //_resultType = CHDManCheck.Good;
return; return;