diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index 5ff711dfc..106a911f1 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit 5ff711dfc02ed1281a481aa456565e67a5bedb74 +Subproject commit 106a911f1c14baa9b6a071b696742b63fbc1ce6a diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs index c3f322014..11905248e 100644 --- a/Aaru.Core/Sidecar/BlockMedia.cs +++ b/Aaru.Core/Sidecar/BlockMedia.cs @@ -1158,11 +1158,11 @@ public sealed partial class Sidecar } else AaruConsole. - ErrorWriteLine("KryoFlux image do not contain same number of tracks ({0}) than disk image ({1}), ignoring...", + ErrorWriteLine("KryoFlux image does not contain same number of tracks ({0}) than disk image ({1}), ignoring...", kfImage.Info.Cylinders, image.Info.Cylinders); else AaruConsole. - ErrorWriteLine("KryoFluximage do not contain same number of heads ({0}) than disk image ({1}), ignoring...", + ErrorWriteLine("KryoFlux image does not contain same number of heads ({0}) than disk image ({1}), ignoring...", kfImage.Info.Heads, image.Info.Heads); } } diff --git a/Aaru.Decoders b/Aaru.Decoders index 22dedb27b..d7577c988 160000 --- a/Aaru.Decoders +++ b/Aaru.Decoders @@ -1 +1 @@ -Subproject commit 22dedb27bcaad8844fd9614898be3d90447acfb6 +Subproject commit d7577c98802c23a66a346a5b1ec05f9569bbd26a diff --git a/Aaru.Filesystems/BTRFS.cs b/Aaru.Filesystems/BTRFS.cs index b4180ea1a..fc19fcf37 100644 --- a/Aaru.Filesystems/BTRFS.cs +++ b/Aaru.Filesystems/BTRFS.cs @@ -168,7 +168,7 @@ public sealed class BTRFS : IFilesystem AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.seek_speed = {0}", btrfsSb.dev_item.seek_speed); - AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bandwitdh = {0}", btrfsSb.dev_item.bandwitdh); + AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bandwidth = {0}", btrfsSb.dev_item.bandwidth); AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.device_uuid = {0}", btrfsSb.dev_item.device_uuid); @@ -269,7 +269,7 @@ public sealed class BTRFS : IFilesystem public readonly ulong start_offset; public readonly uint dev_group; public readonly byte seek_speed; - public readonly byte bandwitdh; + public readonly byte bandwidth; public readonly Guid device_uuid; public readonly Guid uuid; } diff --git a/Aaru.Filesystems/ISO9660/Info.cs b/Aaru.Filesystems/ISO9660/Info.cs index b8ab5a79a..512939782 100644 --- a/Aaru.Filesystems/ISO9660/Info.cs +++ b/Aaru.Filesystems/ISO9660/Info.cs @@ -582,7 +582,7 @@ public sealed partial class ISO9660 isoMetadata.AppendLine("zisofs compression present."); if(evd) - isoMetadata.AppendLine("Contains Enhanved Volume Descriptor."); + isoMetadata.AppendLine("Contains Enhanced Volume Descriptor."); if(vpd) isoMetadata.AppendLine("Contains Volume Partition Descriptor."); diff --git a/Aaru.Filesystems/JFS.cs b/Aaru.Filesystems/JFS.cs index 5a2af388d..5cb8accba 100644 --- a/Aaru.Filesystems/JFS.cs +++ b/Aaru.Filesystems/JFS.cs @@ -163,7 +163,7 @@ public sealed class JFS : IFilesystem sb.AppendLine("Volume is in a big-endian system"); if(jfsSb.s_flags.HasFlag(Flags.DirIndex)) - sb.AppendLine("Volume has presistent indexes"); + sb.AppendLine("Volume has persistent indexes"); if(jfsSb.s_flags.HasFlag(Flags.Linux)) sb.AppendLine("Volume supports Linux"); diff --git a/Aaru.Filesystems/Nintendo.cs b/Aaru.Filesystems/Nintendo.cs index 3101f3134..b70711aa3 100644 --- a/Aaru.Filesystems/Nintendo.cs +++ b/Aaru.Filesystems/Nintendo.cs @@ -33,6 +33,7 @@ namespace Aaru.Filesystems; using System; +using System.Diagnostics.CodeAnalysis; using System.Text; using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; @@ -392,6 +393,7 @@ public sealed class NintendoPlugin : IFilesystem return $"unknown code '{regionCode}'"; } + [SuppressMessage("ReSharper", "StringLiteralTypo")] static string PublisherCodeToString(string publisherCode) { switch(publisherCode) diff --git a/Aaru.Filesystems/ODS.cs b/Aaru.Filesystems/ODS.cs index d51399d8d..755f0445d 100644 --- a/Aaru.Filesystems/ODS.cs +++ b/Aaru.Filesystems/ODS.cs @@ -215,7 +215,7 @@ public sealed class ODS : IFilesystem sb.AppendFormat("Checksums: 0x{0:X4} and 0x{1:X4}", homeblock.checksum1, homeblock.checksum2).AppendLine(); sb.AppendLine("Flags:"); sb.AppendFormat("Window: {0}", homeblock.window).AppendLine(); - sb.AppendFormat("Cached directores: {0}", homeblock.lru_lim).AppendLine(); + sb.AppendFormat("Cached directories: {0}", homeblock.lru_lim).AppendLine(); sb.AppendFormat("Default allocation: {0} blocks", homeblock.extend).AppendLine(); if((homeblock.volchar & 0x01) == 0x01) diff --git a/Aaru.Partitions/MBR.cs b/Aaru.Partitions/MBR.cs index 525425e31..ba6296e64 100644 --- a/Aaru.Partitions/MBR.cs +++ b/Aaru.Partitions/MBR.cs @@ -54,6 +54,7 @@ public sealed class MBR : IPartition const ushort NEC_MAGIC = 0xA55A; const ushort DM_MAGIC = 0x55AA; + [SuppressMessage("ReSharper", "StringLiteralTypo")] static readonly string[] _mbrTypes = { // 0x00 diff --git a/Aaru.Tests.Devices/ATA/Ata48.cs b/Aaru.Tests.Devices/ATA/Ata48.cs index 18f9166d4..e25220e39 100644 --- a/Aaru.Tests.Devices/ATA/Ata48.cs +++ b/Aaru.Tests.Devices/ATA/Ata48.cs @@ -47,7 +47,7 @@ static class Ata48 AaruConsole.WriteLine("2.- Send READ DMA EXT command."); AaruConsole.WriteLine("3.- Send READ LOG DMA EXT command."); AaruConsole.WriteLine("4.- Send READ LOG EXT command."); - AaruConsole.WriteLine("5.- Send READ MATIVE MAX ADDRESS EXT command."); + AaruConsole.WriteLine("5.- Send READ NATIVE MAX ADDRESS EXT command."); AaruConsole.WriteLine("6.- Send READ MULTIPLE EXT command."); AaruConsole.WriteLine("7.- Send READ SECTORS EXT command."); AaruConsole.WriteLine("0.- Return to ATA commands menu."); diff --git a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs index 0d23a77e8..8cb352464 100644 --- a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs +++ b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs @@ -120,7 +120,7 @@ static class HlDtSt if(!uint.TryParse(strDev, out count)) { - AaruConsole.WriteLine("Not a numbr. Press any key to continue..."); + AaruConsole.WriteLine("Not a number. Press any key to continue..."); count = 1; Console.ReadKey(); diff --git a/Aaru.Tests.Devices/SCSI/Plasmon.cs b/Aaru.Tests.Devices/SCSI/Plasmon.cs index 247e09285..7fa2b6253 100644 --- a/Aaru.Tests.Devices/SCSI/Plasmon.cs +++ b/Aaru.Tests.Devices/SCSI/Plasmon.cs @@ -158,7 +158,7 @@ static class Plasmon if(!uint.TryParse(strDev, out address)) { - AaruConsole.WriteLine("Not a numbr. Press any key to continue..."); + AaruConsole.WriteLine("Not a number. Press any key to continue..."); address = 0; Console.ReadKey(); @@ -196,7 +196,7 @@ static class Plasmon if(!ushort.TryParse(strDev, out bps)) { - AaruConsole.WriteLine("Not a numbr. Press any key to continue..."); + AaruConsole.WriteLine("Not a number. Press any key to continue..."); bps = 512; Console.ReadKey(); } @@ -354,7 +354,7 @@ static class Plasmon if(!uint.TryParse(strDev, out address)) { - AaruConsole.WriteLine("Not a numbr. Press any key to continue..."); + AaruConsole.WriteLine("Not a number. Press any key to continue..."); address = 0; Console.ReadKey(); } diff --git a/Aaru.Tests.Devices/SCSI/Plextor.cs b/Aaru.Tests.Devices/SCSI/Plextor.cs index 23756997b..ca62ba1b4 100644 --- a/Aaru.Tests.Devices/SCSI/Plextor.cs +++ b/Aaru.Tests.Devices/SCSI/Plextor.cs @@ -1292,7 +1292,7 @@ static class Plextor if(!uint.TryParse(strDev, out count)) { - AaruConsole.WriteLine("Not a numbr. Press any key to continue..."); + AaruConsole.WriteLine("Not a number. Press any key to continue..."); count = 1; Console.ReadKey(); diff --git a/Aaru.Tests/Filesystems/HTFS/MBR.cs b/Aaru.Tests/Filesystems/HTFS/MBR.cs index 2ef1cdbde..c911231f0 100644 --- a/Aaru.Tests/Filesystems/HTFS/MBR.cs +++ b/Aaru.Tests/Filesystems/HTFS/MBR.cs @@ -40,7 +40,7 @@ public class MBR : FilesystemTest public MBR() : base("HTFS") {} public override string DataFolder => - Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Throughtput File System (MBR)"); + Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Throughput File System (MBR)"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => true; diff --git a/Aaru.Tests/Filesystems/HTFS/Whole.cs b/Aaru.Tests/Filesystems/HTFS/Whole.cs index 93787cd55..631d5497f 100644 --- a/Aaru.Tests/Filesystems/HTFS/Whole.cs +++ b/Aaru.Tests/Filesystems/HTFS/Whole.cs @@ -40,7 +40,7 @@ public class Whole : FilesystemTest public Whole() : base("HTFS") {} public override string DataFolder => - Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Throughtput File System"); + Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Throughput File System"); public override IFilesystem Plugin => new SysVfs(); public override bool Partitions => false; diff --git a/Aaru.sln.DotSettings b/Aaru.sln.DotSettings index 14009f468..2014fa432 100644 --- a/Aaru.sln.DotSettings +++ b/Aaru.sln.DotSettings @@ -572,92 +572,219 @@ /opt/dotnet/sdk/3.0.100/MSBuild.dll 1048576 True + True True True + True + True True + True + True True + True + True True + True + True True True True + True + True + True True + True + True True True + True + True True True + True + True + True True True True + True + True True + True True True True True True + True True + True True + True + True True + True + True + True True True True + True True True + True + True + True True True True True + True + True True + True + True + True True + True + True + True True True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True True + True True + True True + True + True True True True True True + True True True True True + True True True + True True True True True True True + True + True True + True + True + True + True True True + True + True + True + True + True True + True + True True + True + True + True + True True + True True + True + True + True True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True True + True + True + True + True True True True + True True True True + True + True True + True + True True + True True + True + True + True True + True True True + True True + True + True + True True + True + True + True + True True + True True + True + True True + True True True + True True True True @@ -673,30 +800,81 @@ True True True + True + True True + True True + True True + True True + True True + True + True + True + True True + True + True True True + True True True + True + True + True + True True + True + True True True True + True True + True + True True True + True True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True True + True + True True + True True + True + True True + True + True + True True + True + True True + True + True True True True @@ -704,101 +882,276 @@ True True True + True True + True + True + True + True True + True True True + True + True + True + True + True + True + True + True + True + True + True + True True + True + True + True + True + True True True True + True + True True + True True + True True + True + True + True True True True + True + True + True + True True True True True True True + True + True True + True + True + True + True True True + True + True + True + True + True True True True True + True True True + True + True True + True + True + True + True + True + True + True + True + True + True + True + True True True True + True + True + True True + True True True + True True True + True + True + True True + True + True True + True True True True + True + True + True + True True True True True + True + True + True True + True + True True + True + True + True + True + True + True + True True True True + True + True + True + True + True + True True + True + True + True True + True + True + True + True True + True + True True + True + True True + True + True True + True + True + True + True + True + True + True + True + True + True + True + True True + True + True + True + True + True + True + True + True + True + True + True + True + True True + True True True + True True + True + True + True + True + True + True + True True True + True + True + True True + True True + True True + True + True + True + True True True + True + True + True True + True True + True + True + True + True True True + True True + True + True + True True True True True True + True True + True True True True + True + True + True True True True True + True True True + True True + True + True + True + True True True True + True True + True + True True True True @@ -806,72 +1159,259 @@ True True True + True + True + True True + True + True + True + True + True True True + True + True + True True True + True True True + True + True + True + True + True + True True + True + True + True + True True + True + True True + True True + True True + True + True + True True + True True + True + True + True + True + True + True + True + True + True + True + True True + True True + True + True + True + True + True + True + True + True True + True True + True + True + True + True + True + True True + True + True True + True + True + True True + True + True + True + True + True + True + True + True True + True + True + True + True + True + True + True True True True + True + True True True True True + True + True + True True + True + True + True True True True + True + True + True + True + True True True + True True + True + True + True + True + True + True + True + True + True + True + True True + True + True + True + True True + True + True + True + True + True + True + True True + True + True True + True + True + True True True + True + True + True + True + True + True + True + True True True True + True True True + True True + True + True + True True True True + True + True + True + True + True True + True + True True + True True + True + True + True + True + True + True + True + True + True + True True True + True + True True + True + True + True + True + True + True True True + True + True + True + True + True + True + True + True True True True True + True + True + True + True + True True True + True + True + True + True + True + True + True + True + True + True True + True + True + True + True + True + True + True True True True \ No newline at end of file