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

Redo Reformat and cleanup.

Browse Source 
Rider EAP was having a bug interpreting .editorconfig that didn't generate the code style as we wanted.
This is now done with Rider-stable.
This commit is contained in:
Natalia Portillo
2023-10-04 17:34:40 +01:00
parent bc8bf7a2dc
commit 7363a5d9c5
453 changed files with 7241 additions and 7126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,8 +56,7 @@ public sealed partial class MediaScan
bool sense = _dev.AtaIdentify(out byte[] cmdBuf, out _);
if(!sense &&
Identify.Decode(cmdBuf).HasValue)
if(!sense && Identify.Decode(cmdBuf).HasValue)
{
// Initialize reader
var ataReader = new Reader(_dev, timeout, cmdBuf, null);
@@ -141,19 +140,15 @@ public sealed partial class MediaScan
if(results.Blocks - i < blocksToRead)
blocksToRead = (byte)(results.Blocks - i);
if(currentSpeed > results.MaxSpeed &&
currentSpeed > 0)
if(currentSpeed > results.MaxSpeed && currentSpeed > 0)
results.MaxSpeed = currentSpeed;
if(currentSpeed < results.MinSpeed &&
currentSpeed > 0)
if(currentSpeed < results.MinSpeed && currentSpeed > 0)
results.MinSpeed = currentSpeed;
UpdateProgress?.
Invoke(
string.Format(Localization.Core.Reading_sector_0_of_1_2, i, results.Blocks,
ByteSize.FromMegabytes(currentSpeed).Per(_oneSecond).Humanize()),
(long)i, (long)results.Blocks);
Invoke(string.Format(Localization.Core.Reading_sector_0_of_1_2, i, results.Blocks, ByteSize.FromMegabytes(currentSpeed).Per(_oneSecond).Humanize()),
(long)i, (long)results.Blocks);
bool error = ataReader.ReadBlocks(out cmdBuf, i, blocksToRead, out duration, out _, out _);
@@ -241,12 +236,10 @@ public sealed partial class MediaScan
ataReader.Seek(seekPos, out seekCur);
if(seekCur > results.SeekMax &&
seekCur > 0)
if(seekCur > results.SeekMax && seekCur > 0)
results.SeekMax = seekCur;
if(seekCur < results.SeekMin &&
seekCur > 0)
if(seekCur < results.SeekMin && seekCur > 0)
results.SeekMin = seekCur;
results.SeekTotal += seekCur;
@@ -278,17 +271,16 @@ public sealed partial class MediaScan
if(_aborted)
break;
if(currentSpeed > results.MaxSpeed &&
currentSpeed > 0)
if(currentSpeed > results.MaxSpeed && currentSpeed > 0)
results.MaxSpeed = currentSpeed;
if(currentSpeed < results.MinSpeed &&
currentSpeed > 0)
if(currentSpeed < results.MinSpeed && currentSpeed > 0)
results.MinSpeed = currentSpeed;
PulseProgress?.Invoke(string.Format(Localization.Core.Reading_cylinder_0_head_1_sector_2_3,
cy, hd, sc,
ByteSize.FromMegabytes(currentSpeed).Per(_oneSecond).
ByteSize.FromMegabytes(currentSpeed).
Per(_oneSecond).
Humanize()));
bool error = ataReader.ReadChs(out cmdBuf, cy, hd, sc, out duration, out _);
@@ -380,12 +372,10 @@ public sealed partial class MediaScan
ataReader.SeekChs(seekCy, seekHd, seekSc, out seekCur);
if(seekCur > results.SeekMax &&
seekCur > 0)
if(seekCur > results.SeekMax && seekCur > 0)
results.SeekMax = seekCur;
if(seekCur < results.SeekMin &&
seekCur > 0)
if(seekCur < results.SeekMin && seekCur > 0)
results.SeekMin = seekCur;
results.SeekTotal += seekCur;

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

@@ -188,8 +188,7 @@ public sealed partial class MediaScan
results.Blocks = scsiReader.GetDeviceBlocks();
foundReadCommand = !scsiReader.FindReadCommand();
if(!foundReadCommand &&
_dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
if(!foundReadCommand && _dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
{
StoppingErrorMessage?.Invoke(Localization.Core.Unable_to_read_medium);
@@ -198,8 +197,7 @@ public sealed partial class MediaScan
blockSize = scsiReader.LogicalBlockSize;
if(results.Blocks != 0 &&
blockSize != 0)
if(results.Blocks != 0 && blockSize != 0)
{
results.Blocks++;
@@ -323,8 +321,7 @@ public sealed partial class MediaScan
if(_dev.Error || sense)
blocksToRead /= 2;
if(!_dev.Error ||
blocksToRead == 1)
if(!_dev.Error || blocksToRead == 1)
break;
}
}
@@ -358,19 +355,15 @@ public sealed partial class MediaScan
if(results.Blocks - i < blocksToRead)
blocksToRead = (uint)(results.Blocks - i);
if(currentSpeed > results.MaxSpeed &&
currentSpeed > 0)
if(currentSpeed > results.MaxSpeed && currentSpeed > 0)
results.MaxSpeed = currentSpeed;
if(currentSpeed < results.MinSpeed &&
currentSpeed > 0)
if(currentSpeed < results.MinSpeed && currentSpeed > 0)
results.MinSpeed = currentSpeed;
UpdateProgress?.
Invoke(
string.Format(Localization.Core.Reading_sector_0_of_1_2, i, results.Blocks,
ByteSize.FromMegabytes(currentSpeed).Per(_oneSecond).Humanize()),
(long)i, (long)results.Blocks);
Invoke(string.Format(Localization.Core.Reading_sector_0_of_1_2, i, results.Blocks, ByteSize.FromMegabytes(currentSpeed).Per(_oneSecond).Humanize()),
(long)i, (long)results.Blocks);
if(readcd)
{
@@ -522,25 +515,20 @@ public sealed partial class MediaScan
if(results.Blocks - i < blocksToRead)
blocksToRead = (uint)(results.Blocks - i);
if(currentSpeed > results.MaxSpeed &&
currentSpeed > 0)
if(currentSpeed > results.MaxSpeed && currentSpeed > 0)
results.MaxSpeed = currentSpeed;
if(currentSpeed < results.MinSpeed &&
currentSpeed > 0)
if(currentSpeed < results.MinSpeed && currentSpeed > 0)
results.MinSpeed = currentSpeed;
UpdateProgress?.
Invoke(
string.Format(Localization.Core.Reading_sector_0_of_1_2, i, results.Blocks,
ByteSize.FromMegabytes(currentSpeed).Per(_oneSecond).Humanize()),
(long)i, (long)results.Blocks);
Invoke(string.Format(Localization.Core.Reading_sector_0_of_1_2, i, results.Blocks, ByteSize.FromMegabytes(currentSpeed).Per(_oneSecond).Humanize()),
(long)i, (long)results.Blocks);
sense = scsiReader.ReadBlocks(out _, i, blocksToRead, out double cmdDuration, out _, out _);
results.ProcessingTime += cmdDuration;
if(!sense &&
!_dev.Error)
if(!sense && !_dev.Error)
{
switch(cmdDuration)
{
@@ -642,12 +630,10 @@ public sealed partial class MediaScan
else
scsiReader.ReadBlock(out _, seekPos, out seekCur, out _, out _);
if(seekCur > results.SeekMax &&
seekCur > 0)
if(seekCur > results.SeekMax && seekCur > 0)
results.SeekMax = seekCur;
if(seekCur < results.SeekMin &&
seekCur > 0)
if(seekCur < results.SeekMin && seekCur > 0)
results.SeekMin = seekCur;
results.SeekTotal += seekCur;

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

@@ -128,8 +128,9 @@ public sealed partial class MediaScan
if(!sense)
{
supportsCmd23 = Decoders.SecureDigital.Decoders.DecodeSCR(cmdBuf)?.CommandSupport.
HasFlag(CommandSupport.SetBlockCount) ?? false;
supportsCmd23 = Decoders.SecureDigital.Decoders.DecodeSCR(cmdBuf)?.
CommandSupport.HasFlag(CommandSupport.SetBlockCount) ??
false;
}
}
@@ -177,8 +178,7 @@ public sealed partial class MediaScan
if(sense)
blocksToRead /= 2;
if(!sense ||
blocksToRead == 1)
if(!sense || blocksToRead == 1)
break;
}
@@ -241,19 +241,15 @@ public sealed partial class MediaScan
if(results.Blocks - i < blocksToRead)
blocksToRead = (byte)(results.Blocks - i);
if(currentSpeed > results.MaxSpeed &&
currentSpeed > 0)
if(currentSpeed > results.MaxSpeed && currentSpeed > 0)
results.MaxSpeed = currentSpeed;
if(currentSpeed < results.MinSpeed &&
currentSpeed > 0)
if(currentSpeed < results.MinSpeed && currentSpeed > 0)
results.MinSpeed = currentSpeed;
UpdateProgress?.
Invoke(
string.Format(Localization.Core.Reading_sector_0_of_1_2, i, results.Blocks,
ByteSize.FromBytes(currentSpeed).Per(_oneSecond).Humanize()),
(long)i, (long)results.Blocks);
Invoke(string.Format(Localization.Core.Reading_sector_0_of_1_2, i, results.Blocks, ByteSize.FromBytes(currentSpeed).Per(_oneSecond).Humanize()),
(long)i, (long)results.Blocks);
bool error;
@@ -356,12 +352,10 @@ public sealed partial class MediaScan
_dev.ReadSingleBlock(out cmdBuf, out _, seekPos, blockSize, byteAddressed, timeout, out double seekCur);
if(seekCur > results.SeekMax &&
seekCur > 0)
if(seekCur > results.SeekMax && seekCur > 0)
results.SeekMax = seekCur;
if(seekCur < results.SeekMin &&
seekCur > 0)
if(seekCur < results.SeekMin && seekCur > 0)
results.SeekMin = seekCur;
results.SeekTotal += seekCur;