diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index b7366181b..2a4635bb3 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit b7366181b4d19965674348d64b722b900e3319b7 +Subproject commit 2a4635bb3879342da0cb50a3ebd33682c3f6a9c2 diff --git a/Aaru.Filesystems/AODOS/AODOS.cs b/Aaru.Filesystems/AODOS/AODOS.cs index 3af4ba668..c5d3c40b9 100644 --- a/Aaru.Filesystems/AODOS/AODOS.cs +++ b/Aaru.Filesystems/AODOS/AODOS.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -47,7 +46,5 @@ public sealed partial class AODOS : IFilesystem /// public Guid Id => new("668E5039-9DDD-442A-BE1B-A315D6E38E26"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; } \ No newline at end of file diff --git a/Aaru.Filesystems/AODOS/Info.cs b/Aaru.Filesystems/AODOS/Info.cs index b62f3a462..a75d9fba0 100644 --- a/Aaru.Filesystems/AODOS/Info.cs +++ b/Aaru.Filesystems/AODOS/Info.cs @@ -77,7 +77,7 @@ public sealed partial class AODOS out FileSystem metadata) { information = ""; - Encoding = Encoding.GetEncoding("koi8-r"); + encoding = Encoding.GetEncoding("koi8-r"); ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector); metadata = new FileSystem(); @@ -97,14 +97,14 @@ public sealed partial class AODOS ClusterSize = imagePlugin.Info.SectorSize, Files = bb.files, FreeClusters = imagePlugin.Info.Sectors - bb.usedSectors, - VolumeName = StringHandlers.SpacePaddedToString(bb.volumeLabel, Encoding), + VolumeName = StringHandlers.SpacePaddedToString(bb.volumeLabel, encoding), Bootable = true }; sbInformation.AppendFormat(Localization._0_files_on_volume, bb.files).AppendLine(); sbInformation.AppendFormat(Localization._0_used_sectors_on_volume, bb.usedSectors).AppendLine(); - sbInformation.AppendFormat(Localization.Disk_name_0, StringHandlers.CToString(bb.volumeLabel, Encoding)). + sbInformation.AppendFormat(Localization.Disk_name_0, StringHandlers.CToString(bb.volumeLabel, encoding)). AppendLine(); information = sbInformation.ToString(); diff --git a/Aaru.Filesystems/APFS/APFS.cs b/Aaru.Filesystems/APFS/APFS.cs index 9e2ebbbe9..93abbdfb8 100644 --- a/Aaru.Filesystems/APFS/APFS.cs +++ b/Aaru.Filesystems/APFS/APFS.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -38,8 +37,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedMember.Local")] public sealed partial class APFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.APFS_Name; /// diff --git a/Aaru.Filesystems/APFS/Info.cs b/Aaru.Filesystems/APFS/Info.cs index 3b704dedc..88cfe996f 100644 --- a/Aaru.Filesystems/APFS/Info.cs +++ b/Aaru.Filesystems/APFS/Info.cs @@ -70,7 +70,6 @@ public sealed partial class APFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = Encoding.UTF8; var sbInformation = new StringBuilder(); metadata = new FileSystem(); information = ""; diff --git a/Aaru.Filesystems/Acorn/Acorn.cs b/Aaru.Filesystems/Acorn/Acorn.cs index 1fc9a387c..21479a93d 100644 --- a/Aaru.Filesystems/Acorn/Acorn.cs +++ b/Aaru.Filesystems/Acorn/Acorn.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,7 +40,5 @@ public sealed partial class AcornADFS : IFilesystem /// public Guid Id => new("BAFC1E50-9C64-4CD3-8400-80628CC27AFA"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; } \ No newline at end of file diff --git a/Aaru.Filesystems/Acorn/Info.cs b/Aaru.Filesystems/Acorn/Info.cs index 82e514257..4d3bb2c33 100644 --- a/Aaru.Filesystems/Acorn/Info.cs +++ b/Aaru.Filesystems/Acorn/Info.cs @@ -262,7 +262,7 @@ public sealed partial class AcornADFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1"); + encoding ??= Encoding.GetEncoding("iso-8859-1"); var sbInformation = new StringBuilder(); metadata = new FileSystem(); information = ""; @@ -416,7 +416,7 @@ public sealed partial class AcornADFS sbInformation.AppendFormat(Localization._0_bytes_per_sector, imagePlugin.Info.SectorSize).AppendLine(); sbInformation.AppendFormat(Localization.Volume_has_0_bytes, bytes).AppendLine(); - sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(namebytes, Encoding)). + sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(namebytes, encoding)). AppendLine(); if(oldMap1.discId > 0) @@ -426,7 +426,7 @@ public sealed partial class AcornADFS } if(!ArrayHelpers.ArrayIsNullOrEmpty(namebytes)) - metadata.VolumeName = StringHandlers.CToString(namebytes, Encoding); + metadata.VolumeName = StringHandlers.CToString(namebytes, encoding); information = sbInformation.ToString(); @@ -495,7 +495,7 @@ public sealed partial class AcornADFS AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_id = {0}", drSb.disc_id); AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_name = {0}", - StringHandlers.CToString(drSb.disc_name, Encoding)); + StringHandlers.CToString(drSb.disc_name, encoding)); AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_type = {0}", drSb.disc_type); AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size_high = {0}", drSb.disc_size_high); @@ -555,7 +555,7 @@ public sealed partial class AcornADFS if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.disc_name)) { - string discname = StringHandlers.CToString(drSb.disc_name, Encoding); + string discname = StringHandlers.CToString(drSb.disc_name, encoding); metadata.VolumeName = discname; sbInformation.AppendFormat(Localization.Volume_name_0, discname).AppendLine(); } diff --git a/Aaru.Filesystems/AmigaDOS/AmigaDOS.cs b/Aaru.Filesystems/AmigaDOS/AmigaDOS.cs index e6be79b8e..a5d8416ee 100644 --- a/Aaru.Filesystems/AmigaDOS/AmigaDOS.cs +++ b/Aaru.Filesystems/AmigaDOS/AmigaDOS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,7 +40,5 @@ public sealed partial class AmigaDOSPlugin : IFilesystem /// public Guid Id => new("3c882400-208c-427d-a086-9119852a1bc7"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; } \ No newline at end of file diff --git a/Aaru.Filesystems/AmigaDOS/Info.cs b/Aaru.Filesystems/AmigaDOS/Info.cs index 64d63a8cd..e0ba715e7 100644 --- a/Aaru.Filesystems/AmigaDOS/Info.cs +++ b/Aaru.Filesystems/AmigaDOS/Info.cs @@ -168,7 +168,7 @@ public sealed partial class AmigaDOSPlugin public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1"); + encoding ??= Encoding.GetEncoding("iso-8859-1"); var sbInformation = new StringBuilder(); metadata = new FileSystem(); information = null; @@ -273,7 +273,7 @@ public sealed partial class AmigaDOSPlugin rootBlk = MarshalRootBlock(rootBlockSector); - string diskName = StringHandlers.PascalToString(rootBlk.diskName, Encoding); + string diskName = StringHandlers.PascalToString(rootBlk.diskName, encoding); switch(bootBlk.diskType & 0xFF) { diff --git a/Aaru.Filesystems/AppleDOS/AppleDOS.cs b/Aaru.Filesystems/AppleDOS/AppleDOS.cs index 29ad206d2..aede91077 100644 --- a/Aaru.Filesystems/AppleDOS/AppleDOS.cs +++ b/Aaru.Filesystems/AppleDOS/AppleDOS.cs @@ -42,6 +42,7 @@ public sealed partial class AppleDOS : IReadOnlyFilesystem const string FS_TYPE = "appledos"; bool _debug; IMediaImage _device; + Encoding _encoding; bool _mounted; int _sectorsPerTrack; ulong _start; @@ -51,8 +52,6 @@ public sealed partial class AppleDOS : IReadOnlyFilesystem uint _usedSectors; Vtoc _vtoc; - /// - public Encoding Encoding { get; private set; } /// public FileSystem Metadata { get; private set; } /// diff --git a/Aaru.Filesystems/AppleDOS/Dir.cs b/Aaru.Filesystems/AppleDOS/Dir.cs index b0f1bee82..639537af6 100644 --- a/Aaru.Filesystems/AppleDOS/Dir.cs +++ b/Aaru.Filesystems/AppleDOS/Dir.cs @@ -117,7 +117,7 @@ public sealed partial class AppleDOS for(int i = 0; i < 30; i++) filenameB[i] = (byte)(entry.filename[i] & 0x7F); - string filename = StringHandlers.SpacePaddedToString(filenameB, Encoding); + string filename = StringHandlers.SpacePaddedToString(filenameB, _encoding); if(!_catalogCache.ContainsKey(filename)) _catalogCache.Add(filename, ts); diff --git a/Aaru.Filesystems/AppleDOS/Info.cs b/Aaru.Filesystems/AppleDOS/Info.cs index d0335615d..569c1114c 100644 --- a/Aaru.Filesystems/AppleDOS/Info.cs +++ b/Aaru.Filesystems/AppleDOS/Info.cs @@ -31,8 +31,6 @@ using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; using Aaru.Helpers; -using Claunia.Encoding; -using Encoding = System.Text.Encoding; using Partition = Aaru.CommonTypes.Partition; namespace Aaru.Filesystems; @@ -67,7 +65,6 @@ public sealed partial class AppleDOS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? new Apple2(); information = ""; var sb = new StringBuilder(); metadata = new FileSystem(); diff --git a/Aaru.Filesystems/AppleDOS/Super.cs b/Aaru.Filesystems/AppleDOS/Super.cs index c36faee78..257cb3aad 100644 --- a/Aaru.Filesystems/AppleDOS/Super.cs +++ b/Aaru.Filesystems/AppleDOS/Super.cs @@ -45,9 +45,9 @@ public sealed partial class AppleDOS public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, Dictionary options, string @namespace) { - _device = imagePlugin; - _start = partition.Start; - Encoding = encoding ?? new Apple2(); + _device = imagePlugin; + _start = partition.Start; + _encoding = encoding ?? new Apple2(); if(_device.Info.Sectors != 455 && _device.Info.Sectors != 560) diff --git a/Aaru.Filesystems/AppleHFS/AppleHFS.cs b/Aaru.Filesystems/AppleHFS/AppleHFS.cs index 1a19439c2..79280aa29 100644 --- a/Aaru.Filesystems/AppleHFS/AppleHFS.cs +++ b/Aaru.Filesystems/AppleHFS/AppleHFS.cs @@ -32,7 +32,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -43,8 +42,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Apple Hierarchical File System (HFS) public sealed partial class AppleHFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.Name_Apple_Hierarchical_File_System; /// diff --git a/Aaru.Filesystems/AppleHFS/Info.cs b/Aaru.Filesystems/AppleHFS/Info.cs index f05c1812c..8508d978f 100644 --- a/Aaru.Filesystems/AppleHFS/Info.cs +++ b/Aaru.Filesystems/AppleHFS/Info.cs @@ -100,9 +100,9 @@ public sealed partial class AppleHFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("macintosh"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("macintosh"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -232,7 +232,7 @@ public sealed partial class AppleHFS sb.AppendFormat(Localization._0_bytes_in_the_Extents_B_Tree, mdb.drXTFlSize).AppendLine(); sb.AppendFormat(Localization._0_bytes_in_the_Catalog_B_Tree, mdb.drCTFlSize).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.PascalToString(mdb.drVN, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.PascalToString(mdb.drVN, encoding)).AppendLine(); sb.AppendLine(Localization.Finder_info); sb.AppendFormat(Localization.CNID_of_bootable_system_directory_0, mdb.drFndrInfo0).AppendLine(); @@ -258,7 +258,7 @@ public sealed partial class AppleHFS sb.AppendFormat(Localization._0_blocks_in_volume_common_cache, mdb.drCtlCSize).AppendLine(); } - string bootBlockInfo = AppleCommon.GetBootBlockInformation(bbSector, Encoding); + string bootBlockInfo = AppleCommon.GetBootBlockInformation(bbSector, encoding); if(bootBlockInfo != null) { @@ -303,7 +303,7 @@ public sealed partial class AppleHFS } metadata.Type = FS_TYPE; - metadata.VolumeName = StringHandlers.PascalToString(mdb.drVN, Encoding); + metadata.VolumeName = StringHandlers.PascalToString(mdb.drVN, encoding); if(mdb.drFndrInfo6 != 0 && mdb.drFndrInfo7 != 0) diff --git a/Aaru.Filesystems/AppleHFSPlus/AppleHFSPlus.cs b/Aaru.Filesystems/AppleHFSPlus/AppleHFSPlus.cs index 234e80268..b088a7c48 100644 --- a/Aaru.Filesystems/AppleHFSPlus/AppleHFSPlus.cs +++ b/Aaru.Filesystems/AppleHFSPlus/AppleHFSPlus.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -37,8 +36,6 @@ namespace Aaru.Filesystems; /// Implements detection of Apple Hierarchical File System Plus (HFS+) public sealed partial class AppleHFSPlus : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.AppleHFSPlus_Name; /// diff --git a/Aaru.Filesystems/AppleHFSPlus/Info.cs b/Aaru.Filesystems/AppleHFSPlus/Info.cs index 716f4b449..b815d4550 100644 --- a/Aaru.Filesystems/AppleHFSPlus/Info.cs +++ b/Aaru.Filesystems/AppleHFSPlus/Info.cs @@ -100,7 +100,6 @@ public sealed partial class AppleHFSPlus public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = Encoding.BigEndianUnicode; information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/AppleMFS/AppleMFS.cs b/Aaru.Filesystems/AppleMFS/AppleMFS.cs index 0e15af5fc..bf15bbb99 100644 --- a/Aaru.Filesystems/AppleMFS/AppleMFS.cs +++ b/Aaru.Filesystems/AppleMFS/AppleMFS.cs @@ -57,6 +57,7 @@ public sealed partial class AppleMFS : IReadOnlyFilesystem byte[] _mdbTags; byte[] _directoryTags; byte[] _bitmapTags; + Encoding _encoding; /// public string Name => Localization.AppleMFS_Name; @@ -65,8 +66,6 @@ public sealed partial class AppleMFS : IReadOnlyFilesystem /// public Guid Id => new("36405F8D-0D26-4066-6538-5DBF5D065C3A"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; // TODO: Implement Finder namespace (requires decoding Desktop database) diff --git a/Aaru.Filesystems/AppleMFS/Dir.cs b/Aaru.Filesystems/AppleMFS/Dir.cs index 33ac51a8b..90b8303c3 100644 --- a/Aaru.Filesystems/AppleMFS/Dir.cs +++ b/Aaru.Filesystems/AppleMFS/Dir.cs @@ -101,7 +101,7 @@ public sealed partial class AppleMFS entry.flNam = new byte[_directoryBlocks[offset + 50] + 1]; Array.Copy(_directoryBlocks, offset + 50, entry.flNam, 0, entry.flNam.Length); - string lowerFilename = StringHandlers.PascalToString(entry.flNam, Encoding).ToLowerInvariant(). + string lowerFilename = StringHandlers.PascalToString(entry.flNam, _encoding).ToLowerInvariant(). Replace('/', ':'); if(entry.flFlags.HasFlag(FileFlags.Used) && @@ -113,7 +113,7 @@ public sealed partial class AppleMFS _idToEntry.Add(entry.flFlNum, entry); _idToFilename.Add(entry.flFlNum, - StringHandlers.PascalToString(entry.flNam, Encoding).Replace('/', ':')); + StringHandlers.PascalToString(entry.flNam, _encoding).Replace('/', ':')); _filenameToId.Add(lowerFilename, entry.flFlNum); @@ -134,7 +134,7 @@ public sealed partial class AppleMFS DateHandlers.MacToDateTime(entry.flMdDat)); AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flNam0 = {0}", - StringHandlers.PascalToString(entry.flNam, Encoding)); + StringHandlers.PascalToString(entry.flNam, _encoding)); } offset += 50 + entry.flNam.Length; diff --git a/Aaru.Filesystems/AppleMFS/Info.cs b/Aaru.Filesystems/AppleMFS/Info.cs index 1e3033033..391a3bdc9 100644 --- a/Aaru.Filesystems/AppleMFS/Info.cs +++ b/Aaru.Filesystems/AppleMFS/Info.cs @@ -61,9 +61,9 @@ public sealed partial class AppleMFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? new MacRoman(); - information = ""; - metadata = new FileSystem(); + encoding ??= new MacRoman(); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -99,7 +99,7 @@ public sealed partial class AppleMFS mdb.drVNSiz = mdbSector[0x024]; byte[] variableSize = new byte[mdb.drVNSiz + 1]; Array.Copy(mdbSector, 0x024, variableSize, 0, mdb.drVNSiz + 1); - mdb.drVN = StringHandlers.PascalToString(variableSize, Encoding); + mdb.drVN = StringHandlers.PascalToString(variableSize, encoding); sb.AppendLine(Localization.AppleMFS_Name); sb.AppendLine(); @@ -142,7 +142,7 @@ public sealed partial class AppleMFS sb.AppendFormat(Localization._0_unused_allocation_blocks, mdb.drFreeBks).AppendLine(); sb.AppendFormat(Localization.Volume_name_0, mdb.drVN).AppendLine(); - string bootBlockInfo = AppleCommon.GetBootBlockInformation(bbSector, Encoding); + string bootBlockInfo = AppleCommon.GetBootBlockInformation(bbSector, encoding); if(bootBlockInfo != null) { diff --git a/Aaru.Filesystems/AppleMFS/Super.cs b/Aaru.Filesystems/AppleMFS/Super.cs index 7c1bd25d3..e6ffffd60 100644 --- a/Aaru.Filesystems/AppleMFS/Super.cs +++ b/Aaru.Filesystems/AppleMFS/Super.cs @@ -49,7 +49,7 @@ public sealed partial class AppleMFS { _device = imagePlugin; _partitionStart = partition.Start; - Encoding = encoding ?? Encoding.GetEncoding("macintosh"); + _encoding = encoding ?? Encoding.GetEncoding("macintosh"); options ??= GetDefaultOptions(); @@ -88,7 +88,7 @@ public sealed partial class AppleMFS _volMdb.drVNSiz = _mdbBlocks[0x024]; byte[] variableSize = new byte[_volMdb.drVNSiz + 1]; Array.Copy(_mdbBlocks, 0x024, variableSize, 0, _volMdb.drVNSiz + 1); - _volMdb.drVN = StringHandlers.PascalToString(variableSize, Encoding); + _volMdb.drVN = StringHandlers.PascalToString(variableSize, _encoding); errno = _device.ReadSectors(_volMdb.drDirSt + _partitionStart, _volMdb.drBlLen, out _directoryBlocks); diff --git a/Aaru.Filesystems/AtheOS/AtheOS.cs b/Aaru.Filesystems/AtheOS/AtheOS.cs index f284ab64f..9327cba08 100644 --- a/Aaru.Filesystems/AtheOS/AtheOS.cs +++ b/Aaru.Filesystems/AtheOS/AtheOS.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -38,8 +37,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedMember.Local")] public sealed partial class AtheOS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.AtheOS_Name; /// diff --git a/Aaru.Filesystems/AtheOS/Info.cs b/Aaru.Filesystems/AtheOS/Info.cs index 001198251..a17418e17 100644 --- a/Aaru.Filesystems/AtheOS/Info.cs +++ b/Aaru.Filesystems/AtheOS/Info.cs @@ -76,9 +76,9 @@ public sealed partial class AtheOS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -104,7 +104,7 @@ public sealed partial class AtheOS if(afsSb.flags == 1) sb.AppendLine(Localization.Filesystem_is_read_only); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(afsSb.name, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(afsSb.name, encoding)).AppendLine(); sb.AppendFormat(Localization._0_bytes_per_block, afsSb.block_size).AppendLine(); sb.AppendFormat(Localization._0_blocks_in_volume_1_bytes, afsSb.num_blocks, @@ -154,7 +154,7 @@ public sealed partial class AtheOS Dirty = false, FreeClusters = (ulong)(afsSb.num_blocks - afsSb.used_blocks), Type = FS_TYPE, - VolumeName = StringHandlers.CToString(afsSb.name, Encoding) + VolumeName = StringHandlers.CToString(afsSb.name, encoding) }; } } \ No newline at end of file diff --git a/Aaru.Filesystems/BFS/BFS.cs b/Aaru.Filesystems/BFS/BFS.cs index 1c18fdd21..252bc305d 100644 --- a/Aaru.Filesystems/BFS/BFS.cs +++ b/Aaru.Filesystems/BFS/BFS.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -39,8 +38,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedMember.Local")] public sealed partial class BeFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.BeFS_Name; /// diff --git a/Aaru.Filesystems/BFS/Info.cs b/Aaru.Filesystems/BFS/Info.cs index e8a3f59e0..7f8e85f4e 100644 --- a/Aaru.Filesystems/BFS/Info.cs +++ b/Aaru.Filesystems/BFS/Info.cs @@ -86,9 +86,9 @@ public sealed partial class BeFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -184,7 +184,7 @@ public sealed partial class BeFS break; } - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(besb.name, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(besb.name, encoding)).AppendLine(); sb.AppendFormat(Localization._0_bytes_per_block, besb.block_size).AppendLine(); sb.AppendFormat(Localization._0_blocks_in_volume_1_bytes, besb.num_blocks, besb.num_blocks * besb.block_size). @@ -226,7 +226,7 @@ public sealed partial class BeFS Dirty = besb.flags == BEFS_DIRTY, FreeClusters = (ulong)(besb.num_blocks - besb.used_blocks), Type = FS_TYPE, - VolumeName = StringHandlers.CToString(besb.name, Encoding) + VolumeName = StringHandlers.CToString(besb.name, encoding) }; } } \ No newline at end of file diff --git a/Aaru.Filesystems/BTRFS/BTRFS.cs b/Aaru.Filesystems/BTRFS/BTRFS.cs index d1fa95775..74e867888 100644 --- a/Aaru.Filesystems/BTRFS/BTRFS.cs +++ b/Aaru.Filesystems/BTRFS/BTRFS.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -40,8 +39,6 @@ namespace Aaru.Filesystems; /// Implements detection of the b-tree filesystem (btrfs) public sealed partial class BTRFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.BTRFS_Name; /// diff --git a/Aaru.Filesystems/BTRFS/Info.cs b/Aaru.Filesystems/BTRFS/Info.cs index 7089cf6ee..04bfad1b3 100644 --- a/Aaru.Filesystems/BTRFS/Info.cs +++ b/Aaru.Filesystems/BTRFS/Info.cs @@ -84,7 +84,6 @@ public sealed partial class BTRFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); var sbInformation = new StringBuilder(); metadata = new FileSystem(); information = ""; diff --git a/Aaru.Filesystems/CBM/CBM.cs b/Aaru.Filesystems/CBM/CBM.cs index 28faa0a73..1fdb5ada1 100644 --- a/Aaru.Filesystems/CBM/CBM.cs +++ b/Aaru.Filesystems/CBM/CBM.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,7 +40,5 @@ public sealed partial class CBM : IFilesystem /// public Guid Id => new("D104744E-A376-450C-BAC0-1347C93F983B"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; } \ No newline at end of file diff --git a/Aaru.Filesystems/CBM/Info.cs b/Aaru.Filesystems/CBM/Info.cs index c9121d483..7938f21bd 100644 --- a/Aaru.Filesystems/CBM/Info.cs +++ b/Aaru.Filesystems/CBM/Info.cs @@ -92,7 +92,7 @@ public sealed partial class CBM public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = new PETSCII(); + encoding = new PETSCII(); information = ""; byte[] sector; @@ -136,10 +136,10 @@ public sealed partial class CBM sbInformation.AppendFormat(Localization.Disk_ID_0, cbmHdr.diskId).AppendLine(); - sbInformation.AppendFormat(Localization.Disk_name_0, StringHandlers.CToString(cbmHdr.name, Encoding)). + sbInformation.AppendFormat(Localization.Disk_name_0, StringHandlers.CToString(cbmHdr.name, encoding)). AppendLine(); - metadata.VolumeName = StringHandlers.CToString(cbmHdr.name, Encoding); + metadata.VolumeName = StringHandlers.CToString(cbmHdr.name, encoding); metadata.VolumeSerial = $"{cbmHdr.diskId}"; } else @@ -164,10 +164,10 @@ public sealed partial class CBM sbInformation.AppendFormat(Localization.Disk_ID_0, cbmBam.diskId).AppendLine(); - sbInformation.AppendFormat(Localization.Disk_name_0, StringHandlers.CToString(cbmBam.name, Encoding)). + sbInformation.AppendFormat(Localization.Disk_name_0, StringHandlers.CToString(cbmBam.name, encoding)). AppendLine(); - metadata.VolumeName = StringHandlers.CToString(cbmBam.name, Encoding); + metadata.VolumeName = StringHandlers.CToString(cbmBam.name, encoding); metadata.VolumeSerial = $"{cbmBam.diskId}"; } diff --git a/Aaru.Filesystems/CPM/CPM.cs b/Aaru.Filesystems/CPM/CPM.cs index da941d9a2..1d51f05ee 100644 --- a/Aaru.Filesystems/CPM/CPM.cs +++ b/Aaru.Filesystems/CPM/CPM.cs @@ -59,6 +59,7 @@ public sealed partial class CPM : IReadOnlyFilesystem List _dirList; /// CP/M disc parameter block (on-memory) DiscParameterBlock _dpb; + Encoding _encoding; /// Cached file data Dictionary _fileCache; /// The volume label, if the CP/M filesystem contains one @@ -81,8 +82,6 @@ public sealed partial class CPM : IReadOnlyFilesystem /// If thinks this is a CP/M filesystem, this is the definition for it CpmDefinition _workingDefinition; - /// - public Encoding Encoding { get; private set; } /// public FileSystem Metadata { get; private set; } /// diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs index f876c2508..5ab13901c 100644 --- a/Aaru.Filesystems/CPM/Info.cs +++ b/Aaru.Filesystems/CPM/Info.cs @@ -1141,7 +1141,6 @@ public sealed partial class CPM public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("IBM437"); information = ""; metadata = new FileSystem(); @@ -1214,13 +1213,11 @@ public sealed partial class CPM sb.AppendFormat(Localization.Device_uses_0_one_hardware_interleaving, _workingDefinition.skew).AppendLine(); if(_workingDefinition.sofs > 0) - sb.AppendFormat("BSH {0} BLM {1} EXM {2} DSM {3} DRM {4} AL0 {5:X2}H AL1 {6:X2}H SOFS {7}", _dpb.bsh, - _dpb.blm, _dpb.exm, _dpb.dsm, _dpb.drm, _dpb.al0, _dpb.al1, _workingDefinition.sofs). - AppendLine(); + sb.AppendLine($"BSH {_dpb.bsh} BLM {_dpb.blm} EXM {_dpb.exm} DSM {_dpb.dsm} DRM {_dpb.drm} AL0 {_dpb.al0 + :X2}H AL1 {_dpb.al1:X2}H SOFS {_workingDefinition.sofs}"); else - sb.AppendFormat("BSH {0} BLM {1} EXM {2} DSM {3} DRM {4} AL0 {5:X2}H AL1 {6:X2}H OFS {7}", _dpb.bsh, - _dpb.blm, _dpb.exm, _dpb.dsm, _dpb.drm, _dpb.al0, _dpb.al1, _workingDefinition.ofs). - AppendLine(); + sb.AppendLine($"BSH {_dpb.bsh} BLM {_dpb.blm} EXM {_dpb.exm} DSM {_dpb.dsm} DRM {_dpb.drm} AL0 {_dpb.al0 + :X2}H AL1 {_dpb.al1:X2}H OFS {_workingDefinition.ofs}"); if(_label != null) sb.AppendFormat(Localization.Volume_label_0, _label).AppendLine(); diff --git a/Aaru.Filesystems/CPM/Super.cs b/Aaru.Filesystems/CPM/Super.cs index 36c8e5fb6..b6c7e5163 100644 --- a/Aaru.Filesystems/CPM/Super.cs +++ b/Aaru.Filesystems/CPM/Super.cs @@ -55,8 +55,8 @@ public sealed partial class CPM public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, Dictionary options, string @namespace) { - _device = imagePlugin; - Encoding = encoding ?? Encoding.GetEncoding("IBM437"); + _device = imagePlugin; + _encoding = encoding ?? Encoding.GetEncoding("IBM437"); // As the identification is so complex, just call Identify() and relay on its findings if(!Identify(_device, partition) || diff --git a/Aaru.Filesystems/Cram/Cram.cs b/Aaru.Filesystems/Cram/Cram.cs index 2df54ff71..55ed53833 100644 --- a/Aaru.Filesystems/Cram/Cram.cs +++ b/Aaru.Filesystems/Cram/Cram.cs @@ -30,7 +30,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -40,8 +39,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedType.Local")] public sealed partial class Cram : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.Cram_Name; /// diff --git a/Aaru.Filesystems/Cram/Info.cs b/Aaru.Filesystems/Cram/Info.cs index 0bed6c573..35e384454 100644 --- a/Aaru.Filesystems/Cram/Info.cs +++ b/Aaru.Filesystems/Cram/Info.cs @@ -64,8 +64,8 @@ public sealed partial class Cram public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector); metadata = new FileSystem(); @@ -96,7 +96,7 @@ public sealed partial class Cram sbInformation.AppendLine(littleEndian ? Localization.Little_endian : Localization.Big_endian); sbInformation.AppendFormat(Localization.Volume_edition_0, crSb.edition).AppendLine(); - sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(crSb.name, Encoding)). + sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(crSb.name, encoding)). AppendLine(); sbInformation.AppendFormat(Localization.Volume_has_0_bytes, crSb.size).AppendLine(); @@ -107,7 +107,7 @@ public sealed partial class Cram metadata = new FileSystem { - VolumeName = StringHandlers.CToString(crSb.name, Encoding), + VolumeName = StringHandlers.CToString(crSb.name, encoding), Type = FS_TYPE, Clusters = crSb.blocks, Files = crSb.files, diff --git a/Aaru.Filesystems/ECMA67/ECMA67.cs b/Aaru.Filesystems/ECMA67/ECMA67.cs index 9df889cf8..372c4d4fb 100644 --- a/Aaru.Filesystems/ECMA67/ECMA67.cs +++ b/Aaru.Filesystems/ECMA67/ECMA67.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -40,8 +39,6 @@ namespace Aaru.Filesystems; /// Implements detection of the filesystem described in ECMA-67 public sealed partial class ECMA67 : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.ECMA67_Name; /// diff --git a/Aaru.Filesystems/ECMA67/Info.cs b/Aaru.Filesystems/ECMA67/Info.cs index 5892c904c..eeae2c03b 100644 --- a/Aaru.Filesystems/ECMA67/Info.cs +++ b/Aaru.Filesystems/ECMA67/Info.cs @@ -70,7 +70,6 @@ public sealed partial class ECMA67 public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1"); information = ""; metadata = new FileSystem(); ErrorNumber errno = imagePlugin.ReadSector(6, out byte[] sector); diff --git a/Aaru.Filesystems/EFS/EFS.cs b/Aaru.Filesystems/EFS/EFS.cs index 7235171a0..21c1ba8a4 100644 --- a/Aaru.Filesystems/EFS/EFS.cs +++ b/Aaru.Filesystems/EFS/EFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements identification for the SGI Extent FileSystem public sealed partial class EFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.EFS_Name; /// diff --git a/Aaru.Filesystems/EFS/Info.cs b/Aaru.Filesystems/EFS/Info.cs index fc30d954d..233e0104c 100644 --- a/Aaru.Filesystems/EFS/Info.cs +++ b/Aaru.Filesystems/EFS/Info.cs @@ -106,9 +106,9 @@ public sealed partial class EFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 512) return; @@ -197,8 +197,8 @@ public sealed partial class EFS sb.AppendLine(Localization.Volume_is_dirty); sb.AppendFormat(Localization.Checksum_0_X8, efsSb.sb_checksum).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(efsSb.sb_fname, Encoding)).AppendLine(); - sb.AppendFormat(Localization.Volume_pack_0, StringHandlers.CToString(efsSb.sb_fpack, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(efsSb.sb_fname, encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_pack_0, StringHandlers.CToString(efsSb.sb_fpack, encoding)).AppendLine(); information = sb.ToString(); @@ -209,7 +209,7 @@ public sealed partial class EFS Clusters = (ulong)efsSb.sb_size, FreeClusters = (ulong)efsSb.sb_tfree, Dirty = efsSb.sb_dirty > 0, - VolumeName = StringHandlers.CToString(efsSb.sb_fname, Encoding), + VolumeName = StringHandlers.CToString(efsSb.sb_fname, encoding), VolumeSerial = $"{efsSb.sb_checksum:X8}", CreationDate = DateHandlers.UnixToDateTime(efsSb.sb_time) }; diff --git a/Aaru.Filesystems/F2FS/F2FS.cs b/Aaru.Filesystems/F2FS/F2FS.cs index 7aa0da22f..fa7548a1a 100644 --- a/Aaru.Filesystems/F2FS/F2FS.cs +++ b/Aaru.Filesystems/F2FS/F2FS.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -38,8 +37,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedMember.Local")] public sealed partial class F2FS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.F2FS_Name; /// diff --git a/Aaru.Filesystems/F2FS/Info.cs b/Aaru.Filesystems/F2FS/Info.cs index 0b3d6b2a0..4b21e9286 100644 --- a/Aaru.Filesystems/F2FS/Info.cs +++ b/Aaru.Filesystems/F2FS/Info.cs @@ -77,7 +77,6 @@ public sealed partial class F2FS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = Encoding.Unicode; information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/FAT/Dir.cs b/Aaru.Filesystems/FAT/Dir.cs index eac0fc242..88ba5bc6b 100644 --- a/Aaru.Filesystems/FAT/Dir.cs +++ b/Aaru.Filesystems/FAT/Dir.cs @@ -198,11 +198,11 @@ public sealed partial class FAT continue; // Self - if(Encoding.GetString(dirent.filename).TrimEnd() == ".") + if(_encoding.GetString(dirent.filename).TrimEnd() == ".") continue; // Parent - if(Encoding.GetString(dirent.filename).TrimEnd() == "..") + if(_encoding.GetString(dirent.filename).TrimEnd() == "..") continue; // Deleted @@ -237,8 +237,8 @@ public sealed partial class FAT if(dirent.filename[0] == DIRENT_E5) dirent.filename[0] = DIRENT_DELETED; - string name = Encoding.GetString(dirent.filename).TrimEnd(); - string extension = Encoding.GetString(dirent.extension).TrimEnd(); + string name = _encoding.GetString(dirent.filename).TrimEnd(); + string extension = _encoding.GetString(dirent.extension).TrimEnd(); if(name == "" && extension == "") @@ -288,9 +288,9 @@ public sealed partial class FAT completeEntry.HumanDirent = humanEntry; - name = StringHandlers.CToString(humanEntry.name1, Encoding).TrimEnd(); - extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd(); - string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd(); + name = StringHandlers.CToString(humanEntry.name1, _encoding).TrimEnd(); + extension = StringHandlers.CToString(humanEntry.extension, _encoding).TrimEnd(); + string name2 = StringHandlers.CToString(humanEntry.name2, _encoding).TrimEnd(); if(extension != "") filename = name + name2 + "." + extension; @@ -340,7 +340,7 @@ public sealed partial class FAT Array.Copy(longnameEa, 4, longnameBytes, 0, longnameSize); - string longname = StringHandlers.CToString(longnameBytes, Encoding); + string longname = StringHandlers.CToString(longnameBytes, _encoding); if(string.IsNullOrWhiteSpace(longname)) continue; diff --git a/Aaru.Filesystems/FAT/FAT.cs b/Aaru.Filesystems/FAT/FAT.cs index 547f4aa6e..6c42e701e 100644 --- a/Aaru.Filesystems/FAT/FAT.cs +++ b/Aaru.Filesystems/FAT/FAT.cs @@ -62,9 +62,8 @@ public sealed partial class FAT : IReadOnlyFilesystem uint _sectorsPerFat; FileSystemInfo _statfs; bool _useFirstFat; + Encoding _encoding; - /// - public Encoding Encoding { get; private set; } /// public FileSystem Metadata { get; private set; } /// diff --git a/Aaru.Filesystems/FAT/Info.cs b/Aaru.Filesystems/FAT/Info.cs index ad1b1a54c..70292e682 100644 --- a/Aaru.Filesystems/FAT/Info.cs +++ b/Aaru.Filesystems/FAT/Info.cs @@ -424,8 +424,8 @@ public sealed partial class FAT public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("IBM437"); - information = ""; + encoding ??= Encoding.GetEncoding("IBM437"); + information = ""; var sb = new StringBuilder(); metadata = new FileSystem(); @@ -574,7 +574,7 @@ public sealed partial class FAT if(fat32Bpb.signature == 0x29) { - metadata.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, Encoding); + metadata.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, encoding); metadata.VolumeName = metadata.VolumeName?.Replace("\0", ""); sb.AppendFormat(Localization.Filesystem_type_0, Encoding.ASCII.GetString(fat32Bpb.fs_type)). @@ -859,7 +859,7 @@ public sealed partial class FAT fakeBpb.oem_name[5] >= 0x20 && fakeBpb.oem_name[5] <= 0x7F && fakeBpb.oem_name[6] >= 0x20 && fakeBpb.oem_name[6] <= 0x7F && fakeBpb.oem_name[7] >= 0x20 && - fakeBpb.oem_name[7] <= 0x7F => StringHandlers.CToString(fakeBpb.oem_name, Encoding, + fakeBpb.oem_name[7] <= 0x7F => StringHandlers.CToString(fakeBpb.oem_name, encoding, start: 1), _ => metadata.SystemIdentifier }; @@ -929,7 +929,7 @@ public sealed partial class FAT if(fakeBpb.signature == 0x29 || andosOemCorrect) { - metadata.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, Encoding); + metadata.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, encoding); metadata.VolumeName = metadata.VolumeName?.Replace("\0", ""); sb.AppendFormat(Localization.Filesystem_type_0, Encoding.ASCII.GetString(fakeBpb.fs_type)). @@ -1018,7 +1018,7 @@ public sealed partial class FAT byte[] fullname = new byte[11]; Array.Copy(entry.filename, 0, fullname, 0, 8); Array.Copy(entry.extension, 0, fullname, 8, 3); - string volname = Encoding.GetString(fullname).Trim(); + string volname = encoding.GetString(fullname).Trim(); if(!string.IsNullOrEmpty(volname)) metadata.VolumeName = entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) ? volname.ToLower() : volname; diff --git a/Aaru.Filesystems/FAT/Super.cs b/Aaru.Filesystems/FAT/Super.cs index 49f1578d7..3fac300f1 100644 --- a/Aaru.Filesystems/FAT/Super.cs +++ b/Aaru.Filesystems/FAT/Super.cs @@ -128,8 +128,8 @@ public sealed partial class FAT uint sectorsForRootDirectory = 0; uint rootDirectoryCluster = 0; - Encoding = encoding ?? (bpbKind == BpbKind.Human ? Encoding.GetEncoding("shift_jis") - : Encoding.GetEncoding("IBM437")); + _encoding = encoding ?? (bpbKind == BpbKind.Human ? Encoding.GetEncoding("shift_jis") + : Encoding.GetEncoding("IBM437")); switch(bpbKind) { @@ -197,7 +197,7 @@ public sealed partial class FAT if(fat32Bpb.signature == 0x29) { - Metadata.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, Encoding); + Metadata.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, _encoding); Metadata.VolumeName = Metadata.VolumeName?.Replace("\0", ""); } @@ -423,7 +423,7 @@ public sealed partial class FAT fakeBpb.oem_name[5] >= 0x20 && fakeBpb.oem_name[5] <= 0x7F && fakeBpb.oem_name[6] >= 0x20 && fakeBpb.oem_name[6] <= 0x7F && fakeBpb.oem_name[7] >= 0x20 && - fakeBpb.oem_name[7] <= 0x7F => StringHandlers.CToString(fakeBpb.oem_name, Encoding, + fakeBpb.oem_name[7] <= 0x7F => StringHandlers.CToString(fakeBpb.oem_name, _encoding, start: 1), _ => Metadata.SystemIdentifier }; @@ -454,7 +454,7 @@ public sealed partial class FAT if(fakeBpb.signature == 0x29 || andosOemCorrect) { - Metadata.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, Encoding); + Metadata.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, _encoding); Metadata.VolumeName = Metadata.VolumeName?.Replace("\0", ""); } } @@ -609,11 +609,11 @@ public sealed partial class FAT continue; // Self - if(Encoding.GetString(entry.filename).TrimEnd() == ".") + if(_encoding.GetString(entry.filename).TrimEnd() == ".") continue; // Parent - if(Encoding.GetString(entry.filename).TrimEnd() == "..") + if(_encoding.GetString(entry.filename).TrimEnd() == "..") continue; // Deleted @@ -627,7 +627,7 @@ public sealed partial class FAT byte[] fullname = new byte[11]; Array.Copy(entry.filename, 0, fullname, 0, 8); Array.Copy(entry.extension, 0, fullname, 8, 3); - string volname = Encoding.GetString(fullname).Trim(); + string volname = _encoding.GetString(fullname).Trim(); if(!string.IsNullOrEmpty(volname)) Metadata.VolumeName = entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) && _namespace == Namespace.Nt @@ -674,8 +674,8 @@ public sealed partial class FAT if(entry.filename[0] == DIRENT_E5) entry.filename[0] = DIRENT_DELETED; - string name = Encoding.GetString(entry.filename).TrimEnd(); - string extension = Encoding.GetString(entry.extension).TrimEnd(); + string name = _encoding.GetString(entry.filename).TrimEnd(); + string extension = _encoding.GetString(entry.extension).TrimEnd(); if(_namespace == Namespace.Nt) { @@ -730,9 +730,9 @@ public sealed partial class FAT completeEntry.HumanDirent = humanEntry; - name = StringHandlers.CToString(humanEntry.name1, Encoding).TrimEnd(); - extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd(); - string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd(); + name = StringHandlers.CToString(humanEntry.name1, _encoding).TrimEnd(); + extension = StringHandlers.CToString(humanEntry.extension, _encoding).TrimEnd(); + string name2 = StringHandlers.CToString(humanEntry.name2, _encoding).TrimEnd(); if(extension != "") filename = name + name2 + "." + extension; @@ -922,7 +922,7 @@ public sealed partial class FAT Array.Copy(longnameEa, 4, longnameBytes, 0, longnameSize); - string longname = StringHandlers.CToString(longnameBytes, Encoding); + string longname = StringHandlers.CToString(longnameBytes, _encoding); if(string.IsNullOrWhiteSpace(longname)) continue; diff --git a/Aaru.Filesystems/FATX/Dir.cs b/Aaru.Filesystems/FATX/Dir.cs index d7d16cbce..d9d21499c 100644 --- a/Aaru.Filesystems/FATX/Dir.cs +++ b/Aaru.Filesystems/FATX/Dir.cs @@ -134,7 +134,7 @@ public sealed partial class XboxFatPlugin if(dirent.filenameSize is DELETED_DIRENTRY or > MAX_FILENAME) continue; - string filename = Encoding.GetString(dirent.filename, 0, dirent.filenameSize); + string filename = _encoding.GetString(dirent.filename, 0, dirent.filenameSize); currentDirectory.Add(filename, dirent); } diff --git a/Aaru.Filesystems/FATX/FATX.cs b/Aaru.Filesystems/FATX/FATX.cs index 76b87c970..55b2593c7 100644 --- a/Aaru.Filesystems/FATX/FATX.cs +++ b/Aaru.Filesystems/FATX/FATX.cs @@ -45,6 +45,7 @@ public sealed partial class XboxFatPlugin : IReadOnlyFilesystem CultureInfo _cultureInfo; bool _debug; Dictionary> _directoryCache; + Encoding _encoding; ushort[] _fat16; uint[] _fat32; ulong _fatStartSector; @@ -57,8 +58,6 @@ public sealed partial class XboxFatPlugin : IReadOnlyFilesystem FileSystemInfo _statfs; Superblock _superblock; - /// - public Encoding Encoding { get; private set; } /// public FileSystem Metadata { get; private set; } /// diff --git a/Aaru.Filesystems/FATX/Info.cs b/Aaru.Filesystems/FATX/Info.cs index ca142dfe8..7a8d344d9 100644 --- a/Aaru.Filesystems/FATX/Info.cs +++ b/Aaru.Filesystems/FATX/Info.cs @@ -57,7 +57,6 @@ public sealed partial class XboxFatPlugin public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = Encoding.UTF8; information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/FATX/Super.cs b/Aaru.Filesystems/FATX/Super.cs index 6f42d3d43..857ebd52d 100644 --- a/Aaru.Filesystems/FATX/Super.cs +++ b/Aaru.Filesystems/FATX/Super.cs @@ -48,7 +48,7 @@ public sealed partial class XboxFatPlugin public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, Dictionary options, string @namespace) { - Encoding = Encoding.GetEncoding("iso-8859-15"); + _encoding = Encoding.GetEncoding("iso-8859-15"); _littleEndian = true; options ??= GetDefaultOptions(); @@ -251,7 +251,7 @@ public sealed partial class XboxFatPlugin if(entry.filenameSize is DELETED_DIRENTRY or > MAX_FILENAME) continue; - string filename = Encoding.GetString(entry.filename, 0, entry.filenameSize); + string filename = _encoding.GetString(entry.filename, 0, entry.filenameSize); _rootDirectory.Add(filename, entry); } diff --git a/Aaru.Filesystems/FFS/FFS.cs b/Aaru.Filesystems/FFS/FFS.cs index 2335b5e1f..4215a93a5 100644 --- a/Aaru.Filesystems/FFS/FFS.cs +++ b/Aaru.Filesystems/FFS/FFS.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; using time_t = System.Int32; using ufs_daddr_t = System.Int32; @@ -41,8 +40,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "InconsistentNaming")] public sealed partial class FFSPlugin : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.FFSPlugin_Name; /// diff --git a/Aaru.Filesystems/FFS/Info.cs b/Aaru.Filesystems/FFS/Info.cs index d096c8198..bf768491f 100644 --- a/Aaru.Filesystems/FFS/Info.cs +++ b/Aaru.Filesystems/FFS/Info.cs @@ -96,7 +96,6 @@ public sealed partial class FFSPlugin public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); information = ""; metadata = new FileSystem(); var sbInformation = new StringBuilder(); diff --git a/Aaru.Filesystems/Fossil/Fossil.cs b/Aaru.Filesystems/Fossil/Fossil.cs index 2bc1668fb..a817843f0 100644 --- a/Aaru.Filesystems/Fossil/Fossil.cs +++ b/Aaru.Filesystems/Fossil/Fossil.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection for the Plan-9 Fossil on-disk filesystem public sealed partial class Fossil : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.Fossil_Name; /// diff --git a/Aaru.Filesystems/Fossil/Info.cs b/Aaru.Filesystems/Fossil/Info.cs index 8af06c42c..dbea57861 100644 --- a/Aaru.Filesystems/Fossil/Info.cs +++ b/Aaru.Filesystems/Fossil/Info.cs @@ -65,7 +65,7 @@ public sealed partial class Fossil out FileSystem metadata) { // Technically everything on Plan 9 from Bell Labs is in UTF-8 - Encoding = Encoding.UTF8; + encoding = Encoding.UTF8; information = ""; metadata = new FileSystem(); @@ -117,8 +117,8 @@ public sealed partial class Fossil sb.AppendFormat(Localization.Active_root_block_0, fsb.active).AppendLine(); sb.AppendFormat(Localization.Next_root_block_0, fsb.next).AppendLine(); sb.AppendFormat(Localization.Current_root_block_0, fsb.current).AppendLine(); - sb.AppendFormat(Localization.Volume_label_0, StringHandlers.CToString(fsb.name, Encoding)).AppendLine(); - metadata.VolumeName = StringHandlers.CToString(fsb.name, Encoding); + sb.AppendFormat(Localization.Volume_label_0, StringHandlers.CToString(fsb.name, encoding)).AppendLine(); + metadata.VolumeName = StringHandlers.CToString(fsb.name, encoding); } } diff --git a/Aaru.Filesystems/HAMMER/HAMMER.cs b/Aaru.Filesystems/HAMMER/HAMMER.cs index 278765712..1f6606408 100644 --- a/Aaru.Filesystems/HAMMER/HAMMER.cs +++ b/Aaru.Filesystems/HAMMER/HAMMER.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; using hammer_crc_t = System.UInt32; using hammer_off_t = System.UInt64; @@ -41,8 +40,6 @@ namespace Aaru.Filesystems; /// Implements detection for the HAMMER filesystem public sealed partial class HAMMER : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.HAMMER_Name; /// diff --git a/Aaru.Filesystems/HAMMER/Info.cs b/Aaru.Filesystems/HAMMER/Info.cs index 025782db9..56ec116b8 100644 --- a/Aaru.Filesystems/HAMMER/Info.cs +++ b/Aaru.Filesystems/HAMMER/Info.cs @@ -70,9 +70,9 @@ public sealed partial class HAMMER public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -99,7 +99,7 @@ public sealed partial class HAMMER sb.AppendFormat(Localization.Volume_0_of_1_on_this_filesystem, superBlock.vol_no + 1, superBlock.vol_count). AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(superBlock.vol_label, Encoding)). + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(superBlock.vol_label, encoding)). AppendLine(); sb.AppendFormat(Localization.Volume_serial_0, superBlock.vol_fsid).AppendLine(); @@ -115,7 +115,7 @@ public sealed partial class HAMMER ClusterSize = HAMMER_BIGBLOCK_SIZE, Dirty = false, Type = FS_TYPE, - VolumeName = StringHandlers.CToString(superBlock.vol_label, Encoding), + VolumeName = StringHandlers.CToString(superBlock.vol_label, encoding), VolumeSerial = superBlock.vol_fsid.ToString() }; diff --git a/Aaru.Filesystems/HPFS/HPFS.cs b/Aaru.Filesystems/HPFS/HPFS.cs index e76017133..eb5f6f544 100644 --- a/Aaru.Filesystems/HPFS/HPFS.cs +++ b/Aaru.Filesystems/HPFS/HPFS.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,8 +40,6 @@ namespace Aaru.Filesystems; /// Implements detection of IBM's High Performance File System (HPFS) public sealed partial class HPFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.HPFS_Name; /// diff --git a/Aaru.Filesystems/HPFS/Info.cs b/Aaru.Filesystems/HPFS/Info.cs index b47ff568d..708959870 100644 --- a/Aaru.Filesystems/HPFS/Info.cs +++ b/Aaru.Filesystems/HPFS/Info.cs @@ -69,9 +69,9 @@ public sealed partial class HPFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("ibm850"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("ibm850"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -137,7 +137,7 @@ public sealed partial class HPFS sb.AppendFormat(Localization.NT_Flags_0, bpb.nt_flags).AppendLine(); sb.AppendFormat(Localization.Signature_0, bpb.signature).AppendLine(); sb.AppendFormat(Localization.Serial_number_0, bpb.serial_no).AppendLine(); - sb.AppendFormat(Localization.Volume_label_0, StringHandlers.CToString(bpb.volume_label, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_label_0, StringHandlers.CToString(bpb.volume_label, encoding)).AppendLine(); // sb.AppendFormat("Filesystem type: \"{0}\"", hpfs_bpb.fs_type).AppendLine(); @@ -243,7 +243,7 @@ public sealed partial class HPFS metadata.Clusters = hpfsSb.sectors; metadata.ClusterSize = bpb.bps; metadata.Type = FS_TYPE; - metadata.VolumeName = StringHandlers.CToString(bpb.volume_label, Encoding); + metadata.VolumeName = StringHandlers.CToString(bpb.volume_label, encoding); metadata.VolumeSerial = $"{bpb.serial_no:X8}"; metadata.SystemIdentifier = StringHandlers.CToString(bpb.oem_name); diff --git a/Aaru.Filesystems/HPOFS/HPOFS.cs b/Aaru.Filesystems/HPOFS/HPOFS.cs index 050305096..cda65872a 100644 --- a/Aaru.Filesystems/HPOFS/HPOFS.cs +++ b/Aaru.Filesystems/HPOFS/HPOFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -38,8 +37,6 @@ namespace Aaru.Filesystems; /// Implements identification of IBM's High Performance Optical File System public sealed partial class HPOFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.HPOFS_Name; /// diff --git a/Aaru.Filesystems/HPOFS/Info.cs b/Aaru.Filesystems/HPOFS/Info.cs index b499d55ca..cd19b5b05 100644 --- a/Aaru.Filesystems/HPOFS/Info.cs +++ b/Aaru.Filesystems/HPOFS/Info.cs @@ -69,9 +69,9 @@ public sealed partial class HPOFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("ibm850"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("ibm850"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -193,13 +193,13 @@ public sealed partial class HPOFS sb.AppendFormat(Localization.BIOS_drive_number_0, bpb.drive_no).AppendLine(); sb.AppendFormat(Localization.Serial_number_0, mib.serial).AppendLine(); - sb.AppendFormat(Localization.Volume_label_0, StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding)). + sb.AppendFormat(Localization.Volume_label_0, StringHandlers.SpacePaddedToString(mib.volumeLabel, encoding)). AppendLine(); - sb.AppendFormat(Localization.Volume_comment_0, StringHandlers.SpacePaddedToString(mib.comment, Encoding)). + sb.AppendFormat(Localization.Volume_comment_0, StringHandlers.SpacePaddedToString(mib.comment, encoding)). AppendLine(); - sb.AppendFormat(Localization.Volume_owner_0, StringHandlers.SpacePaddedToString(vib.owner, Encoding)). + sb.AppendFormat(Localization.Volume_owner_0, StringHandlers.SpacePaddedToString(vib.owner, encoding)). AppendLine(); sb.AppendFormat(Localization.Volume_created_on_0, @@ -219,9 +219,9 @@ public sealed partial class HPOFS Clusters = mib.sectors / bpb.spc, ClusterSize = (uint)(bpb.bps * bpb.spc), CreationDate = DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime), - DataPreparerIdentifier = StringHandlers.SpacePaddedToString(vib.owner, Encoding), + DataPreparerIdentifier = StringHandlers.SpacePaddedToString(vib.owner, encoding), Type = FS_TYPE, - VolumeName = StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding), + VolumeName = StringHandlers.SpacePaddedToString(mib.volumeLabel, encoding), VolumeSerial = $"{mib.serial:X8}", SystemIdentifier = StringHandlers.SpacePaddedToString(bpb.oem_name) }; diff --git a/Aaru.Filesystems/ISO9660/ISO9660.cs b/Aaru.Filesystems/ISO9660/ISO9660.cs index ad7d9c320..b2864bd08 100644 --- a/Aaru.Filesystems/ISO9660/ISO9660.cs +++ b/Aaru.Filesystems/ISO9660/ISO9660.cs @@ -57,9 +57,8 @@ public sealed partial class ISO9660 : IReadOnlyFilesystem bool _usePathTable; bool _useTransTbl; ushort _blockSize; + Encoding Encoding; - /// - public Encoding Encoding { get; private set; } /// public FileSystem Metadata { get; private set; } /// diff --git a/Aaru.Filesystems/ISO9660/Info.cs b/Aaru.Filesystems/ISO9660/Info.cs index be2d2e195..b0e690572 100644 --- a/Aaru.Filesystems/ISO9660/Info.cs +++ b/Aaru.Filesystems/ISO9660/Info.cs @@ -87,9 +87,9 @@ public sealed partial class ISO9660 public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.ASCII; - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.ASCII; + information = ""; + metadata = new FileSystem(); var isoMetadata = new StringBuilder(); byte[] vdMagic = new byte[5]; // Volume Descriptor magic "CD001" byte[] hsMagic = new byte[5]; // Volume Descriptor magic "CDROM" @@ -120,7 +120,7 @@ public sealed partial class ISO9660 int xaOff = vdSector.Length == 2336 ? 8 : 0; Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5); - bool highSierraInfo = Encoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC; + bool highSierraInfo = encoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC; int hsOff = 0; if(highSierraInfo) @@ -158,9 +158,9 @@ public sealed partial class ISO9660 Array.Copy(vdSector, 0x001, vdMagic, 0, 5); Array.Copy(vdSector, 0x009, hsMagic, 0, 5); - if(Encoding.GetString(vdMagic) != ISO_MAGIC && - Encoding.GetString(hsMagic) != HIGH_SIERRA_MAGIC && - Encoding.GetString(vdMagic) != CDI_MAGIC) // Recognized, it is an ISO9660, now check for rest of data. + if(encoding.GetString(vdMagic) != ISO_MAGIC && + encoding.GetString(hsMagic) != HIGH_SIERRA_MAGIC && + encoding.GetString(vdMagic) != CDI_MAGIC) // Recognized, it is an ISO9660, now check for rest of data. { if(counter == 0) return; @@ -168,7 +168,7 @@ public sealed partial class ISO9660 break; } - cdiInfo |= Encoding.GetString(vdMagic) == CDI_MAGIC; + cdiInfo |= encoding.GetString(vdMagic) == CDI_MAGIC; switch(vdType) { @@ -178,7 +178,7 @@ public sealed partial class ISO9660 bootSpec = Localization.Unknown_specification; - if(Encoding.GetString(bvd.Value.system_id)[..23] == "EL TORITO SPECIFICATION") + if(encoding.GetString(bvd.Value.system_id)[..23] == "EL TORITO SPECIFICATION") { bootSpec = "El Torito"; @@ -520,11 +520,11 @@ public sealed partial class ISO9660 foreach(byte[] erb in refareas) { ReferenceArea er = Marshal.ByteArrayToStructureBigEndian(erb); - string extId = Encoding.GetString(erb, Marshal.SizeOf(), er.id_len); + string extId = encoding.GetString(erb, Marshal.SizeOf(), er.id_len); - string extDes = Encoding.GetString(erb, Marshal.SizeOf() + er.id_len, er.des_len); + string extDes = encoding.GetString(erb, Marshal.SizeOf() + er.id_len, er.des_len); - string extSrc = Encoding.GetString(erb, Marshal.SizeOf() + er.id_len + er.des_len, + string extSrc = encoding.GetString(erb, Marshal.SizeOf() + er.id_len + er.des_len, er.src_len); suspInformation.AppendFormat(Localization.Extension_0, counter).AppendLine(); @@ -730,7 +730,7 @@ public sealed partial class ISO9660 isoMetadata.AppendLine(Localization.Initial_entry); - isoMetadata.AppendFormat("\t" + Localization.Developer_ID_0, Encoding.GetString(valentry.developer_id)). + isoMetadata.AppendFormat("\t" + Localization.Developer_ID_0, encoding.GetString(valentry.developer_id)). AppendLine(); if(initialEntry.bootable == ElToritoIndicator.Bootable) @@ -799,7 +799,7 @@ public sealed partial class ISO9660 isoMetadata.AppendFormat(Localization.Boot_section_0, sectionCounter); isoMetadata. - AppendFormat("\t" + Localization.Section_ID_0, Encoding.GetString(sectionHeader.identifier)). + AppendFormat("\t" + Localization.Section_ID_0, encoding.GetString(sectionHeader.identifier)). AppendLine(); for(int entryCounter = 1; entryCounter <= sectionHeader.entries && toritoOff < vdSector.Length; diff --git a/Aaru.Filesystems/JFS/Info.cs b/Aaru.Filesystems/JFS/Info.cs index def0084c9..26763b1dc 100644 --- a/Aaru.Filesystems/JFS/Info.cs +++ b/Aaru.Filesystems/JFS/Info.cs @@ -66,9 +66,9 @@ public sealed partial class JFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); uint bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize; ErrorNumber errno = imagePlugin.ReadSector(partition.Start + bootSectors, out byte[] sector); @@ -162,9 +162,9 @@ public sealed partial class JFS DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec)).AppendLine(); if(jfsSb.s_version == 1) - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(jfsSb.s_fpack, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(jfsSb.s_fpack, encoding)).AppendLine(); else - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(jfsSb.s_label, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(jfsSb.s_label, encoding)).AppendLine(); sb.AppendFormat(Localization.Volume_UUID_0, jfsSb.s_uuid).AppendLine(); @@ -174,7 +174,7 @@ public sealed partial class JFS Clusters = jfsSb.s_size, ClusterSize = jfsSb.s_bsize, Bootable = true, - VolumeName = StringHandlers.CToString(jfsSb.s_version == 1 ? jfsSb.s_fpack : jfsSb.s_label, Encoding), + VolumeName = StringHandlers.CToString(jfsSb.s_version == 1 ? jfsSb.s_fpack : jfsSb.s_label, encoding), VolumeSerial = $"{jfsSb.s_uuid}", ModificationDate = DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec) }; diff --git a/Aaru.Filesystems/JFS/JFS.cs b/Aaru.Filesystems/JFS/JFS.cs index cd74b2865..cbe6d4de5 100644 --- a/Aaru.Filesystems/JFS/JFS.cs +++ b/Aaru.Filesystems/JFS/JFS.cs @@ -29,7 +29,6 @@ // ReSharper disable UnusedMember.Local using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -38,8 +37,6 @@ namespace Aaru.Filesystems; /// Implements detection of IBM's Journaled File System public sealed partial class JFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.JFS_Name; /// diff --git a/Aaru.Filesystems/LIF/Info.cs b/Aaru.Filesystems/LIF/Info.cs index dbd58e6ba..67127a113 100644 --- a/Aaru.Filesystems/LIF/Info.cs +++ b/Aaru.Filesystems/LIF/Info.cs @@ -62,9 +62,9 @@ public sealed partial class LIF public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 256) return; @@ -91,7 +91,7 @@ public sealed partial class LIF sb.AppendFormat(Localization._0_tracks, lifSb.tracks).AppendLine(); sb.AppendFormat(Localization._0_heads, lifSb.heads).AppendLine(); sb.AppendFormat(Localization._0_sectors, lifSb.sectors).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(lifSb.volumeLabel, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(lifSb.volumeLabel, encoding)).AppendLine(); sb.AppendFormat(Localization.Volume_created_on_0, DateHandlers.LifToDateTime(lifSb.creationDate)).AppendLine(); information = sb.ToString(); @@ -102,7 +102,7 @@ public sealed partial class LIF ClusterSize = 256, Clusters = partition.Size / 256, CreationDate = DateHandlers.LifToDateTime(lifSb.creationDate), - VolumeName = StringHandlers.CToString(lifSb.volumeLabel, Encoding) + VolumeName = StringHandlers.CToString(lifSb.volumeLabel, encoding) }; } } \ No newline at end of file diff --git a/Aaru.Filesystems/LIF/LIF.cs b/Aaru.Filesystems/LIF/LIF.cs index db94eb029..f62345fc6 100644 --- a/Aaru.Filesystems/LIF/LIF.cs +++ b/Aaru.Filesystems/LIF/LIF.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -37,8 +36,6 @@ namespace Aaru.Filesystems; /// Implements detection of the LIF filesystem public sealed partial class LIF : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.LIF_Name; /// diff --git a/Aaru.Filesystems/LisaFS/Dir.cs b/Aaru.Filesystems/LisaFS/Dir.cs index 9966f2287..5ee672920 100644 --- a/Aaru.Filesystems/LisaFS/Dir.cs +++ b/Aaru.Filesystems/LisaFS/Dir.cs @@ -92,7 +92,7 @@ public sealed partial class LisaFS // Do same trick as Mac OS X, replace filesystem '/' with '-', // as '-' is the path separator in Lisa OS contents = (from entry in _catalogCache where entry.parentID == dirId - select StringHandlers.CToString(entry.filename, Encoding).Replace('/', '-')).ToList(); + select StringHandlers.CToString(entry.filename, _encoding).Replace('/', '-')).ToList(); /// Reads, interprets and caches the Catalog File ErrorNumber ReadCatalog() diff --git a/Aaru.Filesystems/LisaFS/Extent.cs b/Aaru.Filesystems/LisaFS/Extent.cs index a4d1f1dc4..4e901dea8 100644 --- a/Aaru.Filesystems/LisaFS/Extent.cs +++ b/Aaru.Filesystems/LisaFS/Extent.cs @@ -217,7 +217,7 @@ public sealed partial class LisaFS AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen); AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filename = {1}", fileId, - StringHandlers.CToString(file.filename, Encoding)); + StringHandlers.CToString(file.filename, _encoding)); AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown1 = 0x{1:X4}", fileId, file.unknown1); AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid); @@ -257,7 +257,7 @@ public sealed partial class LisaFS file.password_valid > 0); AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].password = {1}", fileId, - Encoding.GetString(file.password)); + _encoding.GetString(file.password)); AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown7 = 0x{1:X2}{2:X2}{3:X2}", fileId, file.unknown7[0], file.unknown7[1], file.unknown7[2]); diff --git a/Aaru.Filesystems/LisaFS/File.cs b/Aaru.Filesystems/LisaFS/File.cs index e7c96d154..d10b1c22f 100644 --- a/Aaru.Filesystems/LisaFS/File.cs +++ b/Aaru.Filesystems/LisaFS/File.cs @@ -523,7 +523,7 @@ public sealed partial class LisaFS foreach(CatalogEntry entry in _catalogCache) { - string filename = StringHandlers.CToString(entry.filename, Encoding); + string filename = StringHandlers.CToString(entry.filename, _encoding); // LisaOS is case insensitive if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) != 0 || diff --git a/Aaru.Filesystems/LisaFS/Info.cs b/Aaru.Filesystems/LisaFS/Info.cs index ac81e1d51..0338d8030 100644 --- a/Aaru.Filesystems/LisaFS/Info.cs +++ b/Aaru.Filesystems/LisaFS/Info.cs @@ -129,7 +129,7 @@ public sealed partial class LisaFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = new LisaRoman(); + _encoding = new LisaRoman(); information = ""; metadata = new FileSystem(); var sb = new StringBuilder(); @@ -174,12 +174,12 @@ public sealed partial class LisaFS infoMddf.volid = BigEndianBitConverter.ToUInt64(sector, 0x02); infoMddf.volnum = BigEndianBitConverter.ToUInt16(sector, 0x0A); Array.Copy(sector, 0x0C, pString, 0, 33); - infoMddf.volname = StringHandlers.PascalToString(pString, Encoding); + infoMddf.volname = StringHandlers.PascalToString(pString, encoding); infoMddf.unknown1 = sector[0x2D]; Array.Copy(sector, 0x2E, pString, 0, 33); // Prevent garbage - infoMddf.password = pString[0] <= 32 ? StringHandlers.PascalToString(pString, Encoding) : ""; + infoMddf.password = pString[0] <= 32 ? StringHandlers.PascalToString(pString, encoding) : ""; infoMddf.unknown2 = sector[0x4F]; infoMddf.machine_id = BigEndianBitConverter.ToUInt32(sector, 0x50); infoMddf.master_copy_id = BigEndianBitConverter.ToUInt32(sector, 0x54); diff --git a/Aaru.Filesystems/LisaFS/LisaFS.cs b/Aaru.Filesystems/LisaFS/LisaFS.cs index 4a3af75da..a92e3d4fb 100644 --- a/Aaru.Filesystems/LisaFS/LisaFS.cs +++ b/Aaru.Filesystems/LisaFS/LisaFS.cs @@ -47,6 +47,7 @@ public sealed partial class LisaFS : IReadOnlyFilesystem bool _mounted; SRecord[] _srecords; ulong _volumePrefix; + Encoding _encoding; /// public string Name => "Apple Lisa File System"; @@ -55,8 +56,6 @@ public sealed partial class LisaFS : IReadOnlyFilesystem /// public Guid Id => new("7E6034D1-D823-4248-A54D-239742B28391"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; // TODO: Implement Lisa 7/7 namespace (needs decoding {!CATALOG} file) diff --git a/Aaru.Filesystems/LisaFS/Super.cs b/Aaru.Filesystems/LisaFS/Super.cs index 4b1997f37..6b901d6f0 100644 --- a/Aaru.Filesystems/LisaFS/Super.cs +++ b/Aaru.Filesystems/LisaFS/Super.cs @@ -49,8 +49,8 @@ public sealed partial class LisaFS { try { - _device = imagePlugin; - Encoding = new LisaRoman(); + _device = imagePlugin; + _encoding = new LisaRoman(); // Lisa OS is unable to work on disks without tags. // This code is designed like that. @@ -105,12 +105,12 @@ public sealed partial class LisaFS _mddf.volid = BigEndianBitConverter.ToUInt64(sector, 0x02); _mddf.volnum = BigEndianBitConverter.ToUInt16(sector, 0x0A); Array.Copy(sector, 0x0C, pString, 0, 33); - _mddf.volname = StringHandlers.PascalToString(pString, Encoding); + _mddf.volname = StringHandlers.PascalToString(pString, _encoding); _mddf.unknown1 = sector[0x2D]; Array.Copy(sector, 0x2E, pString, 0, 33); // Prevent garbage - _mddf.password = pString[0] <= 32 ? StringHandlers.PascalToString(pString, Encoding) : ""; + _mddf.password = pString[0] <= 32 ? StringHandlers.PascalToString(pString, _encoding) : ""; _mddf.unknown2 = sector[0x4F]; _mddf.machine_id = BigEndianBitConverter.ToUInt32(sector, 0x50); _mddf.master_copy_id = BigEndianBitConverter.ToUInt32(sector, 0x54); diff --git a/Aaru.Filesystems/Locus/Info.cs b/Aaru.Filesystems/Locus/Info.cs index 209b181a3..a62bfdcdc 100644 --- a/Aaru.Filesystems/Locus/Info.cs +++ b/Aaru.Filesystems/Locus/Info.cs @@ -103,9 +103,9 @@ public sealed partial class Locus public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 512) return; @@ -156,10 +156,10 @@ public sealed partial class Locus int blockSize = locusSb.s_version == Version.SB_SB4096 ? 4096 : 1024; // ReSharper disable once InconsistentNaming - string s_fsmnt = StringHandlers.CToString(locusSb.s_fsmnt, Encoding); + string s_fsmnt = StringHandlers.CToString(locusSb.s_fsmnt, encoding); // ReSharper disable once InconsistentNaming - string s_fpack = StringHandlers.CToString(locusSb.s_fpack, Encoding); + string s_fpack = StringHandlers.CToString(locusSb.s_fpack, encoding); AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_magic = 0x{0:X8}", locusSb.s_magic); AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfs = {0}", locusSb.s_gfs); diff --git a/Aaru.Filesystems/Locus/Locus.cs b/Aaru.Filesystems/Locus/Locus.cs index de03da9ca..ddf02aef7 100644 --- a/Aaru.Filesystems/Locus/Locus.cs +++ b/Aaru.Filesystems/Locus/Locus.cs @@ -29,7 +29,6 @@ // Commit count using System; -using System.Text; using Aaru.CommonTypes.Interfaces; using commitcnt_t = System.Int32; @@ -60,8 +59,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Locus filesystem public sealed partial class Locus : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.Locus_Name; /// diff --git a/Aaru.Filesystems/MicroDOS/Info.cs b/Aaru.Filesystems/MicroDOS/Info.cs index cd363c48f..12ac05f1c 100644 --- a/Aaru.Filesystems/MicroDOS/Info.cs +++ b/Aaru.Filesystems/MicroDOS/Info.cs @@ -68,7 +68,6 @@ public sealed partial class MicroDOS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("koi8-r"); information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/MicroDOS/MicroDOS.cs b/Aaru.Filesystems/MicroDOS/MicroDOS.cs index 4439d5a14..d077a5d98 100644 --- a/Aaru.Filesystems/MicroDOS/MicroDOS.cs +++ b/Aaru.Filesystems/MicroDOS/MicroDOS.cs @@ -30,7 +30,6 @@ // ReSharper disable UnusedMember.Local using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -42,8 +41,6 @@ namespace Aaru.Filesystems; /// public sealed partial class MicroDOS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.MicroDOS_Name; /// diff --git a/Aaru.Filesystems/MinixFS/Info.cs b/Aaru.Filesystems/MinixFS/Info.cs index cc35bb8e1..0f0bf55ea 100644 --- a/Aaru.Filesystems/MinixFS/Info.cs +++ b/Aaru.Filesystems/MinixFS/Info.cs @@ -84,7 +84,6 @@ public sealed partial class MinixFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/MinixFS/MinixFS.cs b/Aaru.Filesystems/MinixFS/MinixFS.cs index b0566f13d..4a22a4e54 100644 --- a/Aaru.Filesystems/MinixFS/MinixFS.cs +++ b/Aaru.Filesystems/MinixFS/MinixFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -37,8 +36,6 @@ namespace Aaru.Filesystems; /// Implements detection of the MINIX filesystem public sealed partial class MinixFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.MinixFS_Name; /// diff --git a/Aaru.Filesystems/NILFS2/Info.cs b/Aaru.Filesystems/NILFS2/Info.cs index 4b4fee7eb..930863559 100644 --- a/Aaru.Filesystems/NILFS2/Info.cs +++ b/Aaru.Filesystems/NILFS2/Info.cs @@ -77,9 +77,9 @@ public sealed partial class NILFS2 public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.UTF8; - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.UTF8; + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 512) return; @@ -124,7 +124,7 @@ public sealed partial class NILFS2 sb.AppendFormat(Localization._0_bytes_per_inode, nilfsSb.inode_size).AppendLine(); sb.AppendFormat(Localization.Volume_UUID_0, nilfsSb.uuid).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(nilfsSb.volume_name, Encoding)). + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(nilfsSb.volume_name, encoding)). AppendLine(); sb.AppendFormat(Localization.Volume_created_on_0, DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime)). @@ -142,7 +142,7 @@ public sealed partial class NILFS2 { Type = FS_TYPE, ClusterSize = (uint)(1 << (int)(nilfsSb.log_block_size + 10)), - VolumeName = StringHandlers.CToString(nilfsSb.volume_name, Encoding), + VolumeName = StringHandlers.CToString(nilfsSb.volume_name, encoding), VolumeSerial = nilfsSb.uuid.ToString(), CreationDate = DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime), ModificationDate = DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime) diff --git a/Aaru.Filesystems/NILFS2/NILFS2.cs b/Aaru.Filesystems/NILFS2/NILFS2.cs index 635c042e2..d0debcef3 100644 --- a/Aaru.Filesystems/NILFS2/NILFS2.cs +++ b/Aaru.Filesystems/NILFS2/NILFS2.cs @@ -29,7 +29,6 @@ // ReSharper disable UnusedMember.Local using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -38,8 +37,6 @@ namespace Aaru.Filesystems; /// Implements detection of the New Implementation of a Log-structured File System v2 public sealed partial class NILFS2 : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.NILFS2_Name; /// diff --git a/Aaru.Filesystems/NTFS/Info.cs b/Aaru.Filesystems/NTFS/Info.cs index 8269bd75a..4cfbba84d 100644 --- a/Aaru.Filesystems/NTFS/Info.cs +++ b/Aaru.Filesystems/NTFS/Info.cs @@ -78,7 +78,6 @@ public sealed partial class NTFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = Encoding.Unicode; information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/NTFS/NTFS.cs b/Aaru.Filesystems/NTFS/NTFS.cs index 98c9e4b83..a42ae2542 100644 --- a/Aaru.Filesystems/NTFS/NTFS.cs +++ b/Aaru.Filesystems/NTFS/NTFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -37,8 +36,6 @@ namespace Aaru.Filesystems; /// Implements detection of the New Technology File System (NTFS) public sealed partial class NTFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.NTFS_Name; /// diff --git a/Aaru.Filesystems/Nintendo/Info.cs b/Aaru.Filesystems/Nintendo/Info.cs index 1584a05fa..3481249cf 100644 --- a/Aaru.Filesystems/Nintendo/Info.cs +++ b/Aaru.Filesystems/Nintendo/Info.cs @@ -65,7 +65,7 @@ public sealed partial class NintendoPlugin public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("shift_jis"); + encoding ??= Encoding.GetEncoding("shift_jis"); var sbInformation = new StringBuilder(); information = ""; metadata = new FileSystem(); @@ -98,7 +98,7 @@ public sealed partial class NintendoPlugin fields.StreamBufferSize = header[9]; byte[] temp = new byte[64]; Array.Copy(header, 0x20, temp, 0, 64); - fields.Title = StringHandlers.CToString(temp, Encoding); + fields.Title = StringHandlers.CToString(temp, encoding); if(!wii) { diff --git a/Aaru.Filesystems/Nintendo/Nintendo.cs b/Aaru.Filesystems/Nintendo/Nintendo.cs index 5f56af2ed..16183cbed 100644 --- a/Aaru.Filesystems/Nintendo/Nintendo.cs +++ b/Aaru.Filesystems/Nintendo/Nintendo.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of the filesystem used by Nintendo Gamecube and Wii discs public sealed partial class NintendoPlugin : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.NintendoPlugin_Name; /// diff --git a/Aaru.Filesystems/ODS/Info.cs b/Aaru.Filesystems/ODS/Info.cs index 3e75880ea..c2b17816f 100644 --- a/Aaru.Filesystems/ODS/Info.cs +++ b/Aaru.Filesystems/ODS/Info.cs @@ -101,9 +101,9 @@ public sealed partial class ODS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-1"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -147,7 +147,7 @@ public sealed partial class ODS sb.AppendLine(Localization.This_volume_may_be_corrupted); sb.AppendFormat(Localization.Volume_format_is_0, - StringHandlers.SpacePaddedToString(homeblock.format, Encoding)).AppendLine(); + StringHandlers.SpacePaddedToString(homeblock.format, encoding)).AppendLine(); sb.AppendFormat(Localization.Volume_is_Level_0_revision_1, (homeblock.struclev & 0xFF00) >> 8, homeblock.struclev & 0xFF).AppendLine(); @@ -182,13 +182,13 @@ public sealed partial class ODS if(homeblock is { rvn: > 0, setcount: > 0 } && StringHandlers.CToString(homeblock.strucname) != " ") sb.AppendFormat(Localization.Volume_is_0_of_1_in_set_2, homeblock.rvn, homeblock.setcount, - StringHandlers.SpacePaddedToString(homeblock.strucname, Encoding)).AppendLine(); + StringHandlers.SpacePaddedToString(homeblock.strucname, encoding)).AppendLine(); sb.AppendFormat(Localization.Volume_owner_is_0_ID_1, - StringHandlers.SpacePaddedToString(homeblock.ownername, Encoding), homeblock.volowner). + StringHandlers.SpacePaddedToString(homeblock.ownername, encoding), homeblock.volowner). AppendLine(); - sb.AppendFormat(Localization.Volume_label_0, StringHandlers.SpacePaddedToString(homeblock.volname, Encoding)). + sb.AppendFormat(Localization.Volume_label_0, StringHandlers.SpacePaddedToString(homeblock.volname, encoding)). AppendLine(); sb.AppendFormat(Localization.Drive_serial_number_0, homeblock.serialnum).AppendLine(); @@ -264,7 +264,7 @@ public sealed partial class ODS Type = FS_TYPE, ClusterSize = (uint)(homeblock.cluster * 512), Clusters = partition.Size / (ulong)(homeblock.cluster * 512), - VolumeName = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding), + VolumeName = StringHandlers.SpacePaddedToString(homeblock.volname, encoding), VolumeSerial = $"{homeblock.serialnum:X8}" }; diff --git a/Aaru.Filesystems/ODS/ODS.cs b/Aaru.Filesystems/ODS/ODS.cs index 79a0d6e16..50d5d2737 100644 --- a/Aaru.Filesystems/ODS/ODS.cs +++ b/Aaru.Filesystems/ODS/ODS.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -49,8 +48,6 @@ namespace Aaru.Filesystems; /// Implements detection of DEC's On-Disk Structure, aka the ODS filesystem public sealed partial class ODS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.ODS_Name; /// diff --git a/Aaru.Filesystems/Opera/Dir.cs b/Aaru.Filesystems/Opera/Dir.cs index b51e1c34a..0515117da 100644 --- a/Aaru.Filesystems/Opera/Dir.cs +++ b/Aaru.Filesystems/Opera/Dir.cs @@ -136,7 +136,7 @@ public sealed partial class OperaFS while(off + _directoryEntrySize < data.Length) { entry = Marshal.ByteArrayToStructureBigEndian(data, off, _directoryEntrySize); - string name = StringHandlers.CToString(entry.name, Encoding); + string name = StringHandlers.CToString(entry.name, _encoding); var entryWithPointers = new DirectoryEntryWithPointers { diff --git a/Aaru.Filesystems/Opera/Info.cs b/Aaru.Filesystems/Opera/Info.cs index d3c08bcd5..1b8a3f222 100644 --- a/Aaru.Filesystems/Opera/Info.cs +++ b/Aaru.Filesystems/Opera/Info.cs @@ -67,7 +67,7 @@ public sealed partial class OperaFS out FileSystem metadata) { // TODO: Find correct default encoding - Encoding = Encoding.ASCII; + encoding = Encoding.ASCII; information = ""; metadata = new FileSystem(); var superBlockmetadata = new StringBuilder(); @@ -88,14 +88,14 @@ public sealed partial class OperaFS superBlockmetadata.AppendFormat(Localization.Opera_filesystem_disc).AppendLine(); - if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_label, Encoding))) + if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_label, encoding))) superBlockmetadata. - AppendFormat(Localization.Volume_label_0, StringHandlers.CToString(sb.volume_label, Encoding)). + AppendFormat(Localization.Volume_label_0, StringHandlers.CToString(sb.volume_label, encoding)). AppendLine(); - if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_comment, Encoding))) + if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_comment, encoding))) superBlockmetadata. - AppendFormat(Localization.Volume_comment_0, StringHandlers.CToString(sb.volume_comment, Encoding)). + AppendFormat(Localization.Volume_comment_0, StringHandlers.CToString(sb.volume_comment, encoding)). AppendLine(); superBlockmetadata.AppendFormat(Localization.Volume_identifier_0_X8, sb.volume_id).AppendLine(); @@ -135,7 +135,7 @@ public sealed partial class OperaFS metadata = new FileSystem { Type = FS_TYPE, - VolumeName = StringHandlers.CToString(sb.volume_label, Encoding), + VolumeName = StringHandlers.CToString(sb.volume_label, encoding), ClusterSize = sb.block_size, Clusters = sb.block_count }; diff --git a/Aaru.Filesystems/Opera/Opera.cs b/Aaru.Filesystems/Opera/Opera.cs index dc8019c7c..1f96ad3ae 100644 --- a/Aaru.Filesystems/Opera/Opera.cs +++ b/Aaru.Filesystems/Opera/Opera.cs @@ -47,9 +47,8 @@ public sealed partial class OperaFS : IReadOnlyFilesystem Dictionary _rootDirectoryCache; FileSystemInfo _statfs; uint _volumeBlockSizeRatio; + Encoding _encoding; - /// - public Encoding Encoding { get; private set; } /// public FileSystem Metadata { get; private set; } /// diff --git a/Aaru.Filesystems/Opera/Super.cs b/Aaru.Filesystems/Opera/Super.cs index fc5f707ec..545a60c9b 100644 --- a/Aaru.Filesystems/Opera/Super.cs +++ b/Aaru.Filesystems/Opera/Super.cs @@ -44,7 +44,7 @@ public sealed partial class OperaFS Dictionary options, string @namespace) { // TODO: Find correct default encoding - Encoding = Encoding.ASCII; + _encoding = Encoding.ASCII; options ??= GetDefaultOptions(); @@ -73,7 +73,7 @@ public sealed partial class OperaFS Metadata = new FileSystem { Type = FS_TYPE, - VolumeName = StringHandlers.CToString(sb.volume_label, Encoding), + VolumeName = StringHandlers.CToString(sb.volume_label, _encoding), ClusterSize = sb.block_size, Clusters = sb.block_count, Bootable = true, diff --git a/Aaru.Filesystems/PCEngine/Info.cs b/Aaru.Filesystems/PCEngine/Info.cs index 500612dfa..028731b33 100644 --- a/Aaru.Filesystems/PCEngine/Info.cs +++ b/Aaru.Filesystems/PCEngine/Info.cs @@ -64,7 +64,6 @@ public sealed partial class PCEnginePlugin public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("shift_jis"); information = ""; metadata = new FileSystem diff --git a/Aaru.Filesystems/PCEngine/PCEngine.cs b/Aaru.Filesystems/PCEngine/PCEngine.cs index f4b6a5d69..22bb6c435 100644 --- a/Aaru.Filesystems/PCEngine/PCEngine.cs +++ b/Aaru.Filesystems/PCEngine/PCEngine.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -40,8 +39,6 @@ namespace Aaru.Filesystems; /// Implements detection of the PC-Engine CD file headers public sealed partial class PCEnginePlugin : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.PCEnginePlugin_Name; /// diff --git a/Aaru.Filesystems/PCFX/Info.cs b/Aaru.Filesystems/PCFX/Info.cs index 8573d4a8a..815fe85e2 100644 --- a/Aaru.Filesystems/PCFX/Info.cs +++ b/Aaru.Filesystems/PCFX/Info.cs @@ -67,7 +67,7 @@ public sealed partial class PCFX out FileSystem metadata) { // Always Shift-JIS - Encoding = Encoding.GetEncoding("shift_jis"); + encoding = Encoding.GetEncoding("shift_jis"); information = ""; metadata = new FileSystem(); @@ -83,7 +83,7 @@ public sealed partial class PCFX try { - date = Encoding.GetString(header.date); + date = encoding.GetString(header.date); int year = int.Parse(date[..4]); int month = int.Parse(date.Substring(4, 2)); int day = int.Parse(date.Substring(6, 2)); @@ -96,11 +96,11 @@ public sealed partial class PCFX var sb = new StringBuilder(); sb.AppendLine(Localization.PC_FX_executable); - sb.AppendFormat(Localization.Identifier_0, StringHandlers.CToString(header.signature, Encoding)).AppendLine(); - sb.AppendFormat(Localization.Copyright_0, StringHandlers.CToString(header.copyright, Encoding)).AppendLine(); - sb.AppendFormat(Localization.Title_0, StringHandlers.CToString(header.title, Encoding)).AppendLine(); - sb.AppendFormat(Localization.Maker_ID_0, StringHandlers.CToString(header.makerId, Encoding)).AppendLine(); - sb.AppendFormat(Localization.Maker_name_0, StringHandlers.CToString(header.makerName, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Identifier_0, StringHandlers.CToString(header.signature, encoding)).AppendLine(); + sb.AppendFormat(Localization.Copyright_0, StringHandlers.CToString(header.copyright, encoding)).AppendLine(); + sb.AppendFormat(Localization.Title_0, StringHandlers.CToString(header.title, encoding)).AppendLine(); + sb.AppendFormat(Localization.Maker_ID_0, StringHandlers.CToString(header.makerId, encoding)).AppendLine(); + sb.AppendFormat(Localization.Maker_name_0, StringHandlers.CToString(header.makerName, encoding)).AppendLine(); sb.AppendFormat(Localization.Volume_number_0, header.volumeNumber).AppendLine(); sb.AppendFormat(Localization.Country_code_0, header.country).AppendLine(); sb.AppendFormat(Localization.Version_0_1, header.minorVersion, header.majorVersion).AppendLine(); @@ -121,8 +121,8 @@ public sealed partial class PCFX ClusterSize = 2048, Bootable = true, CreationDate = date != null ? dateTime : null, - PublisherIdentifier = StringHandlers.CToString(header.makerName, Encoding), - VolumeName = StringHandlers.CToString(header.title, Encoding), + PublisherIdentifier = StringHandlers.CToString(header.makerName, encoding), + VolumeName = StringHandlers.CToString(header.title, encoding), SystemIdentifier = "PC-FX" }; } diff --git a/Aaru.Filesystems/PCFX/PCFX.cs b/Aaru.Filesystems/PCFX/PCFX.cs index 428a0d97a..b9cbaf7c8 100644 --- a/Aaru.Filesystems/PCFX/PCFX.cs +++ b/Aaru.Filesystems/PCFX/PCFX.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,8 +40,6 @@ namespace Aaru.Filesystems; /// Implements detection of NEC PC-FX headers public sealed partial class PCFX : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.PCFX_Name; /// diff --git a/Aaru.Filesystems/PFS/Info.cs b/Aaru.Filesystems/PFS/Info.cs index c985286e9..f457d63ee 100644 --- a/Aaru.Filesystems/PFS/Info.cs +++ b/Aaru.Filesystems/PFS/Info.cs @@ -61,9 +61,9 @@ public sealed partial class PFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - information = ""; - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1"); - metadata = new FileSystem(); + information = ""; + encoding ??= Encoding.GetEncoding("iso-8859-1"); + metadata = new FileSystem(); ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] rootBlockSector); if(errno != ErrorNumber.NoError) @@ -101,7 +101,7 @@ public sealed partial class PFS sbInformation.AppendLine(); sbInformation. - AppendFormat(Localization.Volume_name_0, StringHandlers.PascalToString(rootBlock.diskname, Encoding)). + AppendFormat(Localization.Volume_name_0, StringHandlers.PascalToString(rootBlock.diskname, encoding)). AppendLine(); sbInformation. @@ -124,6 +124,6 @@ public sealed partial class PFS metadata.FreeClusters = rootBlock.blocksfree; metadata.Clusters = rootBlock.diskSize; metadata.ClusterSize = imagePlugin.Info.SectorSize; - metadata.VolumeName = StringHandlers.PascalToString(rootBlock.diskname, Encoding); + metadata.VolumeName = StringHandlers.PascalToString(rootBlock.diskname, encoding); } } \ No newline at end of file diff --git a/Aaru.Filesystems/PFS/PFS.cs b/Aaru.Filesystems/PFS/PFS.cs index d43c1a5c3..4c2d87542 100644 --- a/Aaru.Filesystems/PFS/PFS.cs +++ b/Aaru.Filesystems/PFS/PFS.cs @@ -29,7 +29,6 @@ // ReSharper disable UnusedType.Local using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -38,8 +37,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Professional File System public sealed partial class PFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.PFS_Name; /// diff --git a/Aaru.Filesystems/ProDOS/Info.cs b/Aaru.Filesystems/ProDOS/Info.cs index 78c04c9c2..75457b108 100644 --- a/Aaru.Filesystems/ProDOS/Info.cs +++ b/Aaru.Filesystems/ProDOS/Info.cs @@ -131,9 +131,9 @@ public sealed partial class ProDOSPlugin public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? new Apple2c(); - information = ""; - metadata = new FileSystem(); + encoding ??= new Apple2c(); + information = ""; + metadata = new FileSystem(); var sbInformation = new StringBuilder(); uint multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1); @@ -179,7 +179,7 @@ public sealed partial class ProDOSPlugin rootDirectoryKeyBlock.header.name_length = (byte)(rootDirectoryKeyBlockBytes[0x04] & NAME_LENGTH_MASK); byte[] temporal = new byte[rootDirectoryKeyBlock.header.name_length]; Array.Copy(rootDirectoryKeyBlockBytes, 0x05, temporal, 0, rootDirectoryKeyBlock.header.name_length); - rootDirectoryKeyBlock.header.volume_name = Encoding.GetString(temporal); + rootDirectoryKeyBlock.header.volume_name = encoding.GetString(temporal); rootDirectoryKeyBlock.header.reserved = BitConverter.ToUInt64(rootDirectoryKeyBlockBytes, 0x14); ushort tempTimestampLeft = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x1C); diff --git a/Aaru.Filesystems/ProDOS/ProDOS.cs b/Aaru.Filesystems/ProDOS/ProDOS.cs index 842a57e37..136e8f7e3 100644 --- a/Aaru.Filesystems/ProDOS/ProDOS.cs +++ b/Aaru.Filesystems/ProDOS/ProDOS.cs @@ -30,7 +30,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,8 +40,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")] public sealed partial class ProDOSPlugin : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.ProDOSPlugin_Name; /// diff --git a/Aaru.Filesystems/QNX4/Info.cs b/Aaru.Filesystems/QNX4/Info.cs index ab26cfae6..c07ec5f1d 100644 --- a/Aaru.Filesystems/QNX4/Info.cs +++ b/Aaru.Filesystems/QNX4/Info.cs @@ -87,7 +87,6 @@ public sealed partial class QNX4 public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); information = ""; metadata = new FileSystem(); ErrorNumber errno = imagePlugin.ReadSector(partition.Start + 1, out byte[] sector); diff --git a/Aaru.Filesystems/QNX4/QNX4.cs b/Aaru.Filesystems/QNX4/QNX4.cs index c3f4133ca..51446d13a 100644 --- a/Aaru.Filesystems/QNX4/QNX4.cs +++ b/Aaru.Filesystems/QNX4/QNX4.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -38,8 +37,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedType.Local")] public sealed partial class QNX4 : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.QNX4_Name; /// diff --git a/Aaru.Filesystems/QNX6/Info.cs b/Aaru.Filesystems/QNX6/Info.cs index bba7fd53c..3149a3042 100644 --- a/Aaru.Filesystems/QNX6/Info.cs +++ b/Aaru.Filesystems/QNX6/Info.cs @@ -72,7 +72,6 @@ public sealed partial class QNX6 public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); information = ""; metadata = new FileSystem(); var sb = new StringBuilder(); diff --git a/Aaru.Filesystems/QNX6/QNX6.cs b/Aaru.Filesystems/QNX6/QNX6.cs index 6b07098e9..fcaa4379a 100644 --- a/Aaru.Filesystems/QNX6/QNX6.cs +++ b/Aaru.Filesystems/QNX6/QNX6.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of QNX 6 filesystem public sealed partial class QNX6 : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.QNX6_Name; /// diff --git a/Aaru.Filesystems/RBF/Info.cs b/Aaru.Filesystems/RBF/Info.cs index bca3a599c..e9d163af4 100644 --- a/Aaru.Filesystems/RBF/Info.cs +++ b/Aaru.Filesystems/RBF/Info.cs @@ -90,9 +90,9 @@ public sealed partial class RBF : IFilesystem public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 256) return; @@ -191,7 +191,7 @@ public sealed partial class RBF : IFilesystem sb.AppendFormat(Localization.Volume_identification_block_was_last_written_on_0, DateHandlers.UnixToDateTime(rbf9000Sb.rid_mtime)).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(rbf9000Sb.rid_name, Encoding)). + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(rbf9000Sb.rid_name, encoding)). AppendLine(); metadata = new FileSystem @@ -202,7 +202,7 @@ public sealed partial class RBF : IFilesystem Clusters = rbf9000Sb.rid_totblocks, CreationDate = DateHandlers.UnixToDateTime(rbf9000Sb.rid_ctime), ModificationDate = DateHandlers.UnixToDateTime(rbf9000Sb.rid_mtime), - VolumeName = StringHandlers.CToString(rbf9000Sb.rid_name, Encoding), + VolumeName = StringHandlers.CToString(rbf9000Sb.rid_name, encoding), VolumeSerial = $"{rbf9000Sb.rid_diskid:X8}" }; } @@ -252,9 +252,9 @@ public sealed partial class RBF : IFilesystem AppendLine(); sb.AppendFormat(Localization.Volume_attributes_0, rbfSb.dd_att).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(rbfSb.dd_nam, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(rbfSb.dd_nam, encoding)).AppendLine(); - sb.AppendFormat(Localization.Path_descriptor_options_0, StringHandlers.CToString(rbfSb.dd_opt, Encoding)). + sb.AppendFormat(Localization.Path_descriptor_options_0, StringHandlers.CToString(rbfSb.dd_opt, encoding)). AppendLine(); metadata = new FileSystem @@ -264,7 +264,7 @@ public sealed partial class RBF : IFilesystem ClusterSize = (uint)(rbfSb.dd_bit * (256 << rbfSb.dd_lsnsize)), Clusters = LSNToUInt32(rbfSb.dd_tot), CreationDate = DateHandlers.Os9ToDateTime(rbfSb.dd_dat), - VolumeName = StringHandlers.CToString(rbfSb.dd_nam, Encoding), + VolumeName = StringHandlers.CToString(rbfSb.dd_nam, encoding), VolumeSerial = $"{rbfSb.dd_dsk:X4}" }; } diff --git a/Aaru.Filesystems/RBF/RBF.cs b/Aaru.Filesystems/RBF/RBF.cs index e6af243b1..4a549b2de 100644 --- a/Aaru.Filesystems/RBF/RBF.cs +++ b/Aaru.Filesystems/RBF/RBF.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Locus filesystem public sealed partial class RBF : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.RBF_Name; /// diff --git a/Aaru.Filesystems/RT11/Info.cs b/Aaru.Filesystems/RT11/Info.cs index 36015e612..2cbdf85be 100644 --- a/Aaru.Filesystems/RT11/Info.cs +++ b/Aaru.Filesystems/RT11/Info.cs @@ -72,7 +72,7 @@ public sealed partial class RT11 public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = new Radix50(); + encoding = new Radix50(); information = ""; metadata = new FileSystem(); @@ -106,8 +106,8 @@ public sealed partial class RT11 AppendLine(); sb.AppendFormat(Localization.First_directory_segment_starts_at_block_0, homeblock.rootBlock).AppendLine(); - sb.AppendFormat(Localization.Volume_owner_is_0, Encoding.GetString(homeblock.ownername).TrimEnd()).AppendLine(); - sb.AppendFormat(Localization.Volume_label_0, Encoding.GetString(homeblock.volname).TrimEnd()).AppendLine(); + sb.AppendFormat(Localization.Volume_owner_is_0, encoding.GetString(homeblock.ownername).TrimEnd()).AppendLine(); + sb.AppendFormat(Localization.Volume_label_0, encoding.GetString(homeblock.volname).TrimEnd()).AppendLine(); sb.AppendFormat(Localization.Checksum_0_calculated_1, homeblock.checksum, check).AppendLine(); imagePlugin.ReadSector(0, out byte[] bootBlock); @@ -117,7 +117,7 @@ public sealed partial class RT11 Type = FS_TYPE, ClusterSize = (uint)(homeblock.cluster * 512), Clusters = homeblock.cluster, - VolumeName = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding), + VolumeName = StringHandlers.SpacePaddedToString(homeblock.volname, encoding), Bootable = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlock) }; diff --git a/Aaru.Filesystems/RT11/RT11.cs b/Aaru.Filesystems/RT11/RT11.cs index 558889d3b..11f88f5e8 100644 --- a/Aaru.Filesystems/RT11/RT11.cs +++ b/Aaru.Filesystems/RT11/RT11.cs @@ -31,7 +31,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,8 +40,6 @@ namespace Aaru.Filesystems; /// Implements detection of the DEC RT-11 filesystem public sealed partial class RT11 : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.RT11_Name; /// diff --git a/Aaru.Filesystems/ReFS/Info.cs b/Aaru.Filesystems/ReFS/Info.cs index b93d5eb9b..6fa59d8d2 100644 --- a/Aaru.Filesystems/ReFS/Info.cs +++ b/Aaru.Filesystems/ReFS/Info.cs @@ -71,7 +71,6 @@ public sealed partial class ReFS : IFilesystem public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = Encoding.UTF8; information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/ReFS/ReFS.cs b/Aaru.Filesystems/ReFS/ReFS.cs index 2ea569c4e..46b256b52 100644 --- a/Aaru.Filesystems/ReFS/ReFS.cs +++ b/Aaru.Filesystems/ReFS/ReFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,7 +40,5 @@ public sealed partial class ReFS : IFilesystem /// public Guid Id => new("37766C4E-EBF5-4113-A712-B758B756ABD6"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; } \ No newline at end of file diff --git a/Aaru.Filesystems/Reiser/Info.cs b/Aaru.Filesystems/Reiser/Info.cs index 8a3fffd65..e9e7756c7 100644 --- a/Aaru.Filesystems/Reiser/Info.cs +++ b/Aaru.Filesystems/Reiser/Info.cs @@ -77,9 +77,9 @@ public sealed partial class Reiser : IFilesystem public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 512) return; @@ -133,7 +133,7 @@ public sealed partial class Reiser : IFilesystem if(reiserSb.version >= 2) { sb.AppendFormat(Localization.Volume_UUID_0, reiserSb.uuid).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, Encoding.GetString(reiserSb.label)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, encoding.GetString(reiserSb.label)).AppendLine(); } information = sb.ToString(); @@ -150,7 +150,7 @@ public sealed partial class Reiser : IFilesystem if(reiserSb.version < 2) return; - metadata.VolumeName = StringHandlers.CToString(reiserSb.label, Encoding); + metadata.VolumeName = StringHandlers.CToString(reiserSb.label, encoding); metadata.VolumeSerial = reiserSb.uuid.ToString(); } } \ No newline at end of file diff --git a/Aaru.Filesystems/Reiser/Reiser.cs b/Aaru.Filesystems/Reiser/Reiser.cs index d1cffe58c..f502d1515 100644 --- a/Aaru.Filesystems/Reiser/Reiser.cs +++ b/Aaru.Filesystems/Reiser/Reiser.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Reiser v3 filesystem public sealed partial class Reiser : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.Reiser_Name; /// diff --git a/Aaru.Filesystems/Reiser4/Info.cs b/Aaru.Filesystems/Reiser4/Info.cs index 6898deeb5..93ce469ed 100644 --- a/Aaru.Filesystems/Reiser4/Info.cs +++ b/Aaru.Filesystems/Reiser4/Info.cs @@ -76,9 +76,9 @@ public sealed partial class Reiser4 public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 512) return; @@ -112,7 +112,7 @@ public sealed partial class Reiser4 sb.AppendFormat(Localization._0_bytes_per_block, reiserSb.blocksize).AppendLine(); sb.AppendFormat(Localization.Volume_disk_format_0, reiserSb.diskformat).AppendLine(); sb.AppendFormat(Localization.Volume_UUID_0, reiserSb.uuid).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(reiserSb.label, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(reiserSb.label, encoding)).AppendLine(); information = sb.ToString(); @@ -121,7 +121,7 @@ public sealed partial class Reiser4 Type = FS_TYPE, ClusterSize = reiserSb.blocksize, Clusters = (partition.End - partition.Start) * imagePlugin.Info.SectorSize / reiserSb.blocksize, - VolumeName = StringHandlers.CToString(reiserSb.label, Encoding), + VolumeName = StringHandlers.CToString(reiserSb.label, encoding), VolumeSerial = reiserSb.uuid.ToString() }; } diff --git a/Aaru.Filesystems/Reiser4/Reiser4.cs b/Aaru.Filesystems/Reiser4/Reiser4.cs index 8560f0a00..4b593d43d 100644 --- a/Aaru.Filesystems/Reiser4/Reiser4.cs +++ b/Aaru.Filesystems/Reiser4/Reiser4.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Reiser v4 filesystem public sealed partial class Reiser4 : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.Reiser4_Name; /// diff --git a/Aaru.Filesystems/SFS/Info.cs b/Aaru.Filesystems/SFS/Info.cs index b05081185..6f7789bd3 100644 --- a/Aaru.Filesystems/SFS/Info.cs +++ b/Aaru.Filesystems/SFS/Info.cs @@ -60,7 +60,6 @@ public sealed partial class SFS out FileSystem metadata) { information = ""; - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1"); metadata = new FileSystem(); ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] rootBlockSector); diff --git a/Aaru.Filesystems/SFS/SFS.cs b/Aaru.Filesystems/SFS/SFS.cs index e1dea6ab4..825cf3076 100644 --- a/Aaru.Filesystems/SFS/SFS.cs +++ b/Aaru.Filesystems/SFS/SFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Smart File System public sealed partial class SFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.SFS_Name; /// diff --git a/Aaru.Filesystems/SolarFS/Info.cs b/Aaru.Filesystems/SolarFS/Info.cs index e925a8130..651a58351 100644 --- a/Aaru.Filesystems/SolarFS/Info.cs +++ b/Aaru.Filesystems/SolarFS/Info.cs @@ -66,9 +66,9 @@ public sealed partial class SolarFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bpbSector); @@ -93,10 +93,10 @@ public sealed partial class SolarFS bpb.OEMName = StringHandlers.CToString(bpbStrings); bpbStrings = new byte[8]; Array.Copy(bpbSector, 0x2A, bpbStrings, 0, 11); - bpb.vol_name = StringHandlers.CToString(bpbStrings, Encoding); + bpb.vol_name = StringHandlers.CToString(bpbStrings, encoding); bpbStrings = new byte[8]; Array.Copy(bpbSector, 0x35, bpbStrings, 0, 8); - bpb.fs_type = StringHandlers.CToString(bpbStrings, Encoding); + bpb.fs_type = StringHandlers.CToString(bpbStrings, encoding); bpb.x86_jump = new byte[3]; Array.Copy(bpbSector, 0x00, bpb.x86_jump, 0, 3); diff --git a/Aaru.Filesystems/SolarFS/SolarFS.cs b/Aaru.Filesystems/SolarFS/SolarFS.cs index e8d3fe4ff..2ac282f38 100644 --- a/Aaru.Filesystems/SolarFS/SolarFS.cs +++ b/Aaru.Filesystems/SolarFS/SolarFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -37,8 +36,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Solar OS filesystem public sealed partial class SolarFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.SolarFS_Name; /// diff --git a/Aaru.Filesystems/Squash/Info.cs b/Aaru.Filesystems/Squash/Info.cs index 814237dfc..14c41a3b6 100644 --- a/Aaru.Filesystems/Squash/Info.cs +++ b/Aaru.Filesystems/Squash/Info.cs @@ -60,7 +60,6 @@ public sealed partial class Squash public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.UTF8; information = ""; metadata = new FileSystem(); ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector); diff --git a/Aaru.Filesystems/Squash/Squash.cs b/Aaru.Filesystems/Squash/Squash.cs index d67eeb24b..4a66ee673 100644 --- a/Aaru.Filesystems/Squash/Squash.cs +++ b/Aaru.Filesystems/Squash/Squash.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of the squash filesystem public sealed partial class Squash : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.Squash_Name; /// diff --git a/Aaru.Filesystems/SysV/Info.cs b/Aaru.Filesystems/SysV/Info.cs index 11223cb25..d159937c5 100644 --- a/Aaru.Filesystems/SysV/Info.cs +++ b/Aaru.Filesystems/SysV/Info.cs @@ -158,9 +158,9 @@ public sealed partial class SysVfs public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); bool bigEndian = false; // Start in little endian until we know what are we handling here @@ -275,9 +275,9 @@ public sealed partial class SysVfs byte[] coherent_string = new byte[6]; Array.Copy(sb_sector, 0x1E4, coherent_string, 0, 6); // Coherent UNIX s_fname location - string s_fname = StringHandlers.CToString(coherent_string, Encoding); + string s_fname = StringHandlers.CToString(coherent_string, encoding); Array.Copy(sb_sector, 0x1EA, coherent_string, 0, 6); // Coherent UNIX s_fpack location - string s_fpack = StringHandlers.CToString(coherent_string, Encoding); + string s_fpack = StringHandlers.CToString(coherent_string, encoding); if((s_fname == COH_FNAME && s_fpack == COH_FPACK) || (s_fname == COH_XXXXX && s_fpack == COH_XXXXX) || @@ -367,9 +367,9 @@ public sealed partial class SysVfs xnx_sb.s_dinfo0 = BitConverter.ToUInt16(sb_sector, 0x1AC); xnx_sb.s_dinfo1 = BitConverter.ToUInt16(sb_sector, 0x1AE); Array.Copy(sb_sector, 0x1B0, xenix_strings, 0, 6); - xnx_sb.s_fname = StringHandlers.CToString(xenix_strings, Encoding); + xnx_sb.s_fname = StringHandlers.CToString(xenix_strings, encoding); Array.Copy(sb_sector, 0x1B6, xenix_strings, 0, 6); - xnx_sb.s_fpack = StringHandlers.CToString(xenix_strings, Encoding); + xnx_sb.s_fpack = StringHandlers.CToString(xenix_strings, encoding); xnx_sb.s_clean = sb_sector[0x1BC]; xnx_sb.s_magic = BitConverter.ToUInt32(sb_sector, 0x1F0); xnx_sb.s_type = BitConverter.ToUInt32(sb_sector, 0x1F4); @@ -392,9 +392,9 @@ public sealed partial class SysVfs xnx_sb.s_dinfo0 = BitConverter.ToUInt16(sb_sector, 0x274); xnx_sb.s_dinfo1 = BitConverter.ToUInt16(sb_sector, 0x276); Array.Copy(sb_sector, 0x278, xenix_strings, 0, 6); - xnx_sb.s_fname = StringHandlers.CToString(xenix_strings, Encoding); + xnx_sb.s_fname = StringHandlers.CToString(xenix_strings, encoding); Array.Copy(sb_sector, 0x27E, xenix_strings, 0, 6); - xnx_sb.s_fpack = StringHandlers.CToString(xenix_strings, Encoding); + xnx_sb.s_fpack = StringHandlers.CToString(xenix_strings, encoding); xnx_sb.s_clean = sb_sector[0x284]; xnx_sb.s_magic = BitConverter.ToUInt32(sb_sector, 0x3F8); xnx_sb.s_type = BitConverter.ToUInt32(sb_sector, 0x3FC); @@ -580,9 +580,9 @@ public sealed partial class SysVfs sysv_sb.s_tfree = BitConverter.ToUInt32(sb_sector, 0x1B0 + offset); sysv_sb.s_tinode = BitConverter.ToUInt16(sb_sector, 0x1B4 + offset); Array.Copy(sb_sector, 0x1B6 + offset, sysv_strings, 0, 6); - sysv_sb.s_fname = StringHandlers.CToString(sysv_strings, Encoding); + sysv_sb.s_fname = StringHandlers.CToString(sysv_strings, encoding); Array.Copy(sb_sector, 0x1BC + offset, sysv_strings, 0, 6); - sysv_sb.s_fpack = StringHandlers.CToString(sysv_strings, Encoding); + sysv_sb.s_fpack = StringHandlers.CToString(sysv_strings, encoding); sb.AppendLine(Localization.System_V_Release_4_filesystem); metadata.Type = FS_TYPE_SVR4; } @@ -606,9 +606,9 @@ public sealed partial class SysVfs sysv_sb.s_tfree = BitConverter.ToUInt32(sb_sector, 0x1AA + offset); sysv_sb.s_tinode = BitConverter.ToUInt16(sb_sector, 0x1AE + offset); Array.Copy(sb_sector, 0x1B0 + offset, sysv_strings, 0, 6); - sysv_sb.s_fname = StringHandlers.CToString(sysv_strings, Encoding); + sysv_sb.s_fname = StringHandlers.CToString(sysv_strings, encoding); Array.Copy(sb_sector, 0x1B6 + offset, sysv_strings, 0, 6); - sysv_sb.s_fpack = StringHandlers.CToString(sysv_strings, Encoding); + sysv_sb.s_fpack = StringHandlers.CToString(sysv_strings, encoding); sb.AppendLine(Localization.System_V_Release_2_filesystem); metadata.Type = FS_TYPE_SVR2; } @@ -710,9 +710,9 @@ public sealed partial class SysVfs coh_sb.s_int_m = BitConverter.ToUInt16(sb_sector, 0x1E0); coh_sb.s_int_n = BitConverter.ToUInt16(sb_sector, 0x1E2); Array.Copy(sb_sector, 0x1E4, coh_strings, 0, 6); - coh_sb.s_fname = StringHandlers.CToString(coh_strings, Encoding); + coh_sb.s_fname = StringHandlers.CToString(coh_strings, encoding); Array.Copy(sb_sector, 0x1EA, coh_strings, 0, 6); - coh_sb.s_fpack = StringHandlers.CToString(coh_strings, Encoding); + coh_sb.s_fpack = StringHandlers.CToString(coh_strings, encoding); metadata.Type = FS_TYPE_COHERENT; metadata.ClusterSize = 512; @@ -786,9 +786,9 @@ public sealed partial class SysVfs v7_sb.s_int_m = BitConverter.ToUInt16(sb_sector, 0x1A8); v7_sb.s_int_n = BitConverter.ToUInt16(sb_sector, 0x1AA); Array.Copy(sb_sector, 0x1AC, sys7_strings, 0, 6); - v7_sb.s_fname = StringHandlers.CToString(sys7_strings, Encoding); + v7_sb.s_fname = StringHandlers.CToString(sys7_strings, encoding); Array.Copy(sb_sector, 0x1B2, sys7_strings, 0, 6); - v7_sb.s_fpack = StringHandlers.CToString(sys7_strings, Encoding); + v7_sb.s_fpack = StringHandlers.CToString(sys7_strings, encoding); metadata.Type = FS_TYPE_UNIX7; metadata.ClusterSize = 512; diff --git a/Aaru.Filesystems/SysV/SysV.cs b/Aaru.Filesystems/SysV/SysV.cs index 0232eb07d..c33c1fddb 100644 --- a/Aaru.Filesystems/SysV/SysV.cs +++ b/Aaru.Filesystems/SysV/SysV.cs @@ -30,7 +30,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -42,8 +41,6 @@ namespace Aaru.Filesystems; SuppressMessage("ReSharper", "UnusedType.Local")] public sealed partial class SysVfs : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.SysVfs_Name; /// diff --git a/Aaru.Filesystems/UCSDPascal/Dir.cs b/Aaru.Filesystems/UCSDPascal/Dir.cs index a85fe1af7..a596ff0ee 100644 --- a/Aaru.Filesystems/UCSDPascal/Dir.cs +++ b/Aaru.Filesystems/UCSDPascal/Dir.cs @@ -53,7 +53,7 @@ public sealed partial class PascalPlugin string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) return ErrorNumber.NotSupported; - contents = _fileEntries.Select(ent => StringHandlers.PascalToString(ent.Filename, Encoding)).ToList(); + contents = _fileEntries.Select(ent => StringHandlers.PascalToString(ent.Filename, _encoding)).ToList(); if(_debug) { diff --git a/Aaru.Filesystems/UCSDPascal/File.cs b/Aaru.Filesystems/UCSDPascal/File.cs index 10670f138..ad10b7b7d 100644 --- a/Aaru.Filesystems/UCSDPascal/File.cs +++ b/Aaru.Filesystems/UCSDPascal/File.cs @@ -186,7 +186,7 @@ public sealed partial class PascalPlugin foreach(PascalFileEntry ent in _fileEntries.Where(ent => string.Compare(path, StringHandlers.PascalToString(ent.Filename, - Encoding), + _encoding), StringComparison. InvariantCultureIgnoreCase) == 0)) { diff --git a/Aaru.Filesystems/UCSDPascal/Info.cs b/Aaru.Filesystems/UCSDPascal/Info.cs index 29d839f46..6034f243c 100644 --- a/Aaru.Filesystems/UCSDPascal/Info.cs +++ b/Aaru.Filesystems/UCSDPascal/Info.cs @@ -123,7 +123,7 @@ public sealed partial class PascalPlugin public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? new Apple2(); + encoding ??= new Apple2(); var sbInformation = new StringBuilder(); metadata = new FileSystem(); information = ""; @@ -190,7 +190,7 @@ public sealed partial class PascalPlugin volEntry.LastBlock).AppendLine(); sbInformation. - AppendFormat(Localization.Volume_name_0, StringHandlers.PascalToString(volEntry.VolumeName, Encoding)). + AppendFormat(Localization.Volume_name_0, StringHandlers.PascalToString(volEntry.VolumeName, encoding)). AppendLine(); sbInformation.AppendFormat(Localization.Volume_has_0_blocks, volEntry.Blocks).AppendLine(); @@ -211,7 +211,7 @@ public sealed partial class PascalPlugin ClusterSize = imagePlugin.Info.SectorSize, Files = (ulong)volEntry.Files, Type = FS_TYPE, - VolumeName = StringHandlers.PascalToString(volEntry.VolumeName, Encoding) + VolumeName = StringHandlers.PascalToString(volEntry.VolumeName, encoding) }; } } \ No newline at end of file diff --git a/Aaru.Filesystems/UCSDPascal/Super.cs b/Aaru.Filesystems/UCSDPascal/Super.cs index aca9ba8f1..84d6d6356 100644 --- a/Aaru.Filesystems/UCSDPascal/Super.cs +++ b/Aaru.Filesystems/UCSDPascal/Super.cs @@ -50,8 +50,8 @@ public sealed partial class PascalPlugin public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, Dictionary options, string @namespace) { - _device = imagePlugin; - Encoding = encoding ?? new Apple2(); + _device = imagePlugin; + _encoding = encoding ?? new Apple2(); options ??= GetDefaultOptions(); @@ -140,7 +140,7 @@ public sealed partial class PascalPlugin ClusterSize = _device.Info.SectorSize, Files = (ulong)_mountedVolEntry.Files, Type = FS_TYPE, - VolumeName = StringHandlers.PascalToString(_mountedVolEntry.VolumeName, Encoding) + VolumeName = StringHandlers.PascalToString(_mountedVolEntry.VolumeName, _encoding) }; _mounted = true; diff --git a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs index 76e2f0a5f..c021916a0 100644 --- a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs +++ b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs @@ -51,6 +51,7 @@ public sealed partial class PascalPlugin : IReadOnlyFilesystem List _fileEntries; bool _mounted; PascalVolumeEntry _mountedVolEntry; + Encoding _encoding; /// Apple II disks use 256 bytes / sector, but filesystem assumes it's 512 bytes / sector uint _multiplier; @@ -61,8 +62,6 @@ public sealed partial class PascalPlugin : IReadOnlyFilesystem /// public Guid Id => new("B0AC2CB5-72AA-473A-9200-270B5A2C2D53"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; /// diff --git a/Aaru.Filesystems/UDF/Info.cs b/Aaru.Filesystems/UDF/Info.cs index f0e5cc530..ed7c47a6a 100644 --- a/Aaru.Filesystems/UDF/Info.cs +++ b/Aaru.Filesystems/UDF/Info.cs @@ -202,7 +202,7 @@ public sealed partial class UDF metadata = new FileSystem(); // UDF is always UTF-8 - Encoding = Encoding.UTF8; + encoding = Encoding.UTF8; byte[] sector; var sbInformation = new StringBuilder(); @@ -350,10 +350,10 @@ public sealed partial class UDF AppendLine(); sbInformation.AppendFormat(Localization.Volume_conforms_to_0, - Encoding.GetString(lvd.domainIdentifier.identifier).TrimEnd('\u0000')).AppendLine(); + encoding.GetString(lvd.domainIdentifier.identifier).TrimEnd('\u0000')).AppendLine(); sbInformation.AppendFormat(Localization.Volume_was_last_written_by_0, - Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000')). + encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000')). AppendLine(); sbInformation.AppendFormat(Localization.Volume_requires_UDF_version_0_1_to_be_read, @@ -371,14 +371,14 @@ public sealed partial class UDF metadata = new FileSystem { Type = FS_TYPE, - ApplicationIdentifier = Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000'), + ApplicationIdentifier = encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000'), ClusterSize = lvd.logicalBlockSize, ModificationDate = EcmaToDateTime(lvid.recordingDateTime), Files = lvidiu.files, VolumeName = StringHandlers.DecompressUnicode(lvd.logicalVolumeIdentifier), VolumeSetIdentifier = StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier), VolumeSerial = StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier), - SystemIdentifier = Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000') + SystemIdentifier = encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000') }; metadata.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / metadata.ClusterSize; diff --git a/Aaru.Filesystems/UDF/UDF.cs b/Aaru.Filesystems/UDF/UDF.cs index cbc10c91e..aa2c33cb8 100644 --- a/Aaru.Filesystems/UDF/UDF.cs +++ b/Aaru.Filesystems/UDF/UDF.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -39,8 +38,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedMember.Local")] public sealed partial class UDF : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.UDF_Name; /// diff --git a/Aaru.Filesystems/UNICOS/Info.cs b/Aaru.Filesystems/UNICOS/Info.cs index cce4cadbf..e05f6cadb 100644 --- a/Aaru.Filesystems/UNICOS/Info.cs +++ b/Aaru.Filesystems/UNICOS/Info.cs @@ -82,9 +82,9 @@ public sealed partial class UNICOS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 512) return; @@ -127,7 +127,7 @@ public sealed partial class UNICOS if(unicosSb.s_error > 0) sb.AppendFormat(Localization.Volume_is_dirty_error_code_equals_0, unicosSb.s_error).AppendLine(); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(unicosSb.s_fname, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(unicosSb.s_fname, encoding)).AppendLine(); information = sb.ToString(); @@ -136,7 +136,7 @@ public sealed partial class UNICOS Type = FS_TYPE, ClusterSize = 4096, Clusters = (ulong)unicosSb.s_fsize, - VolumeName = StringHandlers.CToString(unicosSb.s_fname, Encoding), + VolumeName = StringHandlers.CToString(unicosSb.s_fname, encoding), ModificationDate = DateHandlers.UnixToDateTime(unicosSb.s_time) }; diff --git a/Aaru.Filesystems/UNICOS/UNICOS.cs b/Aaru.Filesystems/UNICOS/UNICOS.cs index a4bf2fa9f..54960b725 100644 --- a/Aaru.Filesystems/UNICOS/UNICOS.cs +++ b/Aaru.Filesystems/UNICOS/UNICOS.cs @@ -29,7 +29,6 @@ // UNICOS is ILP64 so let's think everything is 64-bit using System; -using System.Text; using Aaru.CommonTypes.Interfaces; using blkno_t = System.Int64; using daddr_t = System.Int64; @@ -44,8 +43,6 @@ namespace Aaru.Filesystems; /// Implements detection for the Cray UNICOS filesystem public sealed partial class UNICOS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.UNICOS_Name; /// diff --git a/Aaru.Filesystems/UNIXBFS/Info.cs b/Aaru.Filesystems/UNIXBFS/Info.cs index a595783f3..9ee7894ad 100644 --- a/Aaru.Filesystems/UNIXBFS/Info.cs +++ b/Aaru.Filesystems/UNIXBFS/Info.cs @@ -62,9 +62,9 @@ public sealed partial class BFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bfsSbSector); @@ -86,9 +86,9 @@ public sealed partial class BFS }; Array.Copy(bfsSbSector, 0x1C, sbStrings, 0, 6); - bfsSb.s_fsname = StringHandlers.CToString(sbStrings, Encoding); + bfsSb.s_fsname = StringHandlers.CToString(sbStrings, encoding); Array.Copy(bfsSbSector, 0x22, sbStrings, 0, 6); - bfsSb.s_volume = StringHandlers.CToString(sbStrings, Encoding); + bfsSb.s_volume = StringHandlers.CToString(sbStrings, encoding); AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_magic: 0x{0:X8}", bfsSb.s_magic); AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_start: 0x{0:X8}", bfsSb.s_start); diff --git a/Aaru.Filesystems/UNIXBFS/UNIXBFS.cs b/Aaru.Filesystems/UNIXBFS/UNIXBFS.cs index 6055b26cc..c108cd060 100644 --- a/Aaru.Filesystems/UNIXBFS/UNIXBFS.cs +++ b/Aaru.Filesystems/UNIXBFS/UNIXBFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -37,8 +36,6 @@ namespace Aaru.Filesystems; /// Implements detection of the UNIX boot filesystem public sealed partial class BFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.BFS_Name; /// diff --git a/Aaru.Filesystems/VMfs/Info.cs b/Aaru.Filesystems/VMfs/Info.cs index 319941a08..edeb6dd63 100644 --- a/Aaru.Filesystems/VMfs/Info.cs +++ b/Aaru.Filesystems/VMfs/Info.cs @@ -70,9 +70,9 @@ public sealed partial class VMfs public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.UTF8; - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.UTF8; + information = ""; + metadata = new FileSystem(); ulong vmfsSuperOff = VMFS_BASE / imagePlugin.Info.SectorSize; ErrorNumber errno = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector); @@ -92,7 +92,7 @@ public sealed partial class VMfs sbInformation.AppendFormat(Localization.Volume_version_0, volInfo.version).AppendLine(); - sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(volInfo.name, Encoding)). + sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(volInfo.name, encoding)). AppendLine(); sbInformation.AppendFormat(Localization.Volume_size_0_bytes, volInfo.size * 256).AppendLine(); diff --git a/Aaru.Filesystems/VMfs/VMfs.cs b/Aaru.Filesystems/VMfs/VMfs.cs index e34752005..338c91f1f 100644 --- a/Aaru.Filesystems/VMfs/VMfs.cs +++ b/Aaru.Filesystems/VMfs/VMfs.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -39,8 +38,6 @@ namespace Aaru.Filesystems; SuppressMessage("ReSharper", "UnusedMember.Local")] public sealed partial class VMfs : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.VMfs_Name; /// diff --git a/Aaru.Filesystems/VxFS/Info.cs b/Aaru.Filesystems/VxFS/Info.cs index fd3cd412e..e33f22cec 100644 --- a/Aaru.Filesystems/VxFS/Info.cs +++ b/Aaru.Filesystems/VxFS/Info.cs @@ -62,9 +62,9 @@ public sealed partial class VxFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.UTF8; - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.UTF8; + information = ""; + metadata = new FileSystem(); ulong vmfsSuperOff = VXFS_BASE / imagePlugin.Info.SectorSize; ErrorNumber errno = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector); @@ -79,7 +79,7 @@ public sealed partial class VxFS sbInformation.AppendFormat(Localization.Volume_version_0, vxSb.vs_version).AppendLine(); - sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(vxSb.vs_fname, Encoding)). + sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(vxSb.vs_fname, encoding)). AppendLine(); sbInformation.AppendFormat(Localization.Volume_has_0_blocks_of_1_bytes_each, vxSb.vs_bsize, vxSb.vs_size). diff --git a/Aaru.Filesystems/VxFS/VxFS.cs b/Aaru.Filesystems/VxFS/VxFS.cs index f4194c1b2..a32840a90 100644 --- a/Aaru.Filesystems/VxFS/VxFS.cs +++ b/Aaru.Filesystems/VxFS/VxFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of the Veritas filesystem public sealed partial class VxFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.VxFS_Name; /// diff --git a/Aaru.Filesystems/XFS/Info.cs b/Aaru.Filesystems/XFS/Info.cs index fc6ab48bb..0fcf1008e 100644 --- a/Aaru.Filesystems/XFS/Info.cs +++ b/Aaru.Filesystems/XFS/Info.cs @@ -118,9 +118,9 @@ public sealed partial class XFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); if(imagePlugin.Info.SectorSize < 512) return; @@ -204,7 +204,7 @@ public sealed partial class XFS if(xfsSb.inprogress > 0) sb.AppendLine(Localization.fsck_in_progress); - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(xfsSb.fname, Encoding)).AppendLine(); + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(xfsSb.fname, encoding)).AppendLine(); sb.AppendFormat(Localization.Volume_UUID_0, xfsSb.uuid).AppendLine(); information = sb.ToString(); @@ -217,7 +217,7 @@ public sealed partial class XFS FreeClusters = xfsSb.fdblocks, Files = xfsSb.icount - xfsSb.ifree, Dirty = xfsSb.inprogress > 0, - VolumeName = StringHandlers.CToString(xfsSb.fname, Encoding), + VolumeName = StringHandlers.CToString(xfsSb.fname, encoding), VolumeSerial = xfsSb.uuid.ToString() }; } diff --git a/Aaru.Filesystems/XFS/XFS.cs b/Aaru.Filesystems/XFS/XFS.cs index 87cd1de5a..f3bb2ab8e 100644 --- a/Aaru.Filesystems/XFS/XFS.cs +++ b/Aaru.Filesystems/XFS/XFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -36,8 +35,6 @@ namespace Aaru.Filesystems; /// Implements detection of SGI's XFS public sealed partial class XFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.XFS_Name; /// diff --git a/Aaru.Filesystems/Xia/Info.cs b/Aaru.Filesystems/Xia/Info.cs index 6e0cc1792..aa4475fa9 100644 --- a/Aaru.Filesystems/Xia/Info.cs +++ b/Aaru.Filesystems/Xia/Info.cs @@ -70,7 +70,6 @@ public sealed partial class Xia public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/Xia/Xia.cs b/Aaru.Filesystems/Xia/Xia.cs index 0cb56285b..ca6109362 100644 --- a/Aaru.Filesystems/Xia/Xia.cs +++ b/Aaru.Filesystems/Xia/Xia.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -39,8 +38,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")] public sealed partial class Xia : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.Xia_Name; /// diff --git a/Aaru.Filesystems/ZFS/Info.cs b/Aaru.Filesystems/ZFS/Info.cs index 4cefa46bd..b7d6325ce 100644 --- a/Aaru.Filesystems/ZFS/Info.cs +++ b/Aaru.Filesystems/ZFS/Info.cs @@ -103,7 +103,6 @@ public sealed partial class ZFS out FileSystem metadata) { // ZFS is always UTF-8 - Encoding = Encoding.UTF8; information = ""; metadata = new FileSystem(); ErrorNumber errno; diff --git a/Aaru.Filesystems/ZFS/ZFS.cs b/Aaru.Filesystems/ZFS/ZFS.cs index f63bbe00a..a18b79cb6 100644 --- a/Aaru.Filesystems/ZFS/ZFS.cs +++ b/Aaru.Filesystems/ZFS/ZFS.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -58,8 +57,6 @@ namespace Aaru.Filesystems; SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "NotAccessedField.Local")] public sealed partial class ZFS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.ZFS_Name; /// diff --git a/Aaru.Filesystems/dump/Info.cs b/Aaru.Filesystems/dump/Info.cs index 9316ecc56..282f1fdd8 100644 --- a/Aaru.Filesystems/dump/Info.cs +++ b/Aaru.Filesystems/dump/Info.cs @@ -87,7 +87,6 @@ public sealed partial class dump public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/dump/dump.cs b/Aaru.Filesystems/dump/dump.cs index e65a6cfe1..b15c1138d 100644 --- a/Aaru.Filesystems/dump/dump.cs +++ b/Aaru.Filesystems/dump/dump.cs @@ -32,7 +32,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; using ufs_daddr_t = System.Int32; @@ -43,8 +42,6 @@ namespace Aaru.Filesystems; [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "UnusedMember.Local")] public sealed partial class dump : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.dump_Name; /// diff --git a/Aaru.Filesystems/exFAT/Info.cs b/Aaru.Filesystems/exFAT/Info.cs index e65a3d3f9..d4f7072ce 100644 --- a/Aaru.Filesystems/exFAT/Info.cs +++ b/Aaru.Filesystems/exFAT/Info.cs @@ -69,7 +69,6 @@ public sealed partial class exFAT public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); information = ""; var sb = new StringBuilder(); diff --git a/Aaru.Filesystems/exFAT/exFAT.cs b/Aaru.Filesystems/exFAT/exFAT.cs index 8f176d893..4c7b78707 100644 --- a/Aaru.Filesystems/exFAT/exFAT.cs +++ b/Aaru.Filesystems/exFAT/exFAT.cs @@ -28,7 +28,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -41,8 +40,6 @@ namespace Aaru.Filesystems; // ReSharper disable once InconsistentNaming public sealed partial class exFAT : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.exFAT_Name; /// diff --git a/Aaru.Filesystems/ext2FS/Info.cs b/Aaru.Filesystems/ext2FS/Info.cs index f6f888589..0b6ac7241 100644 --- a/Aaru.Filesystems/ext2FS/Info.cs +++ b/Aaru.Filesystems/ext2FS/Info.cs @@ -86,9 +86,9 @@ public sealed partial class ext2FS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); - information = ""; - metadata = new FileSystem(); + encoding ??= Encoding.GetEncoding("iso-8859-15"); + information = ""; + metadata = new FileSystem(); var sb = new StringBuilder(); @@ -264,13 +264,13 @@ public sealed partial class ext2FS AppendFormat(Localization.Volume_has_been_mounted_0_times_with_no_maximum_no_of_mounts_before_checking, supblk.mount_c).AppendLine(); - if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.last_mount_dir, Encoding))) + if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.last_mount_dir, encoding))) sb.AppendFormat(Localization.Last_mounted_at_0, - StringHandlers.CToString(supblk.last_mount_dir, Encoding)).AppendLine(); + StringHandlers.CToString(supblk.last_mount_dir, encoding)).AppendLine(); - if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.mount_options, Encoding))) + if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.mount_options, encoding))) sb.AppendFormat(Localization.Last_used_mount_options_were_0, - StringHandlers.CToString(supblk.mount_options, Encoding)).AppendLine(); + StringHandlers.CToString(supblk.mount_options, encoding)).AppendLine(); } else { @@ -332,12 +332,12 @@ public sealed partial class ext2FS break; } - if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.volume_name, Encoding))) + if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.volume_name, encoding))) { - sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(supblk.volume_name, Encoding)). + sb.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(supblk.volume_name, encoding)). AppendLine(); - metadata.VolumeName = StringHandlers.CToString(supblk.volume_name, Encoding); + metadata.VolumeName = StringHandlers.CToString(supblk.volume_name, encoding); } switch(supblk.err_behaviour) diff --git a/Aaru.Filesystems/ext2FS/ext2FS.cs b/Aaru.Filesystems/ext2FS/ext2FS.cs index 7b7cb1324..169286ed3 100644 --- a/Aaru.Filesystems/ext2FS/ext2FS.cs +++ b/Aaru.Filesystems/ext2FS/ext2FS.cs @@ -32,7 +32,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -45,8 +44,6 @@ namespace Aaru.Filesystems; // ReSharper disable once InconsistentNaming public sealed partial class ext2FS : IFilesystem { - /// - public Encoding Encoding { get; private set; } /// public string Name => Localization.ext2FS_Name_Linux_extended_Filesystem_2_3_and_4; /// diff --git a/Aaru.Filesystems/extFS/Info.cs b/Aaru.Filesystems/extFS/Info.cs index e57912931..8365b1eb7 100644 --- a/Aaru.Filesystems/extFS/Info.cs +++ b/Aaru.Filesystems/extFS/Info.cs @@ -75,7 +75,6 @@ public sealed partial class extFS public void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, out FileSystem metadata) { - Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15"); information = ""; metadata = new FileSystem(); diff --git a/Aaru.Filesystems/extFS/extFS.cs b/Aaru.Filesystems/extFS/extFS.cs index 7ade7992b..677daf9e3 100644 --- a/Aaru.Filesystems/extFS/extFS.cs +++ b/Aaru.Filesystems/extFS/extFS.cs @@ -27,7 +27,6 @@ // ****************************************************************************/ using System; -using System.Text; using Aaru.CommonTypes.Interfaces; namespace Aaru.Filesystems; @@ -44,7 +43,5 @@ public sealed partial class extFS : IFilesystem /// public Guid Id => new("076CB3A2-08C2-4D69-BC8A-FCAA2E502BE2"); /// - public Encoding Encoding { get; private set; } - /// public string Author => Authors.NataliaPortillo; } \ No newline at end of file