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

Rename DicConsole to AaruConsole.

Browse Source
This commit is contained in:
Natalia Portillo
2020-02-27 23:48:41 +00:00
parent 073b42655b
commit 895143b790
225 changed files with 5023 additions and 5023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,11 +155,11 @@ namespace Aaru.DiscImages
end = DateTime.UtcNow;
TimeSpan sequentialize = end - start;
DicConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to deinterleave subchannel.",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to deinterleave subchannel.",
deinterleave.TotalMilliseconds);
DicConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to sequentialize subchannel.",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to sequentialize subchannel.",
sequentialize.TotalMilliseconds);
DicConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to transform subchannel.",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to transform subchannel.",
deinterleave.TotalMilliseconds + sequentialize.TotalMilliseconds);
return sequential;
@@ -283,11 +283,11 @@ namespace Aaru.DiscImages
end = DateTime.UtcNow;
TimeSpan interleave = end - start;
DicConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to de-sequentialize subchannel.",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to de-sequentialize subchannel.",
desequentialize.TotalMilliseconds);
DicConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to interleave subchannel.",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to interleave subchannel.",
interleave.TotalMilliseconds);
DicConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to untransform subchannel.",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to untransform subchannel.",
interleave.TotalMilliseconds + desequentialize.TotalMilliseconds);
return interleaved;

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

