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

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

@@ -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
/// <inheritdoc />
public Guid Id => new("BAFC1E50-9C64-4CD3-8400-80628CC27AFA");
/// <inheritdoc />
public Encoding Encoding { get; private set; }
/// <inheritdoc />
public string Author => Authors.NataliaPortillo;
}

10
Aaru.Filesystems/Acorn/Info.cs
View File

@@ -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();
}