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

35
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 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
structureBytes = new byte[Marshal.SizeOf<IndexHeader>()];
MemoryMarshal.Write(structureBytes, ref idxHeader);
imageStream.Write(structureBytes, 0, structureBytes.Length);
imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length);
blockStream.Close();
blockStream = null;