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

Update media scan GUI block times via events.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-21 01:42:38 +01:00
parent d31bd8117f
commit a800ddb0ab
7 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Core/Delegates.cs
View File

@@ -108,5 +108,5 @@ namespace DiscImageChef.Core
/// </summary> /// </summary>
/// <param name="time">Time in milliseconds</param> /// <param name="time">Time in milliseconds</param>
/// <param name="blocks">Number of blocks scanned</param> /// <param name="blocks">Number of blocks scanned</param>
public delegate void ScanTime(double time, uint blocks); public delegate void ScanTimeHandler(double time, uint blocks);
} }

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

@@ -149,6 +149,7 @@ namespace DiscImageChef.Core.Devices.Scanning
else if(duration >= 3) results.B += blocksToRead; else if(duration >= 3) results.B += blocksToRead;
else results.A += blocksToRead; else results.A += blocksToRead;
ScanTime?.Invoke(duration, blocksToRead);
mhddLog.Write(i, duration); mhddLog.Write(i, duration);
ibgLog.Write(i, currentSpeed * 1024); ibgLog.Write(i, currentSpeed * 1024);
} }
@@ -243,6 +244,7 @@ namespace DiscImageChef.Core.Devices.Scanning
else if(duration >= 3) results.B += blocksToRead; else if(duration >= 3) results.B += blocksToRead;
else results.A += blocksToRead; else results.A += blocksToRead;
ScanTime?.Invoke(duration, blocksToRead);
mhddLog.Write(currentBlock, duration); mhddLog.Write(currentBlock, duration);
ibgLog.Write(currentBlock, currentSpeed * 1024); ibgLog.Write(currentBlock, currentSpeed * 1024);
} }

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

@@ -57,10 +57,6 @@ namespace DiscImageChef.Core.Devices.Scanning
/// </summary> /// </summary>
public event UpdateStatusHandler UpdateStatus; public event UpdateStatusHandler UpdateStatus;
/// <summary> /// <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 /// Event raised to report a fatal error that stops the dumping operation and should call user's attention
/// </summary> /// </summary>
public event ErrorMessageHandler StoppingErrorMessage; public event ErrorMessageHandler StoppingErrorMessage;
@@ -72,5 +68,6 @@ namespace DiscImageChef.Core.Devices.Scanning
/// Event raised to update the status of an undeterminate progress bar /// Event raised to update the status of an undeterminate progress bar
/// </summary> /// </summary>
public event PulseProgressHandler PulseProgress; public event PulseProgressHandler PulseProgress;
public event ScanTimeHandler ScanTime;
} }
} }

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

@@ -317,6 +317,7 @@ namespace DiscImageChef.Core.Devices.Scanning
else if(cmdDuration >= 3) results.B += blocksToRead; else if(cmdDuration >= 3) results.B += blocksToRead;
else results.A += blocksToRead; else results.A += blocksToRead;
ScanTime?.Invoke(cmdDuration, blocksToRead);
mhddLog.Write(i, cmdDuration); mhddLog.Write(i, cmdDuration);
ibgLog.Write(i, currentSpeed * 1024); ibgLog.Write(i, currentSpeed * 1024);
} }
@@ -409,6 +410,7 @@ namespace DiscImageChef.Core.Devices.Scanning
else if(cmdDuration >= 3) results.B += blocksToRead; else if(cmdDuration >= 3) results.B += blocksToRead;
else results.A += blocksToRead; else results.A += blocksToRead;
ScanTime?.Invoke(cmdDuration, blocksToRead);
mhddLog.Write(i, cmdDuration); mhddLog.Write(i, cmdDuration);
ibgLog.Write(i, currentSpeed * 1024); ibgLog.Write(i, currentSpeed * 1024);
} }

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

@@ -180,6 +180,7 @@ namespace DiscImageChef.Core.Devices.Scanning
else if(duration >= 3) results.B += blocksToRead; else if(duration >= 3) results.B += blocksToRead;
else results.A += blocksToRead; else results.A += blocksToRead;
ScanTime?.Invoke(duration, blocksToRead);
mhddLog.Write(i, duration); mhddLog.Write(i, duration);
ibgLog.Write(i, currentSpeed * 1024); ibgLog.Write(i, currentSpeed * 1024);
} }

23
DiscImageChef.Gui/Forms/frmMediaScan.xeto.cs
View File

@@ -47,6 +47,8 @@ namespace DiscImageChef.Gui.Forms
{ {
string devicePath; string devicePath;
ScanResults localResults;
MediaScan scanner; MediaScan scanner;
public frmMediaScan(string devicePath, DeviceInfo deviceInfo, ScsiInfo scsiInfo = null) public frmMediaScan(string devicePath, DeviceInfo deviceInfo, ScsiInfo scsiInfo = null)
@@ -96,7 +98,9 @@ namespace DiscImageChef.Gui.Forms
Statistics.AddDevice(dev); Statistics.AddDevice(dev);
localResults = new ScanResults();
scanner = new MediaScan(null, null, devicePath, dev); scanner = new MediaScan(null, null, devicePath, dev);
scanner.ScanTime += OnScanTime;
ScanResults results = scanner.Scan(); ScanResults results = scanner.Scan();
Application.Instance.Invoke(() => Application.Instance.Invoke(() =>
@@ -143,6 +147,25 @@ namespace DiscImageChef.Gui.Forms
}); });
} }
void OnScanTime(double time, uint blocks)
{
Application.Instance.Invoke(() =>
{
if(time < 3) localResults.A += blocks;
else if(time >= 3 && time < 10) localResults.B += blocks;
else if(time >= 10 && time < 50) localResults.C += blocks;
else if(time >= 50 && time < 150) localResults.D += blocks;
else if(time >= 150 && time < 500) localResults.E += blocks;
else if(time >= 500) localResults.F += blocks;
lblA.Text = $"{localResults.A} sectors took less than 3 ms.";
lblB.Text = $"{localResults.B} sectors took less than 10 ms but more than 3 ms.";
lblC.Text = $"{localResults.C} sectors took less than 50 ms but more than 10 ms.";
lblD.Text = $"{localResults.D} sectors took less than 150 ms but more than 50 ms.";
lblE.Text = $"{localResults.E} sectors took less than 500 ms but more than 150 ms.";
lblF.Text = $"{localResults.F} sectors took more than 500 ms.";
});
}
#region XAML IDs #region XAML IDs
Label lblTotalTime; Label lblTotalTime;
Label lblAvgSpeed; Label lblAvgSpeed;

1
DiscImageChef/Commands/MediaScan.cs
View File

@@ -113,7 +113,6 @@ namespace DiscImageChef.Commands
MediaScan scanner = new MediaScan(mhddLogPath, ibgLogPath, devicePath, dev); MediaScan scanner = new MediaScan(mhddLogPath, ibgLogPath, devicePath, dev);
scanner.UpdateStatus += Progress.UpdateStatus; scanner.UpdateStatus += Progress.UpdateStatus;
scanner.ErrorMessage += Progress.ErrorMessage;
scanner.StoppingErrorMessage += Progress.ErrorMessage; scanner.StoppingErrorMessage += Progress.ErrorMessage;
scanner.UpdateProgress += Progress.UpdateProgress; scanner.UpdateProgress += Progress.UpdateProgress;
scanner.PulseProgress += Progress.PulseProgress; scanner.PulseProgress += Progress.PulseProgress;