aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Encoding a private field only for IReadOnlyFilesystem implementors.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-17 23:17:18 +00:00
parent dc26b85c2f
commit 24069676e2
147 changed files with 296 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Aaru.Filesystems/ODS/Info.cs
View File

@@ -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}"
};

3
Aaru.Filesystems/ODS/ODS.cs
View File

@@ -31,7 +31,6 @@
// ****************************************************************************/
using System;
using System.Text;
using Aaru.CommonTypes.Interfaces;
namespace Aaru.Filesystems;
@@ -49,8 +48,6 @@ namespace Aaru.Filesystems;
/// <summary>Implements detection of DEC's On-Disk Structure, aka the ODS filesystem</summary>
public sealed partial class ODS : IFilesystem
{
/// <inheritdoc />
public Encoding Encoding { get; private set; }
/// <inheritdoc />
public string Name => Localization.ODS_Name;
/// <inheritdoc />