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

Use events for messages from MediaScan.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-21 00:51:55 +01:00
parent 9052ea80f4
commit 359efb369c
7 changed files with 113 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
DiscImageChef.Core/Devices/Scanning/ATA.cs
View File

@@ -32,7 +32,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DiscImageChef.Console;
using DiscImageChef.Core.Logging; using DiscImageChef.Core.Logging;
using DiscImageChef.Decoders.ATA; using DiscImageChef.Decoders.ATA;
@@ -65,14 +64,14 @@ namespace DiscImageChef.Core.Devices.Scanning
results.Blocks = ataReader.GetDeviceBlocks(); results.Blocks = ataReader.GetDeviceBlocks();
if(ataReader.FindReadCommand()) if(ataReader.FindReadCommand())
{ {
DicConsole.ErrorWriteLine(ataReader.ErrorMessage); StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
return results; return results;
} }
// Check block sizes // Check block sizes
if(ataReader.GetBlockSize()) if(ataReader.GetBlockSize())
{ {
DicConsole.ErrorWriteLine(ataReader.ErrorMessage); StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
return results; return results;
} }
@@ -80,7 +79,7 @@ namespace DiscImageChef.Core.Devices.Scanning
// Check how many blocks to read, if error show and return // Check how many blocks to read, if error show and return
if(ataReader.GetBlocksToRead()) if(ataReader.GetBlocksToRead())
{ {
DicConsole.ErrorWriteLine(ataReader.ErrorMessage); StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
return results; return results;
} }
@@ -120,7 +119,7 @@ namespace DiscImageChef.Core.Devices.Scanning
double duration; double duration;
if(ataReader.IsLba) if(ataReader.IsLba)
{ {
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead); mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead);
ibgLog = new IbgLog(ibgLogPath, ATA_PROFILE); ibgLog = new IbgLog(ibgLogPath, ATA_PROFILE);
@@ -128,6 +127,7 @@ namespace DiscImageChef.Core.Devices.Scanning
start = DateTime.UtcNow; start = DateTime.UtcNow;
DateTime timeSpeedStart = DateTime.UtcNow; DateTime timeSpeedStart = DateTime.UtcNow;
ulong sectorSpeedStart = 0; ulong sectorSpeedStart = 0;
InitProgress?.Invoke();
for(ulong i = 0; i < results.Blocks; i += blocksToRead) for(ulong i = 0; i < results.Blocks; i += blocksToRead)
{ {
if(aborted) break; if(aborted) break;
@@ -139,8 +139,8 @@ namespace DiscImageChef.Core.Devices.Scanning
if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed; if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed;
#pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
DicConsole.Write("\rReading sector {0} of {1} ({2:F3} MiB/sec.)", i, results.Blocks, UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
currentSpeed); (long)i, (long)results.Blocks);
bool error = ataReader.ReadBlocks(out cmdBuf, i, blocksToRead, out duration); bool error = ataReader.ReadBlocks(out cmdBuf, i, blocksToRead, out duration);
@@ -177,13 +177,14 @@ namespace DiscImageChef.Core.Devices.Scanning
} }
end = DateTime.UtcNow; end = DateTime.UtcNow;
DicConsole.WriteLine(); EndProgress?.Invoke();
mhddLog.Close(); mhddLog.Close();
ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024, ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
blockSize * (double)(results.Blocks + 1) / 1024 / blockSize * (double)(results.Blocks + 1) / 1024 /
(results.ProcessingTime / 1000), (results.ProcessingTime / 1000),
devicePath); devicePath);
InitProgress?.Invoke();
if(ataReader.CanSeekLba) if(ataReader.CanSeekLba)
for(int i = 0; i < SEEK_TIMES; i++) for(int i = 0; i < SEEK_TIMES; i++)
{ {
@@ -191,7 +192,7 @@ namespace DiscImageChef.Core.Devices.Scanning
uint seekPos = (uint)rnd.Next((int)results.Blocks); uint seekPos = (uint)rnd.Next((int)results.Blocks);
DicConsole.Write("\rSeeking to sector {0}...\t\t", seekPos); PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
ataReader.Seek(seekPos, out seekCur); ataReader.Seek(seekPos, out seekCur);
@@ -203,6 +204,8 @@ namespace DiscImageChef.Core.Devices.Scanning
results.SeekTotal += seekCur; results.SeekTotal += seekCur;
GC.Collect(); GC.Collect();
} }
EndProgress?.Invoke();
} }
else else
{ {
@@ -214,6 +217,7 @@ namespace DiscImageChef.Core.Devices.Scanning
start = DateTime.UtcNow; start = DateTime.UtcNow;
DateTime timeSpeedStart = DateTime.UtcNow; DateTime timeSpeedStart = DateTime.UtcNow;
ulong sectorSpeedStart = 0; ulong sectorSpeedStart = 0;
InitProgress?.Invoke();
for(ushort cy = 0; cy < cylinders; cy++) for(ushort cy = 0; cy < cylinders; cy++)
{ {
for(byte hd = 0; hd < heads; hd++) for(byte hd = 0; hd < heads; hd++)
@@ -229,8 +233,8 @@ namespace DiscImageChef.Core.Devices.Scanning
results.MinSpeed = currentSpeed; results.MinSpeed = currentSpeed;
#pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
DicConsole.Write("\rReading cylinder {0} head {1} sector {2} ({3:F3} MiB/sec.)", cy, hd, PulseProgress
sc, currentSpeed); ?.Invoke($"Reading cylinder {cy} head {hd} sector {sc} ({currentSpeed:F3} MiB/sec.)");
bool error = ataReader.ReadChs(out cmdBuf, cy, hd, sc, out duration); bool error = ataReader.ReadChs(out cmdBuf, cy, hd, sc, out duration);
@@ -269,13 +273,14 @@ namespace DiscImageChef.Core.Devices.Scanning
} }
end = DateTime.UtcNow; end = DateTime.UtcNow;
DicConsole.WriteLine(); EndProgress?.Invoke();
mhddLog.Close(); mhddLog.Close();
ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024, ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
blockSize * (double)(results.Blocks + 1) / 1024 / blockSize * (double)(results.Blocks + 1) / 1024 /
(results.ProcessingTime / 1000), (results.ProcessingTime / 1000),
devicePath); devicePath);
InitProgress?.Invoke();
if(ataReader.CanSeek) if(ataReader.CanSeek)
for(int i = 0; i < SEEK_TIMES; i++) for(int i = 0; i < SEEK_TIMES; i++)
{ {
@@ -285,8 +290,8 @@ namespace DiscImageChef.Core.Devices.Scanning
byte seekHd = (byte)rnd.Next(heads); byte seekHd = (byte)rnd.Next(heads);
byte seekSc = (byte)rnd.Next(sectors); byte seekSc = (byte)rnd.Next(sectors);
DicConsole.Write("\rSeeking to cylinder {0}, head {1}, sector {2}...\t\t", seekCy, seekHd, PulseProgress
seekSc); ?.Invoke($"\rSeeking to cylinder {seekCy}, head {seekHd}, sector {seekSc}...\t\t");
ataReader.SeekChs(seekCy, seekHd, seekSc, out seekCur); ataReader.SeekChs(seekCy, seekHd, seekSc, out seekCur);
@@ -298,9 +303,9 @@ namespace DiscImageChef.Core.Devices.Scanning
results.SeekTotal += seekCur; results.SeekTotal += seekCur;
GC.Collect(); GC.Collect();
} }
}
DicConsole.WriteLine(); EndProgress?.Invoke();
}
results.ProcessingTime /= 1000; results.ProcessingTime /= 1000;
results.TotalTime = (end - start).TotalSeconds; results.TotalTime = (end - start).TotalSeconds;
@@ -310,7 +315,7 @@ namespace DiscImageChef.Core.Devices.Scanning
return results; return results;
} }
DicConsole.ErrorWriteLine("Unable to communicate with ATA device."); StoppingErrorMessage?.Invoke("Unable to communicate with ATA device.");
return results; return results;
} }
} }

