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

[Refactor] Invert if to reduce nesting.

Browse Source
This commit is contained in:
Natalia Portillo
2025-11-24 19:19:14 +00:00
parent dea49e235d
commit 7b487033b5
16 changed files with 126 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Aaru.Core/Devices/Scanning/ATA.cs
View File

@@ -206,13 +206,12 @@ public sealed partial class MediaScan
ibgLog.Write(i, 0);
}
if(accumulatedSpeedMs >= 100)
{
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(i, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
if(accumulatedSpeedMs < 100) continue;
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(i, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
_speedStopwatch.Stop();
@@ -341,16 +340,13 @@ public sealed partial class MediaScan
ibgLog.Write(currentBlock, 0);
}
if(accumulatedSpeedMs >= 100)
{
currentSpeed = accumulatedSpeedSectors *
blockSize /
(1048576 * (accumulatedSpeedMs / 1000.0));
if(accumulatedSpeedMs < 100) continue;
ScanSpeed?.Invoke(currentBlock, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(currentBlock, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
}
}

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

@@ -508,13 +508,12 @@ public sealed partial class MediaScan
}
}
if(accumulatedSpeedMs >= 100)
{
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(i, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
if(accumulatedSpeedMs < 100) continue;
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(i, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
_scanStopwatch.Stop();
@@ -624,13 +623,11 @@ public sealed partial class MediaScan
ibgLog.Write(i, 0);
}
if(accumulatedSpeedMs >= 100)
{
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(i, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
if(accumulatedSpeedMs < 100) continue;
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(i, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
_scanStopwatch.Stop();

13
Aaru.Core/Devices/Scanning/SecureDigital.cs
View File

@@ -343,13 +343,12 @@ public sealed partial class MediaScan
ibgLog.Write(i, 0);
}
if(accumulatedSpeedMs >= 100)
{
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(i, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
if(accumulatedSpeedMs < 100) continue;
currentSpeed = accumulatedSpeedSectors * blockSize / (1048576 * (accumulatedSpeedMs / 1000.0));
ScanSpeed?.Invoke(i, currentSpeed * 1024);
accumulatedSpeedMs = 0;
accumulatedSpeedSectors = 0;
}
_scanStopwatch.Stop();