@@ -58,7 +58,7 @@ namespace Aaru.DiscImages
{
public bool Open(IFilter imageFilter)
{
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
imageStream = imageFilter.GetDataForkStream();
@@ -79,7 +79,7 @@ namespace Aaru.DiscImages
imageInfo.Version = $"{header.imageMajorVersion}.{header.imageMinorVersion}";
imageInfo.MediaType = header.mediaType;
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Read the index header
@@ -91,10 +91,10 @@ namespace Aaru.DiscImages
if(idxHeader.identifier != BlockType.Index)
throw new FeatureUnsupportedImageException("Index not found!");
DicConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
header.indexOffset, idxHeader.entries);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Fill in-memory index
@@ -106,14 +106,14 @@ namespace Aaru.DiscImages
imageStream.Read(structureBytes, 0, structureBytes.Length);
IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(structureBytes);
DicConsole.DebugWriteLine("Aaru Format plugin",
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);
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
imageInfo.ImageSize = 0;
@@ -150,7 +150,7 @@ namespace Aaru.DiscImages
if(blockHeader.identifier != entry.blockType)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect identifier for data block at position {0}",
entry.offset);
@@ -159,7 +159,7 @@ namespace Aaru.DiscImages
if(blockHeader.type != entry.dataType)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Expected block with data type {0} at position {1} but found data type {2}",
entry.dataType, entry.offset, blockHeader.type);
@@ -168,11 +168,11 @@ namespace Aaru.DiscImages
byte[] data;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found data block type {0} at position {1}", entry.dataType,
entry.offset);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Decompress media tag
@@ -182,7 +182,7 @@ namespace Aaru.DiscImages
if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform &&
entry.dataType != DataType.CdSectorSubchannel)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Invalid compression type {0} for block with data type {1}, continuing...",
blockHeader.compression, entry.dataType);
@@ -206,11 +206,11 @@ namespace Aaru.DiscImages
DateTime endDecompress = DateTime.Now;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to decompress block",
(endDecompress - startDecompress).TotalSeconds);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
}
else if(blockHeader.compression == CompressionType.None)
@@ -218,12 +218,12 @@ namespace Aaru.DiscImages
data = new byte[blockHeader.length];
imageStream.Read(data, 0, (int)blockHeader.length);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
}
else
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found unknown compression type {0}, continuing...",
(ushort)blockHeader.compression);
@@ -235,7 +235,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64);
@@ -261,7 +261,7 @@ namespace Aaru.DiscImages
if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -290,7 +290,7 @@ namespace Aaru.DiscImages
if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -300,7 +300,7 @@ namespace Aaru.DiscImages
if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -312,14 +312,14 @@ namespace Aaru.DiscImages
if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
case DataType.CompactDiscMode2Subheader:
mode2Subheaders = data;
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -328,7 +328,7 @@ namespace Aaru.DiscImages
if(mediaTags.ContainsKey(mediaTagType))
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Media tag type {0} duplicated, removing previous entry...",
mediaTagType);
@@ -337,7 +337,7 @@ namespace Aaru.DiscImages
mediaTags.Add(mediaTagType, data);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -358,14 +358,14 @@ namespace Aaru.DiscImages
imageInfo.Sectors = ddtHeader.entries;
shift = ddtHeader.shift;
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Check for DDT compression
switch(ddtHeader.compression)
{
case CompressionType.Lzma:
DicConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
AaruConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
DateTime ddtStart = DateTime.UtcNow;
byte[] compressedDdt = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
byte[] lzmaProperties = new byte[LZMA_PROPERTIES_LENGTH];
@@ -381,11 +381,11 @@ namespace Aaru.DiscImages
DateTime ddtEnd = DateTime.UtcNow;
inMemoryDdt = true;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to decompress DDT",
(ddtEnd - ddtStart).TotalSeconds);
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
break;
@@ -393,7 +393,7 @@ namespace Aaru.DiscImages
inMemoryDdt = false;
outMemoryDdtPosition = (long)entry.offset;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
break;
@@ -410,14 +410,14 @@ namespace Aaru.DiscImages
uint[] cdDdt = new uint[ddtHeader.entries];
byte[] decompressedDdt = new byte[ddtHeader.length];
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Check for DDT compression
switch(ddtHeader.compression)
{
case CompressionType.Lzma:
DicConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
AaruConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
DateTime ddtStart = DateTime.UtcNow;
byte[] compressedDdt = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
byte[] lzmaProperties = new byte[LZMA_PROPERTIES_LENGTH];
@@ -430,18 +430,18 @@ namespace Aaru.DiscImages
compressedDdtMs.Close();
DateTime ddtEnd = DateTime.UtcNow;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to decompress DDT",
(ddtEnd - ddtStart).TotalSeconds);
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
break;
case CompressionType.None:
imageStream.Read(decompressedDdt, 0, decompressedDdt.Length);
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
break;
@@ -457,7 +457,7 @@ namespace Aaru.DiscImages
else if(entry.dataType == DataType.CdSectorSuffixCorrected)
sectorSuffixDdt = cdDdt;
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
}
@@ -471,7 +471,7 @@ namespace Aaru.DiscImages
if(geometryBlock.identifier == BlockType.GeometryBlock)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Geometry set to {0} cylinders {1} heads {2} sectors per track",
geometryBlock.cylinders, geometryBlock.heads,
geometryBlock.sectorsPerTrack);
@@ -480,7 +480,7 @@ namespace Aaru.DiscImages
imageInfo.Heads = geometryBlock.heads;
imageInfo.SectorsPerTrack = geometryBlock.sectorsPerTrack;
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
}
@@ -496,14 +496,14 @@ namespace Aaru.DiscImages
if(metadataBlock.identifier != entry.blockType)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect identifier for data block at position {0}",
entry.offset);
break;
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Found metadata block at position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Found metadata block at position {0}",
entry.offset);
byte[] metadata = new byte[metadataBlock.blockSize];
@@ -516,7 +516,7 @@ namespace Aaru.DiscImages
imageInfo.MediaSequence = metadataBlock.mediaSequence;
imageInfo.LastMediaSequence = metadataBlock.lastMediaSequence;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Setting media sequence as {0} of {1}", imageInfo.MediaSequence,
imageInfo.LastMediaSequence);
}
@@ -527,7 +527,7 @@ namespace Aaru.DiscImages
imageInfo.Creator = Encoding.Unicode.GetString(metadata, (int)metadataBlock.creatorOffset,
(int)(metadataBlock.creatorLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting creator: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting creator: {0}",
imageInfo.Creator);
}
@@ -538,7 +538,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.commentsOffset,
(int)(metadataBlock.commentsLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting comments: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting comments: {0}",
imageInfo.Comments);
}
@@ -549,7 +549,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaTitleOffset,
(int)(metadataBlock.mediaTitleLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting media title: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media title: {0}",
imageInfo.MediaTitle);
}
@@ -561,7 +561,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaManufacturerOffset,
(int)(metadataBlock.mediaManufacturerLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting media manufacturer: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media manufacturer: {0}",
imageInfo.MediaManufacturer);
}
@@ -572,7 +572,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaModelOffset,
(int)(metadataBlock.mediaModelLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting media model: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media model: {0}",
imageInfo.MediaModel);
}
@@ -584,7 +584,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaSerialNumberOffset,
(int)(metadataBlock.mediaSerialNumberLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting media serial number: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media serial number: {0}",
imageInfo.MediaSerialNumber);
}
@@ -595,7 +595,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaBarcodeOffset,
(int)(metadataBlock.mediaBarcodeLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting media barcode: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media barcode: {0}",
imageInfo.MediaBarcode);
}
@@ -606,7 +606,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaPartNumberOffset,
(int)(metadataBlock.mediaPartNumberLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting media part number: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media part number: {0}",
imageInfo.MediaPartNumber);
}
@@ -618,7 +618,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveManufacturerOffset,
(int)(metadataBlock.driveManufacturerLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting drive manufacturer: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive manufacturer: {0}",
imageInfo.DriveManufacturer);
}
@@ -629,7 +629,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveModelOffset,
(int)(metadataBlock.driveModelLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting drive model: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive model: {0}",
imageInfo.DriveModel);
}
@@ -641,7 +641,7 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveSerialNumberOffset,
(int)(metadataBlock.driveSerialNumberLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin", "Setting drive serial number: {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive serial number: {0}",
imageInfo.DriveSerialNumber);
}
@@ -653,12 +653,12 @@ namespace Aaru.DiscImages
Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveFirmwareRevisionOffset,
(int)(metadataBlock.driveFirmwareRevisionLength - 2));
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Setting drive firmware revision: {0}",
imageInfo.DriveFirmwareRevision);
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -671,7 +671,7 @@ namespace Aaru.DiscImages
if(tracksHeader.identifier != BlockType.TracksBlock)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect identifier for tracks block at position {0}",
entry.offset);
@@ -684,7 +684,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(trksCrc, 0) != tracksHeader.crc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
BitConverter.ToUInt64(trksCrc, 0), tracksHeader.crc64);
@@ -697,7 +697,7 @@ namespace Aaru.DiscImages
trackFlags = new Dictionary<byte, byte>();
trackIsrcs = new Dictionary<byte, string>();
DicConsole.DebugWriteLine("Aaru Format plugin", "Found {0} tracks at position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Found {0} tracks at position {0}",
tracksHeader.entries, entry.offset);
for(ushort i = 0; i < tracksHeader.entries; i++)
@@ -724,7 +724,7 @@ namespace Aaru.DiscImages
imageInfo.HasPartitions = true;
imageInfo.HasSessions = true;
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -740,10 +740,10 @@ namespace Aaru.DiscImages
if(cicmBlock.identifier != BlockType.CicmBlock)
break;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found CICM XML metadata block at position {0}", entry.offset);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
byte[] cicmBytes = new byte[cicmBlock.length];
@@ -759,13 +759,13 @@ namespace Aaru.DiscImages
}
catch(XmlException ex)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Exception {0} processing CICM XML metadata block", ex.Message);
CicmMetadata = null;
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -781,10 +781,10 @@ namespace Aaru.DiscImages
if(dumpBlock.identifier != BlockType.DumpHardwareBlock)
break;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found dump hardware block at position {0}", entry.offset);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
structureBytes = new byte[dumpBlock.length];
@@ -793,7 +793,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64);
@@ -904,7 +904,7 @@ namespace Aaru.DiscImages
if(DumpHardware.Count == 0)
DumpHardware = null;
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -920,7 +920,7 @@ namespace Aaru.DiscImages
if(partitionHeader.identifier != BlockType.TapePartitionBlock)
break;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found tape partition block at position {0}", entry.offset);
byte[] tapePartitionBytes = new byte[partitionHeader.length];
@@ -951,7 +951,7 @@ namespace Aaru.DiscImages
if(fileHeader.identifier != BlockType.TapeFileBlock)
break;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found tape file block at position {0}", entry.offset);
byte[] tapeFileBytes = new byte[fileHeader.length];
@@ -976,10 +976,10 @@ namespace Aaru.DiscImages
throw new ImageNotSupportedException("Could not find user data deduplication table.");
imageInfo.CreationTime = DateTime.FromFileTimeUtc(header.creationTime);
DicConsole.DebugWriteLine("Aaru Format plugin", "Image created on {0}", imageInfo.CreationTime);
AaruConsole.DebugWriteLine("Aaru Format plugin", "Image created on {0}", imageInfo.CreationTime);
imageInfo.LastModificationTime = DateTime.FromFileTimeUtc(header.lastWrittenTime);
DicConsole.DebugWriteLine("Aaru Format plugin", "Image last written on {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Image last written on {0}",
imageInfo.LastModificationTime);
imageInfo.XmlMediaType = GetXmlMediaType(header.mediaType);
@@ -994,7 +994,7 @@ namespace Aaru.DiscImages
imageInfo.ReadableMediaTags.AddRange(mediaTags.Keys);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Initialize caches
@@ -1005,13 +1005,13 @@ namespace Aaru.DiscImages
if(!inMemoryDdt)
ddtEntryCache = new Dictionary<ulong, ulong>();
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
// Initialize tracks, sessions and partitions
if(imageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
{
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
if(Tracks == null ||
@@ -1042,7 +1042,7 @@ namespace Aaru.DiscImages
trackIsrcs = new Dictionary<byte, string>();
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
Sessions = new List<Session>();
@@ -1057,7 +1057,7 @@ namespace Aaru.DiscImages
EndSector = Tracks.Where(t => t.TrackSession == i).Max(t => t.TrackEndSector)
});
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
ulong currentTrackOffset = 0;
@@ -1080,7 +1080,7 @@ namespace Aaru.DiscImages
(ulong)track.TrackBytesPerSector;
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
Track[] tracks = Tracks.ToArray();
@@ -1102,12 +1102,12 @@ namespace Aaru.DiscImages
tracks[i].TrackSubchannelType = TrackSubchannelType.Raw;
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
Tracks = tracks.ToList();
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
}
else
@@ -1122,7 +1122,7 @@ namespace Aaru.DiscImages
if(sectorSuffixDdt != null)
EccInit();
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
return true;
@@ -1170,7 +1170,7 @@ namespace Aaru.DiscImages
blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(structureBytes);
// Decompress block
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
switch(blockHeader.compression)
@@ -1179,7 +1179,7 @@ namespace Aaru.DiscImages
block = new byte[blockHeader.length];
imageStream.Read(block, 0, (int)blockHeader.length);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -1195,7 +1195,7 @@ namespace Aaru.DiscImages
lzmaBlock.Close();
compressedBlockMs.Close();
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -1211,7 +1211,7 @@ namespace Aaru.DiscImages
flakeReader.Close();
flacMs.Close();
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
break;
@@ -1236,7 +1236,7 @@ namespace Aaru.DiscImages
sector = new byte[blockHeader.sectorSize];
Array.Copy(block, (long)(offset * blockHeader.sectorSize), sector, 0, blockHeader.sectorSize);
DicConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
GC.GetTotalMemory(false));
return sector;

