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 SCSI reader detection of maximum supporter blocks to read at once when scanning non-CD media. Fixes #516

Browse Source
This commit is contained in:
Natalia Portillo
2021-07-05 01:31:52 +01:00
parent de061cbb1f
commit e702578562
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Aaru.Core/Devices/Scanning/SCSI.cs
View File

@@ -277,8 +277,9 @@ namespace Aaru.Core.Devices.Scanning
else
compactDisc = false;
uint blocksToRead = 64;
scsiReader.GetBlocksToRead();
uint blocksToRead;
results.A = 0; // <3ms
results.B = 0; // >=3ms, <10ms
results.C = 0; // >=10ms, <50ms
@@ -297,6 +298,8 @@ namespace Aaru.Core.Devices.Scanning
if(compactDisc)
{
blocksToRead = 64;
if(toc == null)
{
StoppingErrorMessage?.Invoke("Error trying to decode TOC...");
@@ -478,21 +481,23 @@ namespace Aaru.Core.Devices.Scanning
{
start = DateTime.UtcNow;
UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
UpdateStatus?.Invoke($"Reading {scsiReader.BlocksToRead} sectors at a time.");
InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, currentProfile);
mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
InitBlockMap?.Invoke(results.Blocks, blockSize, scsiReader.BlocksToRead, currentProfile);
mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, scsiReader.BlocksToRead, false);
ibgLog = new IbgLog(_ibgLogPath, currentProfile);
DateTime timeSpeedStart = DateTime.UtcNow;
ulong sectorSpeedStart = 0;
InitProgress?.Invoke();
for(ulong i = 0; i < results.Blocks; i += blocksToRead)
for(ulong i = 0; i < results.Blocks; i += scsiReader.BlocksToRead)
{
if(_aborted)
break;
blocksToRead = scsiReader.BlocksToRead;
if(results.Blocks - i < blocksToRead)
blocksToRead = (uint)(results.Blocks - i);