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

4
Aaru.Tests.Devices/DecodeATARegisters.cs
View File

@@ -121,7 +121,9 @@ static partial class MainClass
sb.AppendFormat(Localization.Device_0, registers.DeviceHead >> 4 & 0x01).AppendLine();
sb.AppendFormat(Localization.LBA_0,
((registers.DeviceHead & 0xF) << 24) + (registers.LbaHigh << 16) + (registers.LbaMid << 8) +
((registers.DeviceHead & 0xF) << 24) +
(registers.LbaHigh << 16) +
(registers.LbaMid << 8) +
registers.LbaLow);
sb.AppendFormat(Localization.Count_0, registers.SectorCount).AppendLine();

3
Aaru.Tests.Devices/Main.cs
View File

@@ -44,8 +44,7 @@ static partial class MainClass
DeviceInfo[] devices = Aaru.Devices.Device.ListDevices();
if(devices == null ||
devices.Length == 0)
if(devices == null || devices.Length == 0)
{
AaruConsole.WriteLine(Localization.No_known_devices_attached);

35
Aaru.Tests.Devices/SCSI/SSC.cs
View File

@@ -781,11 +781,8 @@ static class Ssc
if(length > 0xFFFFFF)
{
AaruConsole.
WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
length = 0xFFFFFF;
}
@@ -999,11 +996,8 @@ static class Ssc
if(length > 0xFFFFFF)
{
AaruConsole.
WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
length = 0xFFFFFF;
}
@@ -1484,11 +1478,8 @@ static class Ssc
if(length > 0xFFFFFF)
{
AaruConsole.
WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
length = 0xFFFFFF;
}
@@ -1716,11 +1707,8 @@ static class Ssc
if(length > 0xFFFFFF)
{
AaruConsole.
WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
length = 0xFFFFFF;
}
@@ -1967,11 +1955,8 @@ static class Ssc
if(length > 0xFFFFFF)
{
AaruConsole.
WriteLine(
fixedLen
? Localization.Max_number_of_blocks_is_0_setting_to_0
: Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
WriteLine(fixedLen ? Localization.Max_number_of_blocks_is_0_setting_to_0 : Localization.Max_number_of_bytes_is_0_setting_to_0,
0xFFFFFF);
length = 0xFFFFFF;
}

109
Aaru.Tests.Devices/SCSI_MMC/GdRom.cs
View File

@@ -194,8 +194,7 @@ static partial class ScsiMmc
return;
}
if(newLeadOutTrack.PMIN >= 0xA0 &&
!tocIsNotBcd)
if(newLeadOutTrack.PMIN >= 0xA0 && !tocIsNotBcd)
newLeadOutTrack.PMIN -= 0x90;
if(newLeadOutTrack.PMIN != leadOutTrack.PMIN ||
@@ -286,97 +285,125 @@ static partial class ScsiMmc
AaruConsole.WriteLine(Localization.LBA_zero_sense_is_0_buffer_is_1_sense_buffer_is_2, lba0Result,
lba0Buffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba0Buffer)
? Localization.empty
: string.Format(Localization._0_bytes, lba0Buffer.Length), lba0Sense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba0Sense)
? Localization.empty
: $"{lba0Sense.Length}");
:
ArrayHelpers.ArrayIsNullOrEmpty(lba0Buffer)
?
Localization.empty
: string.Format(Localization._0_bytes, lba0Buffer.Length),
lba0Sense is null ? Localization._null :
ArrayHelpers.ArrayIsNullOrEmpty(lba0Sense) ? Localization.empty : $"{lba0Sense.Length}");
AaruConsole.WriteLine(Localization.LBA_zero_scrambled_sense_is_0_buffer_is_1_sense_buffer_is_2_,
lba0ScrambledResult, lba0ScrambledBuffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba0ScrambledBuffer)
? Localization.empty
: string.Format(Localization._0_bytes,
lba0ScrambledBuffer.Length),
lba0ScrambledResult,
lba0ScrambledBuffer is null
? Localization._null
:
ArrayHelpers.ArrayIsNullOrEmpty(lba0ScrambledBuffer)
?
Localization.empty
: string.Format(Localization._0_bytes, lba0ScrambledBuffer.Length),
lba0ScrambledSense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba0ScrambledSense)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba0ScrambledSense)
?
Localization.empty
: $"{lba0ScrambledSense.Length}");
AaruConsole.WriteLine(Localization.LBA_44990_sense_is_0_buffer_is_1_sense_buffer_is_2, lba44990Result,
lba44990Buffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba44990Buffer)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba44990Buffer)
?
Localization.empty
: string.Format(Localization._0_bytes, lba44990Buffer.Length),
lba44990Sense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba44990Sense)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba44990Sense)
?
Localization.empty
: $"{lba44990Sense.Length}");
AaruConsole.WriteLine(Localization.LBA_45000_sense_is_0_buffer_is_1_sense_buffer_is_2, lba45000Result,
lba45000Buffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba45000Buffer)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba45000Buffer)
?
Localization.empty
: string.Format(Localization._0_bytes, lba45000Buffer.Length),
lba45000Sense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba45000Sense)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba45000Sense)
?
Localization.empty
: $"{lba45000Sense.Length}");
AaruConsole.WriteLine(Localization.LBA_50000_sense_is_0_buffer_is_1_sense_buffer_is_2, lba50000Result,
lba50000Buffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba50000Buffer)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba50000Buffer)
?
Localization.empty
: string.Format(Localization._0_bytes, lba50000Buffer.Length),
lba50000Sense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba50000Sense)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba50000Sense)
?
Localization.empty
: $"{lba50000Sense.Length}");
AaruConsole.WriteLine(Localization.LBA_100000_sense_is_0_buffer_is_1_sense_buffer_is_2, lba100000Result,
lba100000Buffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba100000Buffer)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba100000Buffer)
?
Localization.empty
: string.Format(Localization._0_bytes, lba100000Buffer.Length),
lba100000Sense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba100000Sense)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba100000Sense)
?
Localization.empty
: $"{lba100000Sense.Length}");
AaruConsole.WriteLine(Localization.LBA_400000_sense_is_0_buffer_is_1_sense_buffer_is_2, lba400000Result,
lba400000Buffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba400000Buffer)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba400000Buffer)
?
Localization.empty
: string.Format(Localization._0_bytes, lba400000Buffer.Length),
lba400000Sense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba400000Sense)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba400000Sense)
?
Localization.empty
: $"{lba400000Sense.Length}");
AaruConsole.WriteLine(Localization.LBA_450000_sense_is_0_buffer_is_1_sense_buffer_is_2, lba450000Result,
lba450000Buffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba450000Buffer)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba450000Buffer)
?
Localization.empty
: string.Format(Localization._0_bytes, lba450000Buffer.Length),
lba450000Sense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(lba450000Sense)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(lba450000Sense)
?
Localization.empty
: $"{lba450000Sense.Length}");
AaruConsole.WriteLine();

