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

Use new index when saving aaruformat images with more than 65535 blocks. Fixes #326.

Browse Source
This commit is contained in:
Natalia Portillo
2020-04-03 06:49:23 +01:00
parent 0cec6bf960
commit 124f7c8b6d
5 changed files with 97 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aaru.Images/AaruFormat/Constants.cs
View File

@@ -42,7 +42,9 @@ namespace Aaru.DiscImages
/// Image format version. A change in this number indicates an incompatible change to the format that prevents
/// older implementations from reading it correctly, if at all.
/// </summary>
const byte AARUFMT_VERSION = 1;
const byte AARUFMT_VERSION_V1 = 1;
/// <summary>Adds new index format with 64-bit entries counter</summary>
const byte AARUFMT_VERSION = 2;
/// <summary>Maximum read cache size, 256MiB.</summary>
const uint MAX_CACHE_SIZE = 256 * 1024 * 1024;
/// <summary>Size in bytes of LZMA properties.</summary>

6
Aaru.Images/AaruFormat/Enums.cs
View File

@@ -218,9 +218,11 @@ namespace Aaru.DiscImages
/// <summary>Block containing data</summary>
DataBlock = 0x4B4C4244,
/// <summary>Block containing a deduplication table</summary>
DeDuplicationTable = 0X2A544444,
DeDuplicationTable = 0x2A544444,
/// <summary>Block containing the index</summary>
Index = 0X58444E49,
Index = 0x58444E49,
/// <summary>Block containing the index</summary>
Index2 = 0x32584449,
/// <summary>Block containing logical geometry</summary>
GeometryBlock = 0x4D4F4547,
/// <summary>Block containing metadata</summary>

46
Aaru.Images/AaruFormat/Read.cs
View File

@@ -86,13 +86,46 @@ namespace Aaru.DiscImages
imageStream.Read(structureBytes, 0, structureBytes.Length);
IndexHeader idxHeader = Marshal.SpanToStructureLittleEndian<IndexHeader>(structureBytes);
if(idxHeader.identifier != BlockType.Index)
if(idxHeader.identifier != BlockType.Index &&
idxHeader.identifier != BlockType.Index2)
throw new FeatureUnsupportedImageException("Index not found!");
AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries", header.indexOffset,
idxHeader.entries);
if(idxHeader.identifier == BlockType.Index2)
{
imageStream.Position = (long)header.indexOffset;
structureBytes = new byte[Marshal.SizeOf<IndexHeader2>()];
imageStream.Read(structureBytes, 0, structureBytes.Length);
IndexHeader2 idxHeader2 = Marshal.SpanToStructureLittleEndian<IndexHeader2>(structureBytes);
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
header.indexOffset, idxHeader2.entries);
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Fill in-memory index
index = new List<IndexEntry>();
for(ulong i = 0; i < idxHeader2.entries; i++)
{
structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
imageStream.Read(structureBytes, 0, structureBytes.Length);
IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(structureBytes);
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Block type {0} with data type {1} is indexed to be at {2}",
entry.blockType, entry.dataType, entry.offset);
index.Add(entry);
}
}
else
{
AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
header.indexOffset, idxHeader.entries);
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Fill in-memory index
index = new List<IndexEntry>();
@@ -104,11 +137,12 @@ namespace Aaru.DiscImages
IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(structureBytes);
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Block type {0} with data type {1} is indexed to be at {2}", entry.blockType,
entry.dataType, entry.offset);
"Block type {0} with data type {1} is indexed to be at {2}",
entry.blockType, entry.dataType, entry.offset);
index.Add(entry);
}
}
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));

12
Aaru.Images/AaruFormat/Structs.cs
View File

@@ -101,6 +101,18 @@ namespace Aaru.DiscImages
public ulong crc64;
}
/// <summary>Header for the index, followed by entries</summary>
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct IndexHeader2
{
/// <summary>Identifier, <see cref="BlockType.Index2" /></summary>
public BlockType identifier;
/// <summary>How many entries follow this header</summary>
public ulong entries;
/// <summary>CRC64-ECMA of the index</summary>
public ulong crc64;
}
/// <summary>Index entry</summary>
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct IndexEntry

29
Aaru.Images/AaruFormat/Write.cs
View File

@@ -270,7 +270,7 @@ namespace Aaru.DiscImages
}
header.application = "Aaru";
header.imageMajorVersion = AARUFMT_VERSION;
header.imageMajorVersion = AARUFMT_VERSION_V1;
header.imageMinorVersion = 0;
header.applicationMajorVersion = (byte)typeof(AaruFormat).Assembly.GetName().Version.Major;
header.applicationMinorVersion = (byte)typeof(AaruFormat).Assembly.GetName().Version.Minor;
@@ -3357,15 +3357,36 @@ namespace Aaru.DiscImages
Crc64Context.Data(blockStream.ToArray(), out byte[] idxCrc);
var idxHeader = new IndexHeader
if(index.Count > ushort.MaxValue)
{
identifier = BlockType.Index, entries = (ushort)index.Count, crc64 = BitConverter.ToUInt64(idxCrc, 0)
header.imageMajorVersion = AARUFMT_VERSION;
var idxHeader = new IndexHeader2
{
identifier = BlockType.Index2, entries = (ulong)index.Count,
crc64 = BitConverter.ToUInt64(idxCrc, 0)
};
// Write index to disk
// Write index header to disk
structureBytes = new byte[Marshal.SizeOf<IndexHeader2>()];
MemoryMarshal.Write(structureBytes, ref idxHeader);
imageStream.Write(structureBytes, 0, structureBytes.Length);
}
else
{
var idxHeader = new IndexHeader
{
identifier = BlockType.Index, entries = (ushort)index.Count,
crc64 = BitConverter.ToUInt64(idxCrc, 0)
};
// Write index header to disk
structureBytes = new byte[Marshal.SizeOf<IndexHeader>()];
MemoryMarshal.Write(structureBytes, ref idxHeader);
imageStream.Write(structureBytes, 0, structureBytes.Length);
}
// Write index to disk
imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length);
blockStream.Close();
blockStream = null;