24
Aaru.Images/AaruFormat/Verify.cs
View File

@@ -44,7 +44,7 @@ namespace Aaru.DiscImages
public bool? VerifyMediaImage()
{
// This will traverse all blocks and check their CRC64 without uncompressing them
DicConsole.DebugWriteLine("Aaru Format plugin", "Checking index integrity at {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Checking index integrity at {0}",
header.indexOffset);
imageStream.Position = (long)header.indexOffset;
@@ -54,11 +54,11 @@ namespace Aaru.DiscImages
if(idxHeader.identifier != BlockType.Index)
{
DicConsole.DebugWriteLine("Aaru Format plugin", "Incorrect index identifier");
AaruConsole.DebugWriteLine("Aaru Format plugin", "Incorrect index identifier");
return false;
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
header.indexOffset, idxHeader.entries);
structureBytes = new byte[Marshal.SizeOf<IndexEntry>() * idxHeader.entries];
@@ -67,7 +67,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(verifyCrc, 0) != idxHeader.crc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin", "Expected index CRC {0:X16} but got {1:X16}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Expected index CRC {0:X16} but got {1:X16}",
idxHeader.crc64, BitConverter.ToUInt64(verifyCrc, 0));
return false;
}
@@ -80,7 +80,7 @@ namespace Aaru.DiscImages
structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
imageStream.Read(structureBytes, 0, structureBytes.Length);
IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(structureBytes);
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Block type {0} with data type {1} is indexed to be at {2}", entry.blockType,
entry.dataType, entry.offset);
vrIndex.Add(entry);
@@ -106,7 +106,7 @@ namespace Aaru.DiscImages
crcVerify = new Crc64Context();
readBytes = 0;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Verifying data block type {0} at position {1}", entry.dataType,
entry.offset);
@@ -126,7 +126,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(verifyCrc, 0) != blockHeader.cmpCrc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Expected block CRC {0:X16} but got {1:X16}",
blockHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0));
return false;
@@ -141,7 +141,7 @@ namespace Aaru.DiscImages
crcVerify = new Crc64Context();
readBytes = 0;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Verifying deduplication table type {0} at position {1}",
entry.dataType, entry.offset);
@@ -161,7 +161,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(verifyCrc, 0) != ddtHeader.cmpCrc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Expected DDT CRC {0:X16} but got {1:X16}", ddtHeader.cmpCrc64,
BitConverter.ToUInt64(verifyCrc, 0));
return false;
@@ -173,7 +173,7 @@ namespace Aaru.DiscImages
imageStream.Read(structureBytes, 0, structureBytes.Length);
TracksHeader trkHeader = Marshal.SpanToStructureLittleEndian<TracksHeader>(structureBytes);
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Track block at {0} contains {1} entries", header.indexOffset,
trkHeader.entries);
@@ -183,7 +183,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(verifyCrc, 0) != trkHeader.crc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Expected index CRC {0:X16} but got {1:X16}", trkHeader.crc64,
BitConverter.ToUInt64(verifyCrc, 0));
return false;
@@ -191,7 +191,7 @@ namespace Aaru.DiscImages
break;
default:
DicConsole.DebugWriteLine("Aaru Format plugin", "Ignored field type {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Ignored field type {0}",
entry.blockType);
break;
}

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