64
Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs
View File

@@ -270,8 +270,7 @@ static partial class ScsiMmc
return;
}
if(newLeadOutTrack.PMIN >= 0xA0 &&
!tocIsNotBcd)
if(newLeadOutTrack.PMIN >= 0xA0 && !tocIsNotBcd)
newLeadOutTrack.PMIN -= 0x90;
if(newLeadOutTrack.PMIN != leadOutTrack.PMIN ||
@@ -342,47 +341,52 @@ static partial class ScsiMmc
AaruConsole.WriteLine(Localization.LBA_0_sense_is_1_buffer_is_2_sense_buffer_is_3, sectors + 5, dataResult,
dataBuffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(dataBuffer)
? Localization.empty
: string.Format(Localization._0_bytes, dataBuffer.Length), dataSense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(dataSense)
? Localization.empty
: $"{dataSense.Length}");
:
ArrayHelpers.ArrayIsNullOrEmpty(dataBuffer)
?
Localization.empty
: string.Format(Localization._0_bytes, dataBuffer.Length),
dataSense is null ? Localization._null :
ArrayHelpers.ArrayIsNullOrEmpty(dataSense) ? Localization.empty : $"{dataSense.Length}");
AaruConsole.WriteLine(Localization.LBA_0_scrambled_sense_is_1_buffer_is_2_sense_buffer_is_3, sectors + 5,
scrambledResult, scrambledBuffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(scrambledBuffer)
? Localization.empty
: string.Format(Localization._0_bytes, scrambledBuffer.Length),
scrambledResult,
scrambledBuffer is null
? Localization._null
:
ArrayHelpers.ArrayIsNullOrEmpty(scrambledBuffer)
?
Localization.empty
: string.Format(Localization._0_bytes, scrambledBuffer.Length),
scrambledSense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(scrambledSense)
? Localization.empty
:
ArrayHelpers.ArrayIsNullOrEmpty(scrambledSense)
?
Localization.empty
: $"{scrambledSense.Length}");
AaruConsole.WriteLine(Localization.LBA_0_PQ_sense_is_1_buffer_is_2_sense_buffer_is_3, sectors + 5, pqResult,
pqBuffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(pqBuffer)
? Localization.empty
: string.Format(Localization._0_bytes, pqBuffer.Length), pqSense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(pqSense)
? Localization.empty
: $"{pqSense.Length}");
:
ArrayHelpers.ArrayIsNullOrEmpty(pqBuffer)
?
Localization.empty
: string.Format(Localization._0_bytes, pqBuffer.Length),
pqSense is null ? Localization._null :
ArrayHelpers.ArrayIsNullOrEmpty(pqSense) ? Localization.empty : $"{pqSense.Length}");
AaruConsole.WriteLine(Localization.LBA_0_RW_sense_is_1_buffer_is_2_sense_buffer_is_3, sectors + 5, rwResult,
rwBuffer is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(rwBuffer)
? Localization.empty
: string.Format(Localization._0_bytes, rwBuffer.Length), rwSense is null
? Localization._null
: ArrayHelpers.ArrayIsNullOrEmpty(rwSense)
? Localization.empty
: $"{rwSense.Length}");
:
ArrayHelpers.ArrayIsNullOrEmpty(rwBuffer)
?
Localization.empty
: string.Format(Localization._0_bytes, rwBuffer.Length),
rwSense is null ? Localization._null :
ArrayHelpers.ArrayIsNullOrEmpty(rwSense) ? Localization.empty : $"{rwSense.Length}");
AaruConsole.WriteLine();
AaruConsole.WriteLine(Localization.Choose_what_to_do);