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

Installing from CD: Volume names / mount points are unreliable identifiers - check for specific files on the disk instead.

Browse Source
This commit is contained in:
Paul Chote
2011-07-23 16:12:08 +12:00
parent a165a80101
commit 22d3e16225
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.FileFormats/InstallUtils.cs
View File

@@ -28,15 +28,15 @@ namespace OpenRA.FileFormats
} }
} }
public static string GetMountedDisk(string[] volumeNames) public static string GetMountedDisk(Func<string, bool> isValidDisk)
{ {
var volumes = DriveInfo.GetDrives() var volumes = DriveInfo.GetDrives()
.Where(v => v.DriveType == DriveType.CDRom && v.IsReady) .Where(v => v.DriveType == DriveType.CDRom && v.IsReady)
.Select(v => v.RootDirectory.FullName); .Select(v => v.RootDirectory.FullName);
return volumes.FirstOrDefault(v => volumeNames.Contains(Path.GetFileName(v))); return volumes.FirstOrDefault(v => isValidDisk(v));
} }
// TODO: The package should be mounted into its own context to avoid name collisions with installed files // TODO: The package should be mounted into its own context to avoid name collisions with installed files
public static bool ExtractFromPackage(string srcPath, string package, string[] files, string destPath, Action<string> onProgress, Action<string> onError) public static bool ExtractFromPackage(string srcPath, string package, string[] files, string destPath, Action<string> onProgress, Action<string> onError)
{ {

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

@@ -49,7 +49,11 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
void CheckForDisk() void CheckForDisk()
{ {
var path = InstallUtils.GetMountedDisk(new [] { "GDI95", "NOD95" }); Func<string, bool> ValidDiskFilter = diskRoot => File.Exists(diskRoot+Path.DirectorySeparatorChar+"CONQUER.MIX") &&
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);

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

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
var installButton = panel.GetWidget<ButtonWidget>("INSTALL_BUTTON"); var installButton = panel.GetWidget<ButtonWidget>("INSTALL_BUTTON");
installButton.OnClick = () => installButton.OnClick = () =>
Widget.OpenWindow("INSTALL_MUSIC_PANEL", new WidgetArgs() {{ "afterInstall", afterInstall }}); Widget.OpenWindow("INSTALL_MUSIC_PANEL", new WidgetArgs() {{ "afterInstall", afterInstall }});
installButton.IsVisible = () => music.Length < 2; // Hack around ra shipping (only) hellmarch by default installButton.IsVisible = () => music.Length < 3; // Hack around music being split between transit.mix and scores.mix
panel.GetWidget("NO_MUSIC_LABEL").IsVisible = noMusic; panel.GetWidget("NO_MUSIC_LABEL").IsVisible = noMusic;
@@ -216,7 +216,11 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
void CheckForDisk() void CheckForDisk()
{ {
var path = InstallUtils.GetMountedDisk(new [] { "GDI95", "NOD95" }); Func<string, bool> ValidDiskFilter = diskRoot => File.Exists(diskRoot+Path.DirectorySeparatorChar+"CONQUER.MIX") &&
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);

5
OpenRA.Mods.RA/Widgets/Logic/RAInstallFromCDLogic.cs
View File

@@ -49,7 +49,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
void CheckForDisk() void CheckForDisk()
{ {
var path = InstallUtils.GetMountedDisk(new [] { "CD1", "CD2" }); Func<string, bool> ValidDiskFilter = diskRoot => File.Exists(diskRoot+Path.DirectorySeparatorChar+"MAIN.MIX") &&
File.Exists(new string[] { diskRoot, "INSTALL", "REDALERT.MIX" }.Aggregate(Path.Combine));
var path = InstallUtils.GetMountedDisk(ValidDiskFilter);
if (path != null) if (path != null)
Install(path); Install(path);