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 StoppingErrorMessage event to ATA dumper.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-19 17:40:07 +01:00
parent 455088af69
commit 8222e90906
3 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,19 +91,18 @@ namespace DiscImageChef.Core.Devices.Dumping
if(force) ErrorMessage?.Invoke("Raw dumping not yet supported in ATA devices, continuing..."); if(force) ErrorMessage?.Invoke("Raw dumping not yet supported in ATA devices, continuing...");
else else
{ {
DicConsole.ErrorWriteLine("Raw dumping not yet supported in ATA devices, aborting..."); StoppingErrorMessage?.Invoke("Raw dumping not yet supported in ATA devices, aborting...");
return; return;
} }
} }
bool sense;
const ushort ATA_PROFILE = 0x0001; const ushort ATA_PROFILE = 0x0001;
const uint TIMEOUT = 5; const uint TIMEOUT = 5;
double imageWriteDuration = 0; double imageWriteDuration = 0;
UpdateStatus?.Invoke("Requesting ATA IDENTIFY DEVICE."); UpdateStatus?.Invoke("Requesting ATA IDENTIFY DEVICE.");
dumpLog.WriteLine("Requesting ATA IDENTIFY DEVICE."); dumpLog.WriteLine("Requesting ATA IDENTIFY DEVICE.");
sense = dev.AtaIdentify(out byte[] cmdBuf, out _); bool sense = dev.AtaIdentify(out byte[] cmdBuf, out _);
if(!sense && Identify.Decode(cmdBuf).HasValue) if(!sense && Identify.Decode(cmdBuf).HasValue)
{ {
Identify.IdentifyDevice? ataIdNullable = Identify.Decode(cmdBuf); Identify.IdentifyDevice? ataIdNullable = Identify.Decode(cmdBuf);
@@ -160,7 +159,8 @@ namespace DiscImageChef.Core.Devices.Dumping
byte sectors = ataReader.Sectors; byte sectors = ataReader.Sectors;
UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes)."); UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
UpdateStatus?.Invoke($"Device reports {cylinders} cylinders {heads} heads {sectors} sectors per track."); UpdateStatus
?.Invoke($"Device reports {cylinders} cylinders {heads} heads {sectors} sectors per track.");
UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time."); UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block."); UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
UpdateStatus?.Invoke($"Device reports {physicalsectorsize} bytes per physical block."); UpdateStatus?.Invoke($"Device reports {physicalsectorsize} bytes per physical block.");
@@ -212,13 +212,10 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!ret) if(!ret)
{ {
dumpLog.WriteLine("Several media tags not supported, {0}continuing...", force ? "" : "not "); dumpLog.WriteLine("Several media tags not supported, {0}continuing...", force ? "" : "not ");
if(force) if(force) ErrorMessage("Several media tags not supported, continuing...");
{
ErrorMessage("Several media tags not supported, continuing...");
}
else else
{ {
DicConsole.ErrorWriteLine("Several media tags not supported, not continuing..."); StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
return; return;
} }
} }
@@ -232,8 +229,9 @@ namespace DiscImageChef.Core.Devices.Dumping
{ {
dumpLog.WriteLine("Error creating output image, not continuing."); dumpLog.WriteLine("Error creating output image, not continuing.");
dumpLog.WriteLine(outputPlugin.ErrorMessage); dumpLog.WriteLine(outputPlugin.ErrorMessage);
DicConsole.ErrorWriteLine("Error creating output image, not continuing."); StoppingErrorMessage?.Invoke("Error creating output image, not continuing." +
DicConsole.ErrorWriteLine(outputPlugin.ErrorMessage); Environment.NewLine +
outputPlugin.ErrorMessage);
return; return;
} }
@@ -325,8 +323,10 @@ namespace DiscImageChef.Core.Devices.Dumping
(totalDuration / 1000), devicePath); (totalDuration / 1000), devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds."); UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
UpdateStatus?.Invoke($"Average dump speed {(double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec."); UpdateStatus
UpdateStatus?.Invoke($"Average write speed {(double)blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec."); ?.Invoke($"Average dump speed {(double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
UpdateStatus
?.Invoke($"Average write speed {(double)blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds); dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.", dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
(double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000)); (double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
@@ -502,8 +502,10 @@ namespace DiscImageChef.Core.Devices.Dumping
blockSize * (double)(blocks + 1) / 1024 / blockSize * (double)(blocks + 1) / 1024 /
(totalDuration / 1000), devicePath); (totalDuration / 1000), devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds."); UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
UpdateStatus?.Invoke($"Average dump speed {(double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec."); UpdateStatus
UpdateStatus?.Invoke($"Average write speed {(double)blockSize * (double)(blocks + 1) / 1024 / (imageWriteDuration / 1000):F3} KiB/sec."); ?.Invoke($"Average dump speed {(double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
UpdateStatus
?.Invoke($"Average write speed {(double)blockSize * (double)(blocks + 1) / 1024 / (imageWriteDuration / 1000):F3} KiB/sec.");
dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds); dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.", dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
(double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000)); (double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
@@ -640,7 +642,8 @@ namespace DiscImageChef.Core.Devices.Dumping
totalChkDuration = (chkEnd - chkStart).TotalMilliseconds; totalChkDuration = (chkEnd - chkStart).TotalMilliseconds;
UpdateStatus?.Invoke($"Sidecar created in {(chkEnd - chkStart).TotalSeconds} seconds."); UpdateStatus?.Invoke($"Sidecar created in {(chkEnd - chkStart).TotalSeconds} seconds.");
UpdateStatus?.Invoke($"Average checksum speed {(double)blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec."); UpdateStatus
?.Invoke($"Average checksum speed {(double)blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
dumpLog.WriteLine("Sidecar created in {0} seconds.", (chkEnd - chkStart).TotalSeconds); dumpLog.WriteLine("Sidecar created in {0} seconds.", (chkEnd - chkStart).TotalSeconds);
dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.", dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
(double)blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000)); (double)blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
@@ -655,7 +658,8 @@ namespace DiscImageChef.Core.Devices.Dumping
if(filesystems.Count > 0) if(filesystems.Count > 0)
foreach(var filesystem in filesystems.Select(o => new {o.start, o.type}).Distinct()) foreach(var filesystem in filesystems.Select(o => new {o.start, o.type}).Distinct())
{ {
UpdateStatus?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}"); UpdateStatus
?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type,
filesystem.start); filesystem.start);
} }
@@ -701,8 +705,10 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
UpdateStatus?.Invoke(""); UpdateStatus?.Invoke("");
UpdateStatus?.Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing)."); UpdateStatus
UpdateStatus?.Invoke($"Average speed: {(double)blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); ?.Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
UpdateStatus
?.Invoke($"Average speed: {(double)blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
UpdateStatus?.Invoke($"{resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke($"{resume.BadBlocks.Count} sectors could not be read.");
@@ -714,7 +720,7 @@ namespace DiscImageChef.Core.Devices.Dumping
else if(dev.IsPcmcia) Statistics.AddMedia(MediaType.PCCardTypeI, true); else if(dev.IsPcmcia) Statistics.AddMedia(MediaType.PCCardTypeI, true);
else Statistics.AddMedia(MediaType.GENERIC_HDD, true); else Statistics.AddMedia(MediaType.GENERIC_HDD, true);
} }
else DicConsole.ErrorWriteLine("Unable to communicate with ATA device."); else StoppingErrorMessage?.Invoke("Unable to communicate with ATA device.");
} }
} }
} }

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

@@ -4,5 +4,6 @@ namespace DiscImageChef.Core.Devices.Dumping
{ {
public event UpdateStatusHandler UpdateStatus; public event UpdateStatusHandler UpdateStatus;
public event ErrorMessageHandler ErrorMessage; public event ErrorMessageHandler ErrorMessage;
public event ErrorMessageHandler StoppingErrorMessage;
} }
} }

4
DiscImageChef/Commands/DumpMedia.cs
View File

@@ -296,7 +296,9 @@ namespace DiscImageChef.Commands
} }
Dump dumper = new Dump(); Dump dumper = new Dump();
dumper.UpdateStatus += Progress.UpdateStatus; dumper.UpdateStatus += Progress.UpdateStatus;
dumper.ErrorMessage += Progress.ErrorMessage;
dumper.StoppingErrorMessage += Progress.ErrorMessage;
if(dev.IsUsb && dev.UsbVendorId == 0x054C && if(dev.IsUsb && dev.UsbVendorId == 0x054C &&
(dev.UsbProductId == 0x01C8 || dev.UsbProductId == 0x01C9 || dev.UsbProductId == 0x02D2)) (dev.UsbProductId == 0x01C8 || dev.UsbProductId == 0x01C9 || dev.UsbProductId == 0x02D2))