aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ErrorMessage event to ATA dumper.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-19 17:35:01 +01:00
parent 5020f33006
commit 455088af69
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
DiscImageChef.Core/Devices/Dumping/ATA.cs
View File

@@ -88,12 +88,10 @@ namespace DiscImageChef.Core.Devices.Dumping
if(dumpRaw)
{
DicConsole.ErrorWriteLine("Raw dumping not yet supported in ATA devices.");
if(force) DicConsole.ErrorWriteLine("Continuing...");
if(force) ErrorMessage?.Invoke("Raw dumping not yet supported in ATA devices, continuing...");
else
{
DicConsole.ErrorWriteLine("Aborting...");
DicConsole.ErrorWriteLine("Raw dumping not yet supported in ATA devices, aborting...");
return;
}
}
@@ -135,7 +133,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(ataReader.GetBlockSize())
{
dumpLog.WriteLine("ERROR: Cannot get block size: {0}.", ataReader.ErrorMessage);
DicConsole.ErrorWriteLine(ataReader.ErrorMessage);
ErrorMessage(ataReader.ErrorMessage);
return;
}
@@ -144,7 +142,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(ataReader.FindReadCommand())
{
dumpLog.WriteLine("ERROR: Cannot find correct read command: {0}.", ataReader.ErrorMessage);
DicConsole.ErrorWriteLine(ataReader.ErrorMessage);
ErrorMessage(ataReader.ErrorMessage);
return;
}
@@ -152,7 +150,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(ataReader.GetBlocksToRead())
{
dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", ataReader.ErrorMessage);
DicConsole.ErrorWriteLine(ataReader.ErrorMessage);
ErrorMessage(ataReader.ErrorMessage);
return;
}
@@ -193,7 +191,7 @@ namespace DiscImageChef.Core.Devices.Dumping
{
ret = false;
dumpLog.WriteLine("Output format does not support USB descriptors.");
DicConsole.ErrorWriteLine("Output format does not support USB descriptors.");
ErrorMessage("Output format does not support USB descriptors.");
}
if(dev.IsPcmcia && dev.Cis != null &&
@@ -201,22 +199,28 @@ namespace DiscImageChef.Core.Devices.Dumping
{
ret = false;
dumpLog.WriteLine("Output format does not support PCMCIA CIS descriptors.");
DicConsole.ErrorWriteLine("Output format does not support PCMCIA CIS descriptors.");
ErrorMessage("Output format does not support PCMCIA CIS descriptors.");
}
if(!outputPlugin.SupportedMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
{
ret = false;
dumpLog.WriteLine("Output format does not support ATA IDENTIFY.");
DicConsole.ErrorWriteLine("Output format does not support ATA IDENTIFY.");
ErrorMessage("Output format does not support ATA IDENTIFY.");
}
if(!ret)
{
dumpLog.WriteLine("Several media tags not supported, {0}continuing...", force ? "" : "not ");
DicConsole.ErrorWriteLine("Several media tags not supported, {0}continuing...",
force ? "" : "not ");
if(!force) return;
if(force)
{
ErrorMessage("Several media tags not supported, continuing...");
}
else
{
DicConsole.ErrorWriteLine("Several media tags not supported, not continuing...");
return;
}
}
ret = outputPlugin.Create(outputPath,

1
DiscImageChef.Core/Devices/Dumping/Dump.cs
View File

@@ -3,5 +3,6 @@ namespace DiscImageChef.Core.Devices.Dumping
public partial class Dump
{
public event UpdateStatusHandler UpdateStatus;
public event ErrorMessageHandler ErrorMessage;
}
}