@@ -209,7 +209,7 @@ namespace Aaru.DiscImages
shift++;
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Got a shift of {0} for {1} sectors per block",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Got a shift of {0} for {1} sectors per block",
shift, oldSectorsPerBlock);
imageInfo = new ImageInfo
@@ -297,7 +297,7 @@ namespace Aaru.DiscImages
return false;
}
DicConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
header.indexOffset, idxHeader.entries);
for(ushort i = 0; i < idxHeader.entries; i++)
@@ -306,7 +306,7 @@ namespace Aaru.DiscImages
imageStream.Read(structureBytes, 0, structureBytes.Length);
IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(structureBytes);
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Block type {0} with data type {1} is indexed to be at {2}",
entry.blockType, entry.dataType, entry.offset);
@@ -345,7 +345,7 @@ namespace Aaru.DiscImages
if(blockHeader.identifier != entry.blockType)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect identifier for data block at position {0}",
entry.offset);
@@ -354,7 +354,7 @@ namespace Aaru.DiscImages
if(blockHeader.type != entry.dataType)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Expected block with data type {0} at position {1} but found data type {2}",
entry.dataType, entry.offset, blockHeader.type);
@@ -363,7 +363,7 @@ namespace Aaru.DiscImages
byte[] data;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found data block type {0} at position {1}", entry.dataType,
entry.offset);
@@ -387,7 +387,7 @@ namespace Aaru.DiscImages
}
else
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found unknown compression type {0}, continuing...",
(ushort)blockHeader.compression);
@@ -399,7 +399,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64);
@@ -463,7 +463,7 @@ namespace Aaru.DiscImages
switch(ddtHeader.compression)
{
case CompressionType.Lzma:
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Decompressing DDT...");
DateTime ddtStart = DateTime.UtcNow;
@@ -483,7 +483,7 @@ namespace Aaru.DiscImages
DateTime ddtEnd = DateTime.UtcNow;
inMemoryDdt = true;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to decompress DDT",
(ddtEnd - ddtStart).TotalSeconds);
@@ -535,7 +535,7 @@ namespace Aaru.DiscImages
switch(ddtHeader.compression)
{
case CompressionType.Lzma:
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Decompressing DDT...");
DateTime ddtStart = DateTime.UtcNow;
@@ -552,7 +552,7 @@ namespace Aaru.DiscImages
compressedDdtMs.Close();
DateTime ddtEnd = DateTime.UtcNow;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to decompress DDT",
(ddtEnd - ddtStart).TotalSeconds);
@@ -594,7 +594,7 @@ namespace Aaru.DiscImages
if(cicmBlock.identifier != BlockType.CicmBlock)
break;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found CICM XML metadata block at position {0}", entry.offset);
byte[] cicmBytes = new byte[cicmBlock.length];
@@ -610,7 +610,7 @@ namespace Aaru.DiscImages
}
catch(XmlException ex)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Exception {0} processing CICM XML metadata block",
ex.Message);
@@ -630,7 +630,7 @@ namespace Aaru.DiscImages
if(dumpBlock.identifier != BlockType.DumpHardwareBlock)
break;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found dump hardware block at position {0}", entry.offset);
structureBytes = new byte[dumpBlock.length];
@@ -639,7 +639,7 @@ namespace Aaru.DiscImages
if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64)
{
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64);
@@ -763,7 +763,7 @@ namespace Aaru.DiscImages
if(partitionHeader.identifier != BlockType.TapePartitionBlock)
break;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found tape partition block at position {0}", entry.offset);
byte[] tapePartitionBytes = new byte[partitionHeader.length];
@@ -796,7 +796,7 @@ namespace Aaru.DiscImages
if(fileHeader.identifier != BlockType.TapeFileBlock)
break;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Found tape file block at position {0}", entry.offset);
byte[] tapeFileBytes = new byte[fileHeader.length];
@@ -892,7 +892,7 @@ namespace Aaru.DiscImages
spamsumProvider = new SpamSumContext();
}
DicConsole.DebugWriteLine("Aaru Format plugin", "In memory DDT?: {0}", inMemoryDdt);
AaruConsole.DebugWriteLine("Aaru Format plugin", "In memory DDT?: {0}", inMemoryDdt);
// Initialize tables
imageStream.Seek(0, SeekOrigin.End);
@@ -1873,7 +1873,7 @@ namespace Aaru.DiscImages
}
if(deduplicate)
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Of {0} sectors written, {1} are unique ({2:P})", writtenSectors,
deduplicationTable.Count, (double)deduplicationTable.Count / writtenSectors);
@@ -1886,7 +1886,7 @@ namespace Aaru.DiscImages
if(mediaTag.Value is null)
{
DicConsole.ErrorWriteLine("Tag type {0} is null, skipping...", dataType);
AaruConsole.ErrorWriteLine("Tag type {0} is null, skipping...", dataType);
continue;
}
@@ -1896,7 +1896,7 @@ namespace Aaru.DiscImages
blockType = BlockType.DataBlock, dataType = dataType, offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing tag type {0} to position {1}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tag type {0} to position {1}",
mediaTag.Key, idxEntry.offset);
Crc64Context.Data(mediaTag.Value, out byte[] tagCrc);
@@ -1960,7 +1960,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing geometry block to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing geometry block to position {0}",
idxEntry.offset);
structureBytes = new byte[Marshal.SizeOf<GeometryBlock>()];
@@ -2093,7 +2093,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing dump hardware block to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing dump hardware block to position {0}",
idxEntry.offset);
Crc64Context.Data(dumpMs.ToArray(), out byte[] dumpCrc);
@@ -2126,7 +2126,7 @@ namespace Aaru.DiscImages
blockType = BlockType.CicmBlock, dataType = DataType.NoData, offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing CICM XML block to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing CICM XML block to position {0}",
idxEntry.offset);
var cicmBlock = new CicmMetadataBlock
@@ -2231,7 +2231,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing checksum block to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing checksum block to position {0}",
idxEntry.offset);
structureBytes = new byte[Marshal.SizeOf<ChecksumHeader>()];
@@ -2263,7 +2263,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing tape partitions to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tape partitions to position {0}",
idxEntry.offset);
TapePartitionEntry[] tapePartitionEntries = new TapePartitionEntry[TapePartitions.Count];
@@ -2303,7 +2303,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing tape files to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tape files to position {0}",
idxEntry.offset);
TapeFileEntry[] tapeFileEntries = new TapeFileEntry[Files.Count];
@@ -2345,7 +2345,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing user data DDT to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing user data DDT to position {0}",
idxEntry.offset);
var ddtHeader = new DdtHeader
@@ -2404,7 +2404,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing CD sector prefix block to position {0}", idxEntry.offset);
Crc64Context.Data(sectorPrefix, out byte[] blockCrc);
@@ -2443,7 +2443,7 @@ namespace Aaru.DiscImages
endCompress = DateTime.Now;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to compress prefix",
(endCompress - startCompress).TotalSeconds);
}
@@ -2470,7 +2470,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing CD sector suffix block to position {0}", idxEntry.offset);
Crc64Context.Data(sectorSuffix, out blockCrc);
@@ -2507,7 +2507,7 @@ namespace Aaru.DiscImages
endCompress = DateTime.Now;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to compress suffix",
(endCompress - startCompress).TotalSeconds);
}
@@ -2566,19 +2566,19 @@ namespace Aaru.DiscImages
else if((sectorSuffixDdt[i] & CD_DFIX_MASK) > 0)
writtenSuffixes++;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"{0} ({1:P}% prefixes are correct, {2} ({3:P}%) prefixes have not been dumped, {4} ({5:P}%) prefixes have been written to image",
correctPrefixes, correctPrefixes / imageInfo.Sectors,
notDumpedPrefixes, notDumpedPrefixes / imageInfo.Sectors,
writtenPrefixes, writtenPrefixes / imageInfo.Sectors);
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"{0} ({1:P}% suffixes are correct, {2} ({3:P}%) suffixes have not been dumped, {4} ({5:P}%) suffixes have been written to image",
correctSuffixes, correctSuffixes / imageInfo.Sectors,
notDumpedSuffixes, notDumpedSuffixes / imageInfo.Sectors,
writtenSuffixes, writtenSuffixes / imageInfo.Sectors);
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"{0} ({1:P}% MODE 2 Form 1 are correct, {2} ({3:P}%) MODE 2 Form 2 are correct, {4} ({5:P}%) MODE 2 Form 2 have empty CRC",
correctMode2Form1, correctMode2Form1 / imageInfo.Sectors,
correctMode2Form2, correctMode2Form2 / imageInfo.Sectors,
@@ -2591,7 +2591,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing CompactDisc sector prefix DDT to position {0}",
idxEntry.offset);
@@ -2640,7 +2640,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing CompactDisc sector suffix DDT to position {0}",
idxEntry.offset);
@@ -2688,7 +2688,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing CD sector corrected prefix block to position {0}",
idxEntry.offset);
@@ -2729,7 +2729,7 @@ namespace Aaru.DiscImages
endCompress = DateTime.Now;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to compress prefix",
(endCompress - startCompress).TotalSeconds);
}
@@ -2756,7 +2756,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing CD sector corrected suffix block to position {0}",
idxEntry.offset);
@@ -2797,7 +2797,7 @@ namespace Aaru.DiscImages
endCompress = DateTime.Now;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to compress suffix",
(endCompress - startCompress).TotalSeconds);
}
@@ -2827,7 +2827,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing CD MODE2 subheaders block to position {0}", idxEntry.offset);
Crc64Context.Data(mode2Subheaders, out byte[] blockCrc);
@@ -2867,7 +2867,7 @@ namespace Aaru.DiscImages
endCompress = DateTime.Now;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to compress MODE2 subheaders",
(endCompress - startCompress).TotalSeconds);
}
@@ -2897,7 +2897,7 @@ namespace Aaru.DiscImages
offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing CD subchannel block to position {0}", idxEntry.offset);
Crc64Context.Data(sectorSubchannel, out byte[] blockCrc);
@@ -2938,7 +2938,7 @@ namespace Aaru.DiscImages
endCompress = DateTime.Now;
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Took {0} seconds to compress subchannel",
(endCompress - startCompress).TotalSeconds);
}
@@ -3009,7 +3009,7 @@ namespace Aaru.DiscImages
crc64 = BitConverter.ToUInt64(trksCrc, 0)
};
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing tracks to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing tracks to position {0}",
imageStream.Position);
index.RemoveAll(t => t.blockType == BlockType.TracksBlock && t.dataType == DataType.NoData);
@@ -3064,7 +3064,7 @@ namespace Aaru.DiscImages
blockType = BlockType.DataBlock, dataType = tagType, offset = (ulong)imageStream.Position
};
DicConsole.DebugWriteLine("Aaru Format plugin",
AaruConsole.DebugWriteLine("Aaru Format plugin",
"Writing apple sector tag block to position {0}", idxEntry.offset);
Crc64Context.Data(sectorSubchannel, out byte[] blockCrc);
@@ -3325,7 +3325,7 @@ namespace Aaru.DiscImages
// Check if we set up any metadata earlier, then write its block
if(metadataBlock.identifier == BlockType.MetadataBlock)
{
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing metadata to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing metadata to position {0}",
imageStream.Position);
metadataBlock.blockSize = (uint)blockStream.Length;
@@ -3348,7 +3348,7 @@ namespace Aaru.DiscImages
header.indexOffset = (ulong)imageStream.Position;
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing index to position {0}",
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing index to position {0}",
header.indexOffset);
blockStream = new MemoryStream();
@@ -3377,7 +3377,7 @@ namespace Aaru.DiscImages
blockStream.Close();
blockStream = null;
DicConsole.DebugWriteLine("Aaru Format plugin", "Writing header");
AaruConsole.DebugWriteLine("Aaru Format plugin", "Writing header");
header.lastWrittenTime = DateTime.UtcNow.ToFileTimeUtc();
imageStream.Position = 0;
structurePointer = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<DicHeader>());