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

Add option to pass an arbitrary list of options to IReadOnlyFilesystem.Mount()

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-27 23:55:59 +00:00
parent e009d86fcc
commit a1f82e0e72
11 changed files with 454 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs
View File

@@ -40,22 +40,27 @@ namespace DiscImageChef.Filesystems.AppleDOS
{
public partial class AppleDOS : IReadOnlyFilesystem
{
bool debug;
bool debug;
IMediaImage device;
bool mounted;
int sectorsPerTrack;
ulong start;
ulong totalFileEntries;
bool track1UsedByFiles;
bool track2UsedByFiles;
int usedSectors;
bool mounted;
int sectorsPerTrack;
ulong start;
ulong totalFileEntries;
bool track1UsedByFiles;
bool track2UsedByFiles;
int usedSectors;
Vtoc vtoc;
public FileSystemType XmlFsType { get; private set; }
public Encoding Encoding { get; private set; }
public string Name => "Apple DOS File System";
public Guid Id => new Guid("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
public Encoding Encoding { get; private set; }
public string Name => "Apple DOS File System";
public Guid Id => new Guid("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
static Dictionary<string, string> GetDefaultOptions()
{
return new Dictionary<string, string> {{"debug", false.ToString()}};
}
#region Caches
/// <summary>Caches track/sector lists</summary>
@@ -65,17 +70,17 @@ namespace DiscImageChef.Filesystems.AppleDOS
/// <summary>Caches catalog</summary>
Dictionary<string, ushort> catalogCache;
/// <summary>Caches file size</summary>
Dictionary<string, int> fileSizeCache;
Dictionary<string, int> fileSizeCache;
/// <summary>Caches VTOC</summary>
byte[] vtocBlocks;
byte[] vtocBlocks;
/// <summary>Caches catalog</summary>
byte[] catalogBlocks;
byte[] catalogBlocks;
/// <summary>Caches boot code</summary>
byte[] bootBlocks;
byte[] bootBlocks;
/// <summary>Caches file type</summary>
Dictionary<string, byte> fileTypeCache;
Dictionary<string, byte> fileTypeCache;
/// <summary>Caches locked files</summary>
List<string> lockedFiles;
List<string> lockedFiles;
#endregion Caches
}
}

49
DiscImageChef.Filesystems/AppleDOS/Super.cs
View File

@@ -31,6 +31,7 @@
// ****************************************************************************/
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using Claunia.Encoding;
using DiscImageChef.CommonTypes;
@@ -46,10 +47,11 @@ namespace DiscImageChef.Filesystems.AppleDOS
/// <summary>
/// Mounts an Apple DOS filesystem
/// </summary>
public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, bool debug)
public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
Dictionary<string, string> options)
{
device = imagePlugin;
start = partition.Start;
device = imagePlugin;
start = partition.Start;
Encoding = encoding ?? new Apple2();
if(device.Info.Sectors != 455 && device.Info.Sectors != 560)
@@ -73,8 +75,8 @@ namespace DiscImageChef.Filesystems.AppleDOS
sectorsPerTrack = device.Info.Sectors == 455 ? 13 : 16;
// Read the VTOC
vtocBlocks = device.ReadSector((ulong)(17 * sectorsPerTrack));
vtoc = new Vtoc();
vtocBlocks = device.ReadSector((ulong)(17 * sectorsPerTrack));
vtoc = new Vtoc();
IntPtr vtocPtr = Marshal.AllocHGlobal(256);
Marshal.Copy(vtocBlocks, 0, vtocPtr, 256);
vtoc = (Vtoc)Marshal.PtrToStructure(vtocPtr, typeof(Vtoc));
@@ -82,7 +84,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
track1UsedByFiles = false;
track2UsedByFiles = false;
usedSectors = 1;
usedSectors = 1;
Errno error = ReadCatalog();
if(error != Errno.NoError)
@@ -101,17 +103,18 @@ namespace DiscImageChef.Filesystems.AppleDOS
// Create XML metadata for mounted filesystem
XmlFsType = new FileSystemType
{
Bootable = true,
Clusters = (long)device.Info.Sectors,
ClusterSize = vtoc.bytesPerSector,
Files = catalogCache.Count,
FilesSpecified = true,
Bootable = true,
Clusters = (long)device.Info.Sectors,
ClusterSize = vtoc.bytesPerSector,
Files = catalogCache.Count,
FilesSpecified = true,
FreeClustersSpecified = true,
Type = "Apple DOS"
Type = "Apple DOS"
};
XmlFsType.FreeClusters = XmlFsType.Clusters - usedSectors;
this.debug = debug;
if(options == null) options = GetDefaultOptions();
if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
mounted = true;
return Errno.NoError;
}
@@ -121,10 +124,10 @@ namespace DiscImageChef.Filesystems.AppleDOS
/// </summary>
public Errno Unmount()
{
mounted = false;
extentCache = null;
fileCache = null;
catalogCache = null;
mounted = false;
extentCache = null;
fileCache = null;
catalogCache = null;
fileSizeCache = null;
return Errno.NoError;
@@ -138,14 +141,14 @@ namespace DiscImageChef.Filesystems.AppleDOS
{
stat = new FileSystemInfo
{
Blocks = (long)device.Info.Sectors,
Blocks = (long)device.Info.Sectors,
FilenameLength = 30,
Files = (ulong)catalogCache.Count,
PluginId = Id,
Type = "Apple DOS"
Files = (ulong)catalogCache.Count,
PluginId = Id,
Type = "Apple DOS"
};
stat.FreeFiles = totalFileEntries - stat.Files;
stat.FreeBlocks = stat.Blocks - usedSectors;
stat.FreeFiles = totalFileEntries - stat.Files;
stat.FreeBlocks = stat.Blocks - usedSectors;
return Errno.NoError;
}