29
DiscImageChef.Core/Devices/Scanning/MediaScan.cs
View File

@@ -36,5 +36,34 @@ namespace DiscImageChef.Core.Devices.Scanning
default: throw new NotSupportedException("Unknown device type."); default: throw new NotSupportedException("Unknown device type.");
} }
} }
/// <summary>
/// Event raised when the progress bar is not longer needed
/// </summary>
public event EndProgressHandler EndProgress;
/// <summary>
/// Event raised when a progress bar is needed
/// </summary>
public event InitProgressHandler InitProgress;
/// <summary>
/// Event raised to report status updates
/// </summary>
public event UpdateStatusHandler UpdateStatus;
/// <summary>
/// Event raised to report a non-fatal error
/// </summary>
public event ErrorMessageHandler ErrorMessage;
/// <summary>
/// Event raised to report a fatal error that stops the dumping operation and should call user's attention
/// </summary>
public event ErrorMessageHandler StoppingErrorMessage;
/// <summary>
/// Event raised to update the values of a determinate progress bar
/// </summary>
public event UpdateProgressHandler UpdateProgress;
/// <summary>
/// Event raised to update the status of an undeterminate progress bar
/// </summary>
public event PulseProgressHandler PulseProgress;
} }
} }

8
DiscImageChef.Core/Devices/Scanning/NVMe.cs
View File

