Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrap disk scope in try/catch, default to unspecified if error.

Browse Source
This commit is contained in:
Unnoen 2021-02-04 17:59:09 +11:00
parent 07e0f92a74
commit cf29bae7a7
No known key found for this signature in database
GPG Key ID: 8F8E42252BA20553
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Wabbajack.Common/Util/PhysicalDisk.cs
View File

@ -12,7 +12,9 @@ namespace Wabbajack.Common
if (driveLetter.Length == 3 && (driveLetter[1] == ':' && driveLetter[2] == '\\')) driveLetter = driveLetter.Remove(driveLetter.Length - 2);
if (driveLetter.Length > 3) Utils.Error("Incorrect drive name! Must be X, X: or X:\\");
Utils.Log($"Phsyical Disk: {driveLetter}");
DriveLetter = driveLetter;
try {
// Connect to storage scope
var scope = new ManagementScope(@"\\.\root\microsoft\windows\storage");
@ -30,19 +32,23 @@ namespace Wabbajack.Common
// Get disk information
var physical = physicalSearcher.Get().Cast<ManagementBaseObject>().Single();
DriveLetter = driveLetter;
DeviceId = (string)physical["DeviceId"];
MediaType = (MediaTypes)Convert.ToInt32(physical["MediaType"]);
BusType = (BusTypes)Convert.ToInt32(physical["BusType"]);
}
catch (Exception ex)
{
Utils.Log($"Caught error getting disk info: {ex.Message}. Treating disk as Unspecified.");
}
}
public string DriveLetter { get; }
public string DeviceId { get; }
public string DeviceId { get; } = "-1";
public MediaTypes MediaType { get; }
public MediaTypes MediaType { get; } = MediaTypes.Unspecified;
public BusTypes BusType { get; }
public BusTypes BusType { get; } = BusTypes.Unknown;
// https://docs.microsoft.com/en-us/previous-versions/windows/desktop/stormgmt/msft-physicaldisk#properties
public enum MediaTypes