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

Move all SCSI dumper messages to events.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-20 02:11:18 +01:00
parent 6ec4a93724
commit bdb1eefed3
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
DiscImageChef.Core/Devices/Dumping/SCSI.cs
View File

@@ -36,7 +36,6 @@ using System.Text;
using System.Threading; using System.Threading;
using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.CommonTypes.Metadata;
using DiscImageChef.Console;
using DiscImageChef.Core.Logging; using DiscImageChef.Core.Logging;
using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.SCSI;
using DiscImageChef.Devices; using DiscImageChef.Devices;
@@ -85,6 +84,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(dev.IsRemovable) if(dev.IsRemovable)
{ {
InitProgress?.Invoke();
deviceGotReset: deviceGotReset:
bool sense = dev.ScsiTestUnitReady(out byte[] senseBuf, dev.Timeout, out _); bool sense = dev.ScsiTestUnitReady(out byte[] senseBuf, dev.Timeout, out _);
if(sense) if(sense)
@@ -92,6 +92,8 @@ namespace DiscImageChef.Core.Devices.Dumping
FixedSense? decSense = Sense.DecodeFixed(senseBuf); FixedSense? decSense = Sense.DecodeFixed(senseBuf);
if(decSense.HasValue) if(decSense.HasValue)
{ {
UpdateStatus
?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey}h ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
@@ -107,21 +109,26 @@ namespace DiscImageChef.Core.Devices.Dumping
int leftRetries = 5; int leftRetries = 5;
while(leftRetries > 0) while(leftRetries > 0)
{ {
DicConsole.WriteLine("\rWaiting for drive to become ready"); PulseProgress?.Invoke("\rWaiting for drive to become ready");
Thread.Sleep(2000); Thread.Sleep(2000);
sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _); sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
if(!sense) break; if(!sense) break;
decSense = Sense.DecodeFixed(senseBuf); decSense = Sense.DecodeFixed(senseBuf);
if(decSense.HasValue) if(decSense.HasValue)
{
UpdateStatus
?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey}h ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
}
leftRetries--; leftRetries--;
} }
if(sense) if(sense)
{ {
DicConsole.ErrorWriteLine("Please insert media in drive"); StoppingErrorMessage?.Invoke("Please insert media in drive");
return; return;
} }
} }
@@ -130,22 +137,27 @@ namespace DiscImageChef.Core.Devices.Dumping
int leftRetries = 10; int leftRetries = 10;
while(leftRetries > 0) while(leftRetries > 0)
{ {
DicConsole.WriteLine("\rWaiting for drive to become ready"); PulseProgress?.Invoke("\rWaiting for drive to become ready");
Thread.Sleep(2000); Thread.Sleep(2000);
sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _); sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
if(!sense) break; if(!sense) break;
decSense = Sense.DecodeFixed(senseBuf); decSense = Sense.DecodeFixed(senseBuf);
if(decSense.HasValue) if(decSense.HasValue)
{
UpdateStatus
?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey}h ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
}
leftRetries--; leftRetries--;
} }
if(sense) if(sense)
{ {
DicConsole.ErrorWriteLine("Error testing unit was ready:\n{0}", StoppingErrorMessage
Sense.PrettifySense(senseBuf)); ?.Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
return; return;
} }
} }
@@ -154,11 +166,12 @@ namespace DiscImageChef.Core.Devices.Dumping
if (!deviceReset) if (!deviceReset)
{ {
deviceReset = true; deviceReset = true;
DicConsole.ErrorWriteLine("Device did reset, retrying..."); ErrorMessage?.Invoke("Device did reset, retrying...");
goto retryTestReady; goto retryTestReady;
} }
DicConsole.ErrorWriteLine("Error testing unit was ready:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); StoppingErrorMessage?.Invoke(string.Format("Error testing unit was ready:\n{0}",
Decoders.SCSI.Sense.PrettifySense(senseBuf)));
return; return;
}*/ }*/
// These should be trapped by the OS but seems in some cases they're not // These should be trapped by the OS but seems in some cases they're not
@@ -167,38 +180,45 @@ namespace DiscImageChef.Core.Devices.Dumping
int leftRetries = 10; int leftRetries = 10;
while(leftRetries > 0) while(leftRetries > 0)
{ {
DicConsole.WriteLine("\rWaiting for drive to become ready"); PulseProgress?.Invoke("\rWaiting for drive to become ready");
Thread.Sleep(2000); Thread.Sleep(2000);
sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _); sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
if(!sense) break; if(!sense) break;
decSense = Sense.DecodeFixed(senseBuf); decSense = Sense.DecodeFixed(senseBuf);
if(decSense.HasValue) if(decSense.HasValue)
{
UpdateStatus
?.Invoke($"Device not ready. Sense {decSense.Value.SenseKey}h ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ); decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
}
leftRetries--; leftRetries--;
} }
if(sense) if(sense)
{ {
DicConsole.ErrorWriteLine("Error testing unit was ready:\n{0}", StoppingErrorMessage
Sense.PrettifySense(senseBuf)); ?.Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
return; return;
} }
} }
else else
{ {
DicConsole.ErrorWriteLine("Error testing unit was ready:\n{0}", StoppingErrorMessage
Sense.PrettifySense(senseBuf)); ?.Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
return; return;
} }
} }
else else
{ {
DicConsole.ErrorWriteLine("Unknown testing unit was ready."); StoppingErrorMessage?.Invoke("Unknown testing unit was ready.");
return; return;
} }
} }
EndProgress?.Invoke();
} }
switch(dev.ScsiType) switch(dev.ScsiType)
@@ -215,7 +235,8 @@ namespace DiscImageChef.Core.Devices.Dumping
ref dskType, ref resume, ref dumpLog, dumpFirstTrackPregap, encoding, outputPrefix, ref dskType, ref resume, ref dumpLog, dumpFirstTrackPregap, encoding, outputPrefix,
outputPath, formatOptions, preSidecar, skip, nometadata, notrim); outputPath, formatOptions, preSidecar, skip, nometadata, notrim);
else else
DicConsole.ErrorWriteLine("The specified plugin does not support storing optical disc images."); StoppingErrorMessage
?.Invoke("The specified plugin does not support storing optical disc images.");
return; return;
default: default:
Sbc(dev, devicePath, outputPlugin, retryPasses, force, dumpRaw, persistent, Sbc(dev, devicePath, outputPlugin, retryPasses, force, dumpRaw, persistent,