More messages isnt a bad thing

This commit is contained in:
Matt Nadareski
2020-12-31 11:02:14 -08:00
parent a63972b549
commit 33e73a8992
2 changed files with 29 additions and 34 deletions

View File

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
using BurnOutSharp;
using MPF.Data;
#if NET_FRAMEWORK
using System.Runtime.InteropServices;
using IMAPI2;
#endif
@@ -775,16 +774,16 @@ namespace MPF.Utilities
/// This will also end up making it so that IMAPI2 is no longer necessary. Unfortunately, that
/// will only work for .NET Core 3.1 and beyond.
/// </remarks>
public static MediaType? GetMediaType(Drive drive)
public static (MediaType?, string) GetMediaType(Drive drive)
{
// Take care of the non-optical stuff first
// TODO: See if any of these can be more granular, like Optical is
if (drive.InternalDriveType == InternalDriveType.Floppy)
return MediaType.FloppyDisk;
return (MediaType.FloppyDisk, null);
else if (drive.InternalDriveType == InternalDriveType.HardDisk)
return MediaType.HardDisk;
return (MediaType.HardDisk, null);
else if (drive.InternalDriveType == InternalDriveType.Removable)
return MediaType.FlashDrive;
return (MediaType.FlashDrive, null);
// Get the current drive information
string deviceId = null;
@@ -803,8 +802,10 @@ namespace MPF.Utilities
}
// If we got no valid device, we don't care and just return
if (deviceId == null || !loaded)
return null;
if (deviceId == null)
return (null, "Device could not be found");
else if (!loaded)
return (null, "Device is not reporting media loaded");
#if NET_FRAMEWORK
MsftDiscMaster2 discMaster = new MsftDiscMaster2();
@@ -818,45 +819,34 @@ namespace MPF.Utilities
// If we couldn't find the drive, we don't care and return
if (id == null)
return null;
return (null, "Device ID could not be found");
try
{
// Create the required objects for reading from the drive
MsftDiscRecorder2 recorder = new MsftDiscRecorder2();
recorder.InitializeDiscRecorder(id);
MsftDiscFormat2Data dataWriter = new MsftDiscFormat2Data();
// Create the required objects for reading from the drive
MsftDiscRecorder2 recorder = new MsftDiscRecorder2();
recorder.InitializeDiscRecorder(id);
MsftDiscFormat2Data dataWriter = new MsftDiscFormat2Data();
// If the recorder is not supported, just return
if (!dataWriter.IsRecorderSupported(recorder))
return null;
// If the recorder is not supported, just return
if (!dataWriter.IsRecorderSupported(recorder))
return (null, "IMAPI2 recorder not supported");
// Otherwise, set the recorder to get information from
dataWriter.Recorder = recorder;
// Otherwise, set the recorder to get information from
dataWriter.Recorder = recorder;
var media = dataWriter.CurrentPhysicalMediaType;
return media.IMAPIToMediaType();
}
catch (COMException ex)
{
if (ex.Message.Contains("There is no media in the device."))
return null;
}
return null;
var media = dataWriter.CurrentPhysicalMediaType;
return (media.IMAPIToMediaType(), null);
#else
// TODO: This entire .NET Core path still doesn't work
// This may honestly require an entire import of IMAPI2 stuff and then try
// as best as possible to get it working.
return null;
return (null, "Media detection only supported on .NET Framework");
#endif
}
catch
catch (Exception ex)
{
// We don't care what the error was
return null;
return (null, ex.Message);
}
}

View File

@@ -129,7 +129,12 @@ namespace MPF.Windows
else if (drive.MarkedActive)
{
ViewModels.LoggerViewModel.VerboseLog("Trying to detect media type for drive {0}.. ", drive.Letter);
CurrentMediaType = Validators.GetMediaType(drive);
string errorMessage;
(CurrentMediaType, errorMessage) = Validators.GetMediaType(drive);
// If we got an error message, post it to the log
if (errorMessage != null)
ViewModels.LoggerViewModel.VerboseLogLn($"Error in detecting media type: {errorMessage}");
// If we got either an error or no media, default to the current System default
if (CurrentMediaType == null)