epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unify disk check between music install and game install for cnc

Browse Source
This commit is contained in:
Chris Forbes
2011-10-06 23:43:32 +13:00
parent 281f706b02
commit e9a4ec5403
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs
View File

@@ -46,13 +46,20 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
CheckForDisk(); CheckForDisk();
} }
public static bool IsValidDisk(string diskRoot)
{
var files = new string[][] {
new [] { diskRoot, "CONQUER.MIX" },
new [] { diskRoot, "DESERT.MIX" },
new [] { diskRoot, "INSTALL", "SETUP.Z" },
};
return files.All(f => File.Exists(f.Aggregate(Path.Combine)));
}
void CheckForDisk() void CheckForDisk()
{ {
Func<string, bool> ValidDiskFilter = diskRoot => File.Exists(diskRoot+Path.DirectorySeparatorChar+"CONQUER.MIX") && var path = InstallUtils.GetMountedDisk(IsValidDisk);
File.Exists(diskRoot+Path.DirectorySeparatorChar+"DESERT.MIX") &&
File.Exists(new string[] { diskRoot, "INSTALL", "SETUP.Z" }.Aggregate(Path.Combine));
var path = InstallUtils.GetMountedDisk(ValidDiskFilter);
if (path != null) if (path != null)
Install(path); Install(path);

6
OpenRA.Mods.Cnc/Widgets/Logic/CncMusicPlayerLogic.cs
View File

@@ -215,11 +215,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
void CheckForDisk() void CheckForDisk()
{ {
Func<string, bool> ValidDiskFilter = diskRoot => File.Exists(diskRoot+Path.DirectorySeparatorChar+"CONQUER.MIX") && var path = InstallUtils.GetMountedDisk(CncInstallFromCDLogic.IsValidDisk);
File.Exists(diskRoot+Path.DirectorySeparatorChar+"DESERT.MIX") &&
File.Exists(new string[] { diskRoot, "INSTALL", "SETUP.Z" }.Aggregate(Path.Combine));
var path = InstallUtils.GetMountedDisk(ValidDiskFilter);
if (path != null) if (path != null)
Install(path); Install(path);