Make Encoding a private field only for IReadOnlyFilesystem implementors.

This commit is contained in:
2022-12-17 23:17:18 +00:00
parent dc26b85c2f
commit 24069676e2
147 changed files with 296 additions and 497 deletions

View File

@@ -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)

View File

@@ -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
{
/// <inheritdoc />
public Encoding Encoding { get; private set; }
/// <inheritdoc />
public string Name => Localization.ext2FS_Name_Linux_extended_Filesystem_2_3_and_4;
/// <inheritdoc />