@@ -30,12 +30,14 @@
// Copyright © 2011-2019 Natalia Portillo // Copyright © 2011-2019 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
using System;
namespace DiscImageChef.Core.Devices.Scanning namespace DiscImageChef.Core.Devices.Scanning
{ {
public partial class MediaScan public partial class MediaScan
{ {
public ScanResults Nvme() => throw new NotImplementedException("NVMe devices not yet supported."); public ScanResults Nvme()
{
StoppingErrorMessage?.Invoke("NVMe devices not yet supported.");
return default;
}
} }
} }

66
DiscImageChef.Core/Devices/Scanning/SCSI.cs
View File

@@ -64,6 +64,7 @@ namespace DiscImageChef.Core.Devices.Scanning
sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _); sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
if(sense) if(sense)
{ {
InitProgress?.Invoke();
FixedSense? decSense = Sense.DecodeFixed(senseBuf); FixedSense? decSense = Sense.DecodeFixed(senseBuf);
if(decSense.HasValue) if(decSense.HasValue)
if(decSense.Value.ASC == 0x3A) if(decSense.Value.ASC == 0x3A)
@@ -71,7 +72,7 @@ namespace DiscImageChef.Core.Devices.Scanning
int leftRetries = 5; int leftRetries = 5;
while(leftRetries > 0) while(leftRetries > 0)
{ {
DicConsole.WriteLine("\rWaiting for drive to become ready"); PulseProgress?.Invoke("Waiting 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;
@@ -81,7 +82,7 @@ namespace DiscImageChef.Core.Devices.Scanning
if(sense) if(sense)
{ {
DicConsole.ErrorWriteLine("Please insert media in drive"); StoppingErrorMessage?.Invoke("Please insert media in drive");
return results; return results;
} }
} }
@@ -90,7 +91,7 @@ namespace DiscImageChef.Core.Devices.Scanning
int leftRetries = 10; int leftRetries = 10;
while(leftRetries > 0) while(leftRetries > 0)
{ {
DicConsole.WriteLine("\rWaiting for drive to become ready"); PulseProgress?.Invoke("Waiting 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;
@@ -100,8 +101,8 @@ namespace DiscImageChef.Core.Devices.Scanning
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 results; return results;
} }
} }
@@ -111,7 +112,7 @@ namespace DiscImageChef.Core.Devices.Scanning
int leftRetries = 10; int leftRetries = 10;
while(leftRetries > 0) while(leftRetries > 0)
{ {
DicConsole.WriteLine("\rWaiting for drive to become ready"); PulseProgress?.Invoke("Waiting 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;
@@ -121,22 +122,24 @@ namespace DiscImageChef.Core.Devices.Scanning
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 results; return results;
} }
} }
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 results; return results;
} }
else else
{ {
DicConsole.ErrorWriteLine("Unknown testing unit was ready."); StoppingErrorMessage?.Invoke("Unknown testing unit was ready.");
return results; return results;
} }
EndProgress?.Invoke();
} }
} }
@@ -154,7 +157,7 @@ namespace DiscImageChef.Core.Devices.Scanning
results.Blocks = scsiReader.GetDeviceBlocks(); results.Blocks = scsiReader.GetDeviceBlocks();
if(scsiReader.FindReadCommand()) if(scsiReader.FindReadCommand())
{ {
DicConsole.ErrorWriteLine("Unable to read medium."); StoppingErrorMessage?.Invoke("Unable to read medium.");
return results; return results;
} }
@@ -163,20 +166,21 @@ namespace DiscImageChef.Core.Devices.Scanning
if(results.Blocks != 0 && blockSize != 0) if(results.Blocks != 0 && blockSize != 0)
{ {
results.Blocks++; results.Blocks++;
DicConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2} bytes)", UpdateStatus
results.Blocks, blockSize, results.Blocks * (ulong)blockSize); ?.Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {results.Blocks * (ulong)blockSize} bytes)");
} }
break; break;
case PeripheralDeviceTypes.SequentialAccess: case PeripheralDeviceTypes.SequentialAccess:
DicConsole.WriteLine("Scanning will never be supported on SCSI Streaming Devices."); StoppingErrorMessage?.Invoke("Scanning will never be supported on SCSI Streaming Devices." +
DicConsole.WriteLine("It has no sense to do it, and it will put too much strain on the tape."); Environment.NewLine +
"It has no sense to do it, and it will put too much strain on the tape.");
return results; return results;
} }
if(results.Blocks == 0) if(results.Blocks == 0)
{ {
DicConsole.ErrorWriteLine("Unable to read medium or empty medium present..."); StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
return results; return results;
} }
@@ -244,7 +248,7 @@ namespace DiscImageChef.Core.Devices.Scanning
{ {
if(toc == null) if(toc == null)
{ {
DicConsole.ErrorWriteLine("Error trying to decode TOC..."); StoppingErrorMessage?.Invoke("Error trying to decode TOC...");
return results; return results;
} }
@@ -252,7 +256,7 @@ namespace DiscImageChef.Core.Devices.Scanning
MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
dev.Timeout, out _); dev.Timeout, out _);
if(readcd) DicConsole.WriteLine("Using MMC READ CD command."); if(readcd) UpdateStatus?.Invoke("Using MMC READ CD command.");
start = DateTime.UtcNow; start = DateTime.UtcNow;
@@ -271,17 +275,19 @@ namespace DiscImageChef.Core.Devices.Scanning
if(dev.Error) if(dev.Error)
{ {
DicConsole.ErrorWriteLine("Device error {0} trying to guess ideal transfer length.", dev.LastError); StoppingErrorMessage
?.Invoke($"Device error {dev.LastError} trying to guess ideal transfer length.");
return results; return results;
} }
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead); mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead);
ibgLog = new IbgLog(ibgLogPath, currentProfile); ibgLog = new IbgLog(ibgLogPath, currentProfile);
DateTime timeSpeedStart = DateTime.UtcNow; DateTime timeSpeedStart = DateTime.UtcNow;
ulong sectorSpeedStart = 0; ulong sectorSpeedStart = 0;
InitProgress?.Invoke();
for(ulong i = 0; i < results.Blocks; i += blocksToRead) for(ulong i = 0; i < results.Blocks; i += blocksToRead)
{ {
if(aborted) break; if(aborted) break;
@@ -295,7 +301,8 @@ namespace DiscImageChef.Core.Devices.Scanning
if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed; if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed;
#pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
DicConsole.Write("\rReading sector {0} of {1} ({2:F3} MiB/sec.)", i, results.Blocks, currentSpeed); UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
(long)i, (long)results.Blocks);
if(readcd) if(readcd)
{ {
@@ -361,7 +368,7 @@ namespace DiscImageChef.Core.Devices.Scanning
} }
end = DateTime.UtcNow; end = DateTime.UtcNow;
DicConsole.WriteLine(); EndProgress?.Invoke();
mhddLog.Close(); mhddLog.Close();
ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024, ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
blockSize * (double)(results.Blocks + 1) / 1024 / blockSize * (double)(results.Blocks + 1) / 1024 /
@@ -372,13 +379,14 @@ namespace DiscImageChef.Core.Devices.Scanning
{ {
start = DateTime.UtcNow; start = DateTime.UtcNow;
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead); mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead);
ibgLog = new IbgLog(ibgLogPath, currentProfile); ibgLog = new IbgLog(ibgLogPath, currentProfile);
DateTime timeSpeedStart = DateTime.UtcNow; DateTime timeSpeedStart = DateTime.UtcNow;
ulong sectorSpeedStart = 0; ulong sectorSpeedStart = 0;
InitProgress?.Invoke();
for(ulong i = 0; i < results.Blocks; i += blocksToRead) for(ulong i = 0; i < results.Blocks; i += blocksToRead)
{ {
if(aborted) break; if(aborted) break;
@@ -390,7 +398,8 @@ namespace DiscImageChef.Core.Devices.Scanning
if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed; if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed;
#pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
DicConsole.Write("\rReading sector {0} of {1} ({2:F3} MiB/sec.)", i, results.Blocks, currentSpeed); UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
(long)i, (long)results.Blocks);
sense = scsiReader.ReadBlocks(out _, i, blocksToRead, out double cmdDuration); sense = scsiReader.ReadBlocks(out _, i, blocksToRead, out double cmdDuration);
results.ProcessingTime += cmdDuration; results.ProcessingTime += cmdDuration;
@@ -428,7 +437,7 @@ namespace DiscImageChef.Core.Devices.Scanning
} }
end = DateTime.UtcNow; end = DateTime.UtcNow;
DicConsole.WriteLine(); EndProgress?.Invoke();
mhddLog.Close(); mhddLog.Close();
ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024, ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
blockSize * (double)(results.Blocks + 1) / 1024 / blockSize * (double)(results.Blocks + 1) / 1024 /
@@ -443,13 +452,14 @@ namespace DiscImageChef.Core.Devices.Scanning
Random rnd = new Random(); Random rnd = new Random();
InitProgress?.Invoke();
for(int i = 0; i < SEEK_TIMES; i++) for(int i = 0; i < SEEK_TIMES; i++)
{ {
if(aborted) break; if(aborted) break;
uint seekPos = (uint)rnd.Next((int)results.Blocks); uint seekPos = (uint)rnd.Next((int)results.Blocks);
DicConsole.Write("\rSeeking to sector {0}...\t\t", seekPos); PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
double seekCur; double seekCur;
if(scsiReader.CanSeek) scsiReader.Seek(seekPos, out seekCur); if(scsiReader.CanSeek) scsiReader.Seek(seekPos, out seekCur);
@@ -464,7 +474,7 @@ namespace DiscImageChef.Core.Devices.Scanning
GC.Collect(); GC.Collect();
} }
DicConsole.WriteLine(); EndProgress?.Invoke();
results.ProcessingTime /= 1000; results.ProcessingTime /= 1000;
results.TotalTime = (end - start).TotalSeconds; results.TotalTime = (end - start).TotalSeconds;

18
DiscImageChef.Core/Devices/Scanning/SecureDigital.cs
View File

@@ -33,7 +33,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DiscImageChef.CommonTypes.Enums; using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.Console;
using DiscImageChef.Core.Logging; using DiscImageChef.Core.Logging;
using DiscImageChef.Decoders.MMC; using DiscImageChef.Decoders.MMC;
@@ -107,7 +106,7 @@ namespace DiscImageChef.Core.Devices.Scanning
if(results.Blocks == 0) if(results.Blocks == 0)
{ {
DicConsole.ErrorWriteLine("Unable to get device size."); StoppingErrorMessage?.Invoke("Unable to get device size.");
return results; return results;
} }
@@ -122,7 +121,7 @@ namespace DiscImageChef.Core.Devices.Scanning
if(sense) if(sense)
{ {
DicConsole.ErrorWriteLine("Device error {0} trying to guess ideal transfer length.", dev.LastError); StoppingErrorMessage?.Invoke($"Device error {dev.LastError} trying to guess ideal transfer length.");
return results; return results;
} }
@@ -150,7 +149,7 @@ namespace DiscImageChef.Core.Devices.Scanning
aborted = false; aborted = false;
System.Console.CancelKeyPress += (sender, e) => e.Cancel = aborted = true; System.Console.CancelKeyPress += (sender, e) => e.Cancel = aborted = true;
DicConsole.WriteLine("Reading {0} sectors at a time.", blocksToRead); UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
MhddLog mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead); MhddLog mhddLog = new MhddLog(mhddLogPath, dev, results.Blocks, blockSize, blocksToRead);
IbgLog ibgLog = new IbgLog(ibgLogPath, SD_PROFILE); IbgLog ibgLog = new IbgLog(ibgLogPath, SD_PROFILE);
@@ -158,6 +157,7 @@ namespace DiscImageChef.Core.Devices.Scanning
start = DateTime.UtcNow; start = DateTime.UtcNow;
DateTime timeSpeedStart = DateTime.UtcNow; DateTime timeSpeedStart = DateTime.UtcNow;
ulong sectorSpeedStart = 0; ulong sectorSpeedStart = 0;
InitProgress?.Invoke();
for(ulong i = 0; i < results.Blocks; i += blocksToRead) for(ulong i = 0; i < results.Blocks; i += blocksToRead)
{ {
if(aborted) break; if(aborted) break;
@@ -169,7 +169,8 @@ namespace DiscImageChef.Core.Devices.Scanning
if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed; if(currentSpeed < results.MinSpeed && currentSpeed != 0) results.MinSpeed = currentSpeed;
#pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
DicConsole.Write("\rReading sector {0} of {1} ({2:F3} MiB/sec.)", i, results.Blocks, currentSpeed); UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
(long)results.Blocks);
bool error = dev.Read(out cmdBuf, out _, (uint)i, blockSize, blocksToRead, byteAddressed, TIMEOUT, bool error = dev.Read(out cmdBuf, out _, (uint)i, blockSize, blocksToRead, byteAddressed, TIMEOUT,
out duration); out duration);
@@ -207,19 +208,20 @@ namespace DiscImageChef.Core.Devices.Scanning
} }
end = DateTime.UtcNow; end = DateTime.UtcNow;
DicConsole.WriteLine(); EndProgress?.Invoke();
mhddLog.Close(); mhddLog.Close();
ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024, ibgLog.Close(dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
blockSize * (double)(results.Blocks + 1) / 1024 / blockSize * (double)(results.Blocks + 1) / 1024 /
(results.ProcessingTime / 1000), devicePath); (results.ProcessingTime / 1000), devicePath);
InitProgress?.Invoke();
for(int i = 0; i < SEEK_TIMES; i++) for(int i = 0; i < SEEK_TIMES; i++)
{ {
if(aborted) break; if(aborted) break;
uint seekPos = (uint)rnd.Next((int)results.Blocks); uint seekPos = (uint)rnd.Next((int)results.Blocks);
DicConsole.Write("\rSeeking to sector {0}...\t\t", seekPos); PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
dev.Read(out cmdBuf, out _, seekPos, blockSize, blocksToRead, byteAddressed, TIMEOUT, dev.Read(out cmdBuf, out _, seekPos, blockSize, blocksToRead, byteAddressed, TIMEOUT,
out double seekCur); out double seekCur);
@@ -233,7 +235,7 @@ namespace DiscImageChef.Core.Devices.Scanning
GC.Collect(); GC.Collect();
} }
DicConsole.WriteLine(); EndProgress?.Invoke();
results.ProcessingTime /= 1000; results.ProcessingTime /= 1000;
results.TotalTime = (end - start).TotalSeconds; results.TotalTime = (end - start).TotalSeconds;

1
DiscImageChef.Core/DiscImageChef.Core.csproj
View File

@@ -18,6 +18,7 @@
<Title>DiscImageChef.Core</Title> <Title>DiscImageChef.Core</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks> <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>

7
DiscImageChef/Commands/MediaScan.cs
View File

@@ -112,6 +112,13 @@ namespace DiscImageChef.Commands
Statistics.AddDevice(dev); Statistics.AddDevice(dev);
MediaScan scanner = new MediaScan(mhddLogPath, ibgLogPath, devicePath, dev); MediaScan scanner = new MediaScan(mhddLogPath, ibgLogPath, devicePath, dev);
scanner.UpdateStatus += Progress.UpdateStatus;
scanner.ErrorMessage += Progress.ErrorMessage;
scanner.StoppingErrorMessage += Progress.ErrorMessage;
scanner.UpdateProgress += Progress.UpdateProgress;
scanner.PulseProgress += Progress.PulseProgress;
scanner.InitProgress += Progress.InitProgress;
scanner.EndProgress += Progress.EndProgress;
ScanResults results = scanner.Scan(); ScanResults results = scanner.Scan();
DicConsole.WriteLine("Took a total of {0} seconds ({1} processing commands).", results.TotalTime, DicConsole.WriteLine("Took a total of {0} seconds ({1} processing commands).", results.TotalTime,