From 828c1e3da04cf4997ae06c6748b27bb58d981b6f Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 3 Oct 2023 18:39:13 +0100 Subject: [PATCH] [Aaru.Images] Introduced constants for module names Introduces constant fields for respective debug module names, replacing the hardcoded ones. This is done to standardize the naming convention, reduce redundancy and potentially avoid any typos or name mismatches across the project. This change makes the code more maintainable and easier to update in case module names need to be changed. --- Aaru.Images/A2R/A2R.cs | 2 + Aaru.Images/A2R/Read.cs | 38 +-- Aaru.Images/AaruFormat/AaruFormat.cs | 2 + .../AaruFormat/ClauniaSubchannelTransform.cs | 12 +- Aaru.Images/AaruFormat/Read.cs | 206 +++++++-------- Aaru.Images/AaruFormat/Verify.cs | 24 +- Aaru.Images/AaruFormat/Write.cs | 222 ++++++++--------- Aaru.Images/Alcohol120/Alcohol120.cs | 2 + Aaru.Images/Alcohol120/Read.cs | 123 +++++---- Aaru.Images/Anex86/Anex86.cs | 2 + Aaru.Images/Anex86/Identify.cs | 16 +- Aaru.Images/Anex86/Read.cs | 2 +- Aaru.Images/Apple2MG/Apple2MG.cs | 2 + Aaru.Images/Apple2MG/Read.cs | 36 +-- Aaru.Images/AppleNIB/AppleNIB.cs | 2 + Aaru.Images/AppleNIB/Read.cs | 12 +- Aaru.Images/Apridisk/Apridisk.cs | 2 + Aaru.Images/Apridisk/Read.cs | 18 +- Aaru.Images/BLU/BLU.cs | 2 + Aaru.Images/BLU/Read.cs | 8 +- Aaru.Images/BlindWrite4/BlindWrite4.cs | 2 + Aaru.Images/BlindWrite4/Read.cs | 148 +++++------ Aaru.Images/BlindWrite5/BlindWrite5.cs | 2 + Aaru.Images/BlindWrite5/Read.cs | 190 +++++++------- Aaru.Images/CDRDAO/CDRDAO.cs | 2 + Aaru.Images/CDRDAO/Read.cs | 164 ++++++------ Aaru.Images/CDRWin/CDRWin.cs | 2 + Aaru.Images/CDRWin/Read.cs | 234 +++++++++--------- Aaru.Images/CDRWin/Verify.cs | 14 +- Aaru.Images/CHD/CHD.cs | 2 + Aaru.Images/CHD/Read.cs | 154 ++++++------ Aaru.Images/CPCDSK/CPCDSK.cs | 2 + Aaru.Images/CPCDSK/Identify.cs | 2 +- Aaru.Images/CPCDSK/Read.cs | 56 ++--- Aaru.Images/CloneCD/CloneCD.cs | 2 + Aaru.Images/CloneCD/Read.cs | 56 ++--- Aaru.Images/CopyQM/CopyQM.cs | 2 + Aaru.Images/CopyQM/Read.cs | 62 ++--- Aaru.Images/D88/D88.cs | 2 + Aaru.Images/D88/Identify.cs | 12 +- Aaru.Images/D88/Read.cs | 38 +-- Aaru.Images/DART/DART.cs | 2 + Aaru.Images/DART/Read.cs | 2 +- Aaru.Images/DiscFerret/DiscFerret.cs | 2 + Aaru.Images/DiscFerret/Read.cs | 10 +- Aaru.Images/DiscJuggler/DiscJuggler.cs | 2 + Aaru.Images/DiscJuggler/Identify.cs | 2 +- Aaru.Images/DiscJuggler/Read.cs | 74 +++--- Aaru.Images/DiskCopy42/DiskCopy42.cs | 2 + Aaru.Images/DiskCopy42/Identify.cs | 24 +- Aaru.Images/DiskCopy42/Read.cs | 34 +-- Aaru.Images/DiskCopy42/Verify.cs | 16 +- Aaru.Images/DiskDupe/DiskDupe.cs | 2 + Aaru.Images/DiskDupe/Helpers.cs | 2 +- Aaru.Images/DiskDupe/Read.cs | 2 +- Aaru.Images/DriDiskCopy/DriDiskCopy.cs | 2 + Aaru.Images/DriDiskCopy/Identify.cs | 44 ++-- Aaru.Images/DriDiskCopy/Read.cs | 2 +- Aaru.Images/GDI/GDI.cs | 2 + Aaru.Images/GDI/Read.cs | 40 +-- Aaru.Images/HDCopy/HDCopy.cs | 2 + Aaru.Images/HDCopy/Read.cs | 4 +- Aaru.Images/KryoFlux/KryoFlux.cs | 2 + Aaru.Images/KryoFlux/Read.cs | 12 +- Aaru.Images/MaxiDisk/Identify.cs | 16 +- Aaru.Images/MaxiDisk/MaxiDisk.cs | 2 + Aaru.Images/NDIF/NDIF.cs | 2 + Aaru.Images/NDIF/Read.cs | 46 ++-- Aaru.Images/NHDr0/Identify.cs | 16 +- Aaru.Images/NHDr0/NHDr0.cs | 2 + Aaru.Images/Nero/Identify.cs | 10 +- Aaru.Images/Nero/Nero.cs | 2 + Aaru.Images/Nero/Read.cs | 210 ++++++++-------- Aaru.Images/Parallels/Parallels.cs | 2 + Aaru.Images/Parallels/Read.cs | 26 +- Aaru.Images/PartClone/PartClone.cs | 2 + Aaru.Images/PartClone/Read.cs | 24 +- Aaru.Images/Partimage/Partimage.cs | 2 + Aaru.Images/Partimage/Read.cs | 114 ++++----- Aaru.Images/QCOW/QCOW.cs | 2 + Aaru.Images/QCOW/Read.cs | 46 ++-- Aaru.Images/QCOW2/Identify.cs | 4 +- Aaru.Images/QCOW2/QCOW2.cs | 2 + Aaru.Images/QCOW2/Read.cs | 60 ++--- Aaru.Images/QED/QED.cs | 2 + Aaru.Images/QED/Read.cs | 42 ++-- Aaru.Images/RayDIM/Identify.cs | 12 +- Aaru.Images/RayDIM/RayDIM.cs | 2 + Aaru.Images/SaveDskF/Read.cs | 40 +-- Aaru.Images/SaveDskF/SaveDskF.cs | 2 + Aaru.Images/SuperCardPro/Read.cs | 86 +++---- Aaru.Images/SuperCardPro/SuperCardPro.cs | 3 +- Aaru.Images/T98/Identify.cs | 2 +- Aaru.Images/T98/T98.cs | 2 + Aaru.Images/TeleDisk/Helpers.cs | 24 +- Aaru.Images/TeleDisk/Identify.cs | 22 +- Aaru.Images/TeleDisk/Read.cs | 94 +++---- Aaru.Images/TeleDisk/TeleDisk.cs | 2 + Aaru.Images/UDIF/Read.cs | 110 ++++---- Aaru.Images/UDIF/UDIF.cs | 2 + Aaru.Images/UkvFdi/Read.cs | 34 +-- Aaru.Images/UkvFdi/UkvFdi.cs | 2 + Aaru.Images/VDI/Read.cs | 56 ++--- Aaru.Images/VDI/VDI.cs | 2 + Aaru.Images/VHD/Read.cs | 110 ++++---- Aaru.Images/VHD/VHD.cs | 2 + Aaru.Images/VHDX/Read.cs | 4 +- Aaru.Images/VHDX/VHDX.cs | 2 + Aaru.Images/VMware/Read.cs | 86 +++---- Aaru.Images/VMware/VMware.cs | 2 + Aaru.Images/Virtual98/Identify.cs | 18 +- Aaru.Images/Virtual98/Virtual98.cs | 2 + Aaru.Images/WCDiskImage/Read.cs | 24 +- Aaru.Images/WCDiskImage/WCDiskImage.cs | 2 + Aaru.Images/ZZZRawImage/Read.cs | 2 +- Aaru.Images/ZZZRawImage/ZZZRawImage.cs | 2 + 116 files changed, 1826 insertions(+), 1728 deletions(-) diff --git a/Aaru.Images/A2R/A2R.cs b/Aaru.Images/A2R/A2R.cs index b58fa529c..e936f3259 100644 --- a/Aaru.Images/A2R/A2R.cs +++ b/Aaru.Images/A2R/A2R.cs @@ -88,4 +88,6 @@ public sealed partial class A2R : IFluxImage, IMediaImage, IWritableImage, IWrit DriveFirmwareRevision = null }; } + + const string MODULE_NAME = "A2R plugin"; } \ No newline at end of file diff --git a/Aaru.Images/A2R/Read.cs b/Aaru.Images/A2R/Read.cs index 93a2a9c46..c8956bac0 100644 --- a/Aaru.Images/A2R/Read.cs +++ b/Aaru.Images/A2R/Read.cs @@ -58,13 +58,13 @@ public sealed partial class A2R Header = Marshal.ByteArrayToStructureLittleEndian(hdr); - AaruConsole.DebugWriteLine("A2R plugin", "header.signature = \"{0}\"", + AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature = \"{0}\"", StringHandlers.CToString(Header.signature)); - AaruConsole.DebugWriteLine("A2R plugin", "header.version = {0}", Header.version); - AaruConsole.DebugWriteLine("A2R plugin", "header.highBitTest = {0:X2}", Header.highBitTest); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.version = {0}", Header.version); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.highBitTest = {0:X2}", Header.highBitTest); - AaruConsole.DebugWriteLine("A2R plugin", "header.lineTest = {0:X2} {1:X2} {2:X2}", Header.lineTest[0], + AaruConsole.DebugWriteLine(MODULE_NAME, "header.lineTest = {0:X2} {1:X2} {2:X2}", Header.lineTest[0], Header.lineTest[1], Header.lineTest[2]); byte[] infoMagic = new byte[4]; @@ -84,22 +84,22 @@ public sealed partial class A2R _a2rStream.EnsureRead(infoChnk, 0, Marshal.SizeOf()); _infoChunkV2 = Marshal.ByteArrayToStructureLittleEndian(infoChnk); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.header.chunkId = \"{0}\"", + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.header.chunkId = \"{0}\"", StringHandlers.CToString(_infoChunkV2.header.chunkId)); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.header.chunkSize = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.header.chunkSize = {0}", _infoChunkV2.header.chunkSize); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.version = {0}", _infoChunkV2.version); + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.version = {0}", _infoChunkV2.version); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.creator = \"{0}\"", + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.creator = \"{0}\"", StringHandlers.CToString(_infoChunkV2.creator).TrimEnd()); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.diskType = {0}", _infoChunkV2.diskType); + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.diskType = {0}", _infoChunkV2.diskType); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.writeProtected = {0}", _infoChunkV2.writeProtected); + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.writeProtected = {0}", _infoChunkV2.writeProtected); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.synchronized = {0}", _infoChunkV2.synchronized); + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.synchronized = {0}", _infoChunkV2.synchronized); _imageInfo.Creator = Encoding.ASCII.GetString(_infoChunkV2.creator).TrimEnd(); @@ -129,24 +129,24 @@ public sealed partial class A2R _a2rStream.EnsureRead(infoChk, 0, Marshal.SizeOf()); _infoChunkV3 = Marshal.ByteArrayToStructureLittleEndian(infoChk); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.header.chunkId = \"{0}\"", + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.header.chunkId = \"{0}\"", StringHandlers.CToString(_infoChunkV3.header.chunkId)); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.header.chunkSize = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.header.chunkSize = {0}", _infoChunkV3.header.chunkSize); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.version = {0}", _infoChunkV3.version); + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.version = {0}", _infoChunkV3.version); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.creator = \"{0}\"", + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.creator = \"{0}\"", StringHandlers.CToString(_infoChunkV3.creator).TrimEnd()); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.driveType = {0}", _infoChunkV3.driveType); + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.driveType = {0}", _infoChunkV3.driveType); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.writeProtected = {0}", _infoChunkV3.writeProtected); + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.writeProtected = {0}", _infoChunkV3.writeProtected); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.synchronized = {0}", _infoChunkV3.synchronized); + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.synchronized = {0}", _infoChunkV3.synchronized); - AaruConsole.DebugWriteLine("A2R plugin", "infoChunk.hardSectorCount = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.hardSectorCount = {0}", _infoChunkV3.hardSectorCount); _imageInfo.Creator = Encoding.ASCII.GetString(_infoChunkV3.creator).TrimEnd(); diff --git a/Aaru.Images/AaruFormat/AaruFormat.cs b/Aaru.Images/AaruFormat/AaruFormat.cs index 4e3848768..a1d197ada 100644 --- a/Aaru.Images/AaruFormat/AaruFormat.cs +++ b/Aaru.Images/AaruFormat/AaruFormat.cs @@ -187,4 +187,6 @@ public sealed partial class AaruFormat : IWritableOpticalImage, IVerifiableImage DriveSerialNumber = null, DriveFirmwareRevision = null }; + + const string MODULE_NAME = "Aaru Format plugin"; } \ No newline at end of file diff --git a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs index 813fda4e0..c187c3e73 100644 --- a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs +++ b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs @@ -159,13 +159,13 @@ public sealed partial class AaruFormat stopwatch.Stop(); TimeSpan sequentialize = stopwatch.Elapsed; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_ms_to_deinterleave_subchannel, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_ms_to_deinterleave_subchannel, deinterleave.TotalMilliseconds); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_ms_to_sequentialize_subchannel, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_ms_to_sequentialize_subchannel, sequentialize.TotalMilliseconds); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_ms_to_transform_subchannel, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_ms_to_transform_subchannel, deinterleave.TotalMilliseconds + sequentialize.TotalMilliseconds); return sequential; @@ -292,13 +292,13 @@ public sealed partial class AaruFormat stopwatch.Stop(); TimeSpan interleave = stopwatch.Elapsed; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_ms_to_desequentialize_subchannel, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_ms_to_desequentialize_subchannel, desequentialize.TotalMilliseconds); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_ms_to_interleave_subchannel, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_ms_to_interleave_subchannel, interleave.TotalMilliseconds); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_ms_to_untransform_subchannel, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_ms_to_untransform_subchannel, interleave.TotalMilliseconds + desequentialize.TotalMilliseconds); return interleaved; diff --git a/Aaru.Images/AaruFormat/Read.cs b/Aaru.Images/AaruFormat/Read.cs index b8d8da1c3..810baf688 100644 --- a/Aaru.Images/AaruFormat/Read.cs +++ b/Aaru.Images/AaruFormat/Read.cs @@ -66,7 +66,7 @@ public sealed partial class AaruFormat /// public ErrorNumber Open(IFilter imageFilter) { - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); _imageStream = imageFilter.GetDataForkStream(); @@ -92,7 +92,7 @@ public sealed partial class AaruFormat _imageInfo.Version = $"{_header.imageMajorVersion}.{_header.imageMinorVersion}"; _imageInfo.MediaType = _header.mediaType; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Read the index header @@ -116,10 +116,10 @@ public sealed partial class AaruFormat _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length); IndexHeader2 idxHeader2 = Marshal.SpanToStructureLittleEndian(_structureBytes); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Index_at_0_contains_1_entries, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Index_at_0_contains_1_entries, _header.indexOffset, idxHeader2.entries); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Fill in-memory index @@ -131,7 +131,7 @@ public sealed partial class AaruFormat _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length); IndexEntry entry = Marshal.SpanToStructureLittleEndian(_structureBytes); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Block_type_0_with_data_type_1_is_indexed_to_be_at_2, entry.blockType, entry.dataType, entry.offset); @@ -140,10 +140,10 @@ public sealed partial class AaruFormat } else { - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Index_at_0_contains_1_entries, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Index_at_0_contains_1_entries, _header.indexOffset, idxHeader.entries); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Fill in-memory index @@ -155,7 +155,7 @@ public sealed partial class AaruFormat _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length); IndexEntry entry = Marshal.SpanToStructureLittleEndian(_structureBytes); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Block_type_0_with_data_type_1_is_indexed_to_be_at_2, entry.blockType, entry.dataType, entry.offset); @@ -163,7 +163,7 @@ public sealed partial class AaruFormat } } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); _imageInfo.ImageSize = 0; @@ -201,7 +201,7 @@ public sealed partial class AaruFormat if(blockHeader.identifier != entry.blockType) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_identifier_for_data_block_at_position_0, entry.offset); @@ -210,7 +210,7 @@ public sealed partial class AaruFormat if(blockHeader.type != entry.dataType) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Expected_block_with_data_type_0_at_position_1_but_found_data_type_2, entry.dataType, entry.offset, blockHeader.type); @@ -220,10 +220,10 @@ public sealed partial class AaruFormat byte[] data; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Found_data_block_type_0_at_position_1, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_data_block_type_0_at_position_1, entry.dataType, entry.offset); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Decompress media tag @@ -233,7 +233,7 @@ public sealed partial class AaruFormat if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform && entry.dataType != DataType.CdSectorSubchannel) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Invalid_compression_type_0_for_block_with_data_type_1_continuing, blockHeader.compression, entry.dataType); @@ -252,7 +252,7 @@ public sealed partial class AaruFormat if(decompressedLength != blockHeader.length) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Error_decompressing_block_should_be_0_bytes_but_got_1_bytes, blockHeader.length, decompressedLength); @@ -265,11 +265,11 @@ public sealed partial class AaruFormat decompressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_decompress_block, decompressStopwatch.Elapsed.TotalSeconds); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); } else if(blockHeader.compression == CompressionType.None) @@ -277,12 +277,12 @@ public sealed partial class AaruFormat data = new byte[blockHeader.length]; _imageStream.EnsureRead(data, 0, (int)blockHeader.length); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); } else { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_unknown_compression_type_0_continuing, (ushort)blockHeader.compression); @@ -295,7 +295,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64 && blockHeader.crc64 != 0) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing, BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64); @@ -322,7 +322,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader)) _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -351,7 +351,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc)) _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -361,7 +361,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel)) _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -373,14 +373,14 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag)) _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; case DataType.CompactDiscMode2Subheader: _mode2Subheaders = data; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -393,7 +393,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorTitleKey)) _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorTitleKey); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -406,7 +406,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorNumber)) _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorNumber); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -416,7 +416,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorIed)) _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorIed); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -426,7 +426,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorEdc)) _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorEdc); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -436,7 +436,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdTitleKeyDecrypted)) _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdTitleKeyDecrypted); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -445,7 +445,7 @@ public sealed partial class AaruFormat if(_mediaTags.ContainsKey(mediaTagType)) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Media_tag_type_0_duplicated_removing_previous_entry, mediaTagType); @@ -455,7 +455,7 @@ public sealed partial class AaruFormat _mediaTags.Add(mediaTagType, data); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -477,14 +477,14 @@ public sealed partial class AaruFormat _imageInfo.Sectors = ddtHeader.entries; _shift = ddtHeader.shift; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Check for DDT compression switch(ddtHeader.compression) { case CompressionType.Lzma: - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Decompressing_DDT); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decompressing_DDT); var ddtStopwatch = new Stopwatch(); ddtStopwatch.Start(); byte[] compressedDdt = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH]; @@ -498,7 +498,7 @@ public sealed partial class AaruFormat if(decompressedLength != ddtHeader.length) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Error_decompressing_DDT_should_be_0_bytes_but_got_1_bytes, ddtHeader.length, decompressedLength); @@ -510,11 +510,11 @@ public sealed partial class AaruFormat ddtStopwatch.Stop(); _inMemoryDdt = true; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_decompress_DDT, ddtStopwatch.Elapsed.TotalSeconds); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); @@ -523,7 +523,7 @@ public sealed partial class AaruFormat _inMemoryDdt = false; _outMemoryDdtPosition = (long)entry.offset; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); @@ -545,14 +545,14 @@ public sealed partial class AaruFormat { byte[] decompressedDdt = new byte[ddtHeader.length]; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Check for DDT compression switch(ddtHeader.compression) { case CompressionType.Lzma: - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Decompressing_DDT); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decompressing_DDT); var ddtStopwatch = new Stopwatch(); ddtStopwatch.Start(); byte[] compressedDdt = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH]; @@ -567,7 +567,7 @@ public sealed partial class AaruFormat if(decompressedLength != ddtHeader.length) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Error_decompressing_DDT_should_be_0_bytes_but_got_1_bytes, ddtHeader.length, decompressedLength); @@ -575,11 +575,11 @@ public sealed partial class AaruFormat return ErrorNumber.InOutError; } - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_decompress_DDT, ddtStopwatch.Elapsed.TotalSeconds); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); @@ -587,7 +587,7 @@ public sealed partial class AaruFormat case CompressionType.None: _imageStream.EnsureRead(decompressedDdt, 0, decompressedDdt.Length); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); @@ -617,7 +617,7 @@ public sealed partial class AaruFormat break; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -634,7 +634,7 @@ public sealed partial class AaruFormat if(_geometryBlock.identifier == BlockType.GeometryBlock) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Geometry_set_to_0_cylinders_1_heads_2_sectors_per_track, _geometryBlock.cylinders, _geometryBlock.heads, _geometryBlock.sectorsPerTrack); @@ -643,7 +643,7 @@ public sealed partial class AaruFormat _imageInfo.Heads = _geometryBlock.heads; _imageInfo.SectorsPerTrack = _geometryBlock.sectorsPerTrack; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); } @@ -658,14 +658,14 @@ public sealed partial class AaruFormat if(metadataBlock.identifier != entry.blockType) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_identifier_for_data_block_at_position_0, entry.offset); break; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Found_metadata_block_at_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_metadata_block_at_position_0, entry.offset); byte[] metadata = new byte[metadataBlock.blockSize]; @@ -677,7 +677,7 @@ public sealed partial class AaruFormat _imageInfo.MediaSequence = metadataBlock.mediaSequence; _imageInfo.LastMediaSequence = metadataBlock.lastMediaSequence; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_sequence_as_0_of_1, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_sequence_as_0_of_1, _imageInfo.MediaSequence, _imageInfo.LastMediaSequence); } @@ -687,7 +687,7 @@ public sealed partial class AaruFormat _imageInfo.Creator = Encoding.Unicode.GetString(metadata, (int)metadataBlock.creatorOffset, (int)(metadataBlock.creatorLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_creator_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_creator_0, _imageInfo.Creator); } @@ -697,7 +697,7 @@ public sealed partial class AaruFormat _imageInfo.Comments = Encoding.Unicode.GetString(metadata, (int)metadataBlock.commentsOffset, (int)(metadataBlock.commentsLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_comments_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_comments_0, _imageInfo.Comments); } @@ -708,7 +708,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaTitleOffset, (int)(metadataBlock.mediaTitleLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_title_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_title_0, _imageInfo.MediaTitle); } @@ -719,7 +719,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaManufacturerOffset, (int)(metadataBlock.mediaManufacturerLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_manufacturer_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_manufacturer_0, _imageInfo.MediaManufacturer); } @@ -730,7 +730,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaModelOffset, (int)(metadataBlock.mediaModelLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_model_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_model_0, _imageInfo.MediaModel); } @@ -741,7 +741,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaSerialNumberOffset, (int)(metadataBlock.mediaSerialNumberLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_serial_number_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_serial_number_0, _imageInfo.MediaSerialNumber); } @@ -752,7 +752,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaBarcodeOffset, (int)(metadataBlock.mediaBarcodeLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_barcode_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_barcode_0, _imageInfo.MediaBarcode); } @@ -763,7 +763,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaPartNumberOffset, (int)(metadataBlock.mediaPartNumberLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_part_number_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_part_number_0, _imageInfo.MediaPartNumber); } @@ -774,7 +774,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveManufacturerOffset, (int)(metadataBlock.driveManufacturerLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_drive_manufacturer_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_drive_manufacturer_0, _imageInfo.DriveManufacturer); } @@ -785,7 +785,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveModelOffset, (int)(metadataBlock.driveModelLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_drive_model_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_drive_model_0, _imageInfo.DriveModel); } @@ -796,7 +796,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveSerialNumberOffset, (int)(metadataBlock.driveSerialNumberLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_drive_serial_number_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_drive_serial_number_0, _imageInfo.DriveSerialNumber); } @@ -808,11 +808,11 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveFirmwareRevisionOffset, (int)(metadataBlock.driveFirmwareRevisionLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_drive_firmware_revision_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_drive_firmware_revision_0, _imageInfo.DriveFirmwareRevision); } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -825,7 +825,7 @@ public sealed partial class AaruFormat if(tracksHeader.identifier != BlockType.TracksBlock) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_identifier_for_tracks_block_at_position_0, entry.offset); @@ -838,7 +838,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(trksCrc, 0) != tracksHeader.crc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing, BitConverter.ToUInt64(trksCrc, 0), tracksHeader.crc64); @@ -852,7 +852,7 @@ public sealed partial class AaruFormat _trackFlags = new Dictionary(); _trackIsrcs = new Dictionary(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Found_0_tracks_at_position_1, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_0_tracks_at_position_1, tracksHeader.entries, entry.offset); for(ushort i = 0; i < tracksHeader.entries; i++) @@ -895,7 +895,7 @@ public sealed partial class AaruFormat _imageInfo.HasPartitions = true; _imageInfo.HasSessions = true; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -911,10 +911,10 @@ public sealed partial class AaruFormat if(cicmBlock.identifier != BlockType.CicmBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_CICM_XML_metadata_block_at_position_0, entry.offset); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); byte[] cicmBytes = new byte[cicmBlock.length]; @@ -938,14 +938,14 @@ public sealed partial class AaruFormat } catch(XmlException ex) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Exception_0_processing_CICM_XML_metadata_block, ex.Message); AaruMetadata = null; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -961,10 +961,10 @@ public sealed partial class AaruFormat if(aaruMetadataBlock.identifier != BlockType.AaruMetadataJsonBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Aaru_Metadata_block_at_position_0, entry.offset); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); byte[] jsonBytes = new byte[aaruMetadataBlock.length]; @@ -978,13 +978,13 @@ public sealed partial class AaruFormat } catch(JsonException ex) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Exception_0_processing_Aaru_Metadata_block, ex.Message); AaruMetadata = null; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1000,10 +1000,10 @@ public sealed partial class AaruFormat if(dumpBlock.identifier != BlockType.DumpHardwareBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_dump_hardware_block_at_position_0, entry.offset); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); _structureBytes = new byte[dumpBlock.length]; @@ -1012,7 +1012,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing, BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64); @@ -1126,7 +1126,7 @@ public sealed partial class AaruFormat if(DumpHardware.Count == 0) DumpHardware = null; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1142,7 +1142,7 @@ public sealed partial class AaruFormat if(partitionHeader.identifier != BlockType.TapePartitionBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_tape_partition_block_at_position_0, entry.offset); byte[] tapePartitionBytes = new byte[partitionHeader.length]; @@ -1175,7 +1175,7 @@ public sealed partial class AaruFormat if(fileHeader.identifier != BlockType.TapeFileBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Found_tape_file_block_at_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_tape_file_block_at_position_0, entry.offset); byte[] tapeFileBytes = new byte[fileHeader.length]; @@ -1206,7 +1206,7 @@ public sealed partial class AaruFormat if(indexesHeader.identifier != BlockType.CompactDiscIndexesBlock) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_identifier_for_compact_disc_indexes_block_at_position_0, entry.offset); @@ -1220,7 +1220,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(idsxCrc, 0) != indexesHeader.crc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing, BitConverter.ToUInt64(idsxCrc, 0), indexesHeader.crc64); @@ -1232,7 +1232,7 @@ public sealed partial class AaruFormat compactDiscIndexes = new List(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_0_compact_disc_indexes_at_position_1, indexesHeader.entries, entry.offset); @@ -1246,7 +1246,7 @@ public sealed partial class AaruFormat CompactDiscIndexEntry>(_structureBytes)); } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1261,10 +1261,10 @@ public sealed partial class AaruFormat } _imageInfo.CreationTime = DateTime.FromFileTimeUtc(_header.creationTime); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Image_created_on_0, _imageInfo.CreationTime); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Image_created_on_0, _imageInfo.CreationTime); _imageInfo.LastModificationTime = DateTime.FromFileTimeUtc(_header.lastWrittenTime); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Image_last_written_on_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Image_last_written_on_0, _imageInfo.LastModificationTime); _imageInfo.MetadataMediaType = GetMetadataMediaType(_header.mediaType); @@ -1279,7 +1279,7 @@ public sealed partial class AaruFormat _imageInfo.ReadableMediaTags.AddRange(_mediaTags.Keys); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Initialize caches @@ -1290,7 +1290,7 @@ public sealed partial class AaruFormat if(!_inMemoryDdt) _ddtEntryCache = new Dictionary(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Initialize tracks, sessions and partitions @@ -1407,7 +1407,7 @@ public sealed partial class AaruFormat This_image_has_a_corrupted_track_list_a_best_effort_has_been_tried_but_may_require_manual_editing_or_redump); } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); if(Tracks == null || @@ -1439,7 +1439,7 @@ public sealed partial class AaruFormat _trackIsrcs = new Dictionary(); } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); Sessions = new List(); @@ -1454,7 +1454,7 @@ public sealed partial class AaruFormat EndSector = Tracks.Where(t => t.Session == i).Max(t => t.EndSector) }); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); foreach(Track track in Tracks.OrderBy(t => t.StartSector)) @@ -1504,7 +1504,7 @@ public sealed partial class AaruFormat currentTrackOffset += (track.EndSector - track.StartSector + 1) * (ulong)track.BytesPerSector; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); Track[] tracks = Tracks.ToArray(); @@ -1530,12 +1530,12 @@ public sealed partial class AaruFormat trk.SubchannelType = TrackSubchannelType.Raw; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); Tracks = tracks.ToList(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); if(compactDiscIndexes != null) @@ -1562,7 +1562,7 @@ public sealed partial class AaruFormat if(_sectorSuffixDdt != null) EccInit(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); if(_imageInfo.MetadataMediaType != MetadataMediaType.OpticalDisc) @@ -1635,7 +1635,7 @@ public sealed partial class AaruFormat blockHeader = Marshal.SpanToStructureLittleEndian(_structureBytes); // Decompress block - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); ulong decompressedLength; @@ -1646,7 +1646,7 @@ public sealed partial class AaruFormat block = new byte[blockHeader.length]; _imageStream.EnsureRead(block, 0, (int)blockHeader.length); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1660,14 +1660,14 @@ public sealed partial class AaruFormat if(decompressedLength != blockHeader.length) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Error_decompressing_block_should_be_0_bytes_but_got_1_bytes, blockHeader.length, decompressedLength); return ErrorNumber.InOutError; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1679,14 +1679,14 @@ public sealed partial class AaruFormat if(decompressedLength != blockHeader.length) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Error_decompressing_block_should_be_0_bytes_but_got_1_bytes, blockHeader.length, decompressedLength); return ErrorNumber.InOutError; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1709,7 +1709,7 @@ public sealed partial class AaruFormat buffer = new byte[blockHeader.sectorSize]; Array.Copy(block, (long)(offset * blockHeader.sectorSize), buffer, 0, blockHeader.sectorSize); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); return ErrorNumber.NoError; diff --git a/Aaru.Images/AaruFormat/Verify.cs b/Aaru.Images/AaruFormat/Verify.cs index 5d5d3b46a..151e1d016 100644 --- a/Aaru.Images/AaruFormat/Verify.cs +++ b/Aaru.Images/AaruFormat/Verify.cs @@ -45,7 +45,7 @@ public sealed partial class AaruFormat public bool? VerifyMediaImage() { // This will traverse all blocks and check their CRC64 without uncompressing them - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Checking_index_integrity_at_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Checking_index_integrity_at_0, _header.indexOffset); _imageStream.Position = (long)_header.indexOffset; @@ -56,12 +56,12 @@ public sealed partial class AaruFormat if(idxHeader.identifier != BlockType.Index) { - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Incorrect_index_identifier); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_index_identifier); return false; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Index_at_0_contains_1_entries, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Index_at_0_contains_1_entries, _header.indexOffset, idxHeader.entries); _structureBytes = new byte[Marshal.SizeOf() * idxHeader.entries]; @@ -70,7 +70,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(verifyCrc, 0) != idxHeader.crc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Expected_index_CRC_0_X16_but_got_1_X16, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Expected_index_CRC_0_X16_but_got_1_X16, idxHeader.crc64, BitConverter.ToUInt64(verifyCrc, 0)); return false; @@ -86,7 +86,7 @@ public sealed partial class AaruFormat _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length); IndexEntry entry = Marshal.SpanToStructureLittleEndian(_structureBytes); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Block_type_0_with_data_type_1_is_indexed_to_be_at_2, entry.blockType, entry.dataType, entry.offset); @@ -113,7 +113,7 @@ public sealed partial class AaruFormat crcVerify = new Crc64Context(); readBytes = 0; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Verifying_data_block_type_0_at_position_1, entry.dataType, entry.offset); @@ -133,7 +133,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(verifyCrc, 0) != blockHeader.cmpCrc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Expected_block_CRC_0_X16_but_got_1_X16, blockHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0)); @@ -149,7 +149,7 @@ public sealed partial class AaruFormat crcVerify = new Crc64Context(); readBytes = 0; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Verifying_deduplication_table_type_0_at_position_1, entry.dataType, entry.offset); @@ -169,7 +169,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(verifyCrc, 0) != ddtHeader.cmpCrc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Expected_DDT_CRC_0_but_got_1, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Expected_DDT_CRC_0_but_got_1, ddtHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0)); return false; @@ -181,7 +181,7 @@ public sealed partial class AaruFormat _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length); TracksHeader trkHeader = Marshal.SpanToStructureLittleEndian(_structureBytes); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Track_block_at_0_contains_1_entries, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Track_block_at_0_contains_1_entries, _header.indexOffset, trkHeader.entries); _structureBytes = new byte[Marshal.SizeOf() * trkHeader.entries]; @@ -190,7 +190,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(verifyCrc, 0) != trkHeader.crc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Expected_index_CRC_0_X16_but_got_1_X16, trkHeader.crc64, BitConverter.ToUInt64(verifyCrc, 0)); @@ -199,7 +199,7 @@ public sealed partial class AaruFormat break; default: - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Ignored_field_type_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Ignored_field_type_0, entry.blockType); break; diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs index 483918a58..5c34a6a19 100644 --- a/Aaru.Images/AaruFormat/Write.cs +++ b/Aaru.Images/AaruFormat/Write.cs @@ -219,7 +219,7 @@ public sealed partial class AaruFormat _shift++; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Got_a_shift_of_0_for_1_sectors_per_block, _shift, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Got_a_shift_of_0_for_1_sectors_per_block, _shift, oldSectorsPerBlock); _imageInfo = new ImageInfo @@ -327,7 +327,7 @@ public sealed partial class AaruFormat return false; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Index_at_0_contains_1_entries, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Index_at_0_contains_1_entries, _header.indexOffset, idxHeader.entries); for(ushort i = 0; i < idxHeader.entries; i++) @@ -336,7 +336,7 @@ public sealed partial class AaruFormat _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length); IndexEntry entry = Marshal.SpanToStructureLittleEndian(_structureBytes); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Block_type_0_with_data_type_1_is_indexed_to_be_at_2, entry.blockType, entry.dataType, entry.offset); @@ -372,7 +372,7 @@ public sealed partial class AaruFormat if(blockHeader.identifier != entry.blockType) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_identifier_for_data_block_at_position_0, entry.offset); @@ -381,7 +381,7 @@ public sealed partial class AaruFormat if(blockHeader.type != entry.dataType) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Expected_block_with_data_type_0_at_position_1_but_found_data_type_2, entry.dataType, entry.offset, blockHeader.type); @@ -391,11 +391,11 @@ public sealed partial class AaruFormat byte[] data; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_data_block_type_0_at_position_1, entry.dataType, entry.offset); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); // Decompress media tag @@ -405,7 +405,7 @@ public sealed partial class AaruFormat if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform && entry.dataType != DataType.CdSectorSubchannel) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Invalid_compression_type_0_for_block_with_data_type_1_continuing, blockHeader.compression, entry.dataType); @@ -437,11 +437,11 @@ public sealed partial class AaruFormat decompressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_decompress_block, decompressStopwatch.Elapsed.TotalSeconds); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); } else if(blockHeader.compression == CompressionType.None) @@ -449,12 +449,12 @@ public sealed partial class AaruFormat data = new byte[blockHeader.length]; _imageStream.EnsureRead(data, 0, (int)blockHeader.length); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); } else { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_unknown_compression_type_0_continuing, (ushort)blockHeader.compression); @@ -467,7 +467,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64 && blockHeader.crc64 != 0) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing, BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64); @@ -494,7 +494,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader)) _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -523,7 +523,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc)) _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -533,7 +533,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel)) _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -545,14 +545,14 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag)) _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; case DataType.CompactDiscMode2Subheader: _mode2Subheaders = data; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -565,7 +565,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorTitleKey)) _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorTitleKey); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -575,7 +575,7 @@ public sealed partial class AaruFormat if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdTitleKeyDecrypted)) _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdTitleKeyDecrypted); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -584,7 +584,7 @@ public sealed partial class AaruFormat if(_mediaTags.ContainsKey(mediaTagType)) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Media_tag_type_0_duplicated_removing_previous_entry, mediaTagType); @@ -594,7 +594,7 @@ public sealed partial class AaruFormat _mediaTags.Add(mediaTagType, data); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -629,7 +629,7 @@ public sealed partial class AaruFormat switch(ddtHeader.compression) { case CompressionType.Lzma: - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Decompressing_DDT); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decompressing_DDT); var ddtStopwatch = new Stopwatch(); ddtStopwatch.Start(); @@ -658,7 +658,7 @@ public sealed partial class AaruFormat ddtStopwatch.Stop(); _inMemoryDdt = true; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_decompress_DDT, ddtStopwatch.Elapsed.TotalSeconds); @@ -712,7 +712,7 @@ public sealed partial class AaruFormat switch(ddtHeader.compression) { case CompressionType.Lzma: - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Decompressing_DDT); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decompressing_DDT); var ddtStopwatch = new Stopwatch(); ddtStopwatch.Start(); @@ -738,7 +738,7 @@ public sealed partial class AaruFormat ddtStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_decompress_DDT, ddtStopwatch.Elapsed.TotalSeconds); @@ -779,7 +779,7 @@ public sealed partial class AaruFormat if(_geometryBlock.identifier == BlockType.GeometryBlock) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Geometry_set_to_0_cylinders_1_heads_2_sectors_per_track, _geometryBlock.cylinders, _geometryBlock.heads, @@ -789,7 +789,7 @@ public sealed partial class AaruFormat _imageInfo.Heads = _geometryBlock.heads; _imageInfo.SectorsPerTrack = _geometryBlock.sectorsPerTrack; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); } @@ -805,14 +805,14 @@ public sealed partial class AaruFormat if(metadataBlock.identifier != entry.blockType) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_identifier_for_data_block_at_position_0, entry.offset); break; } - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_metadata_block_at_position_0, entry.offset); byte[] metadata = new byte[metadataBlock.blockSize]; @@ -824,7 +824,7 @@ public sealed partial class AaruFormat _imageInfo.MediaSequence = metadataBlock.mediaSequence; _imageInfo.LastMediaSequence = metadataBlock.lastMediaSequence; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_sequence_as_0_of_1, _imageInfo.MediaSequence, _imageInfo.LastMediaSequence); } @@ -836,7 +836,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.creatorOffset, (int)(metadataBlock.creatorLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_creator_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_creator_0, _imageInfo.Creator); } @@ -847,7 +847,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.commentsOffset, (int)(metadataBlock.commentsLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_comments_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_comments_0, _imageInfo.Comments); } @@ -858,7 +858,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaTitleOffset, (int)(metadataBlock.mediaTitleLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_title_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_title_0, _imageInfo.MediaTitle); } @@ -870,7 +870,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaManufacturerOffset, (int)(metadataBlock.mediaManufacturerLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_manufacturer_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_manufacturer_0, _imageInfo.MediaManufacturer); } @@ -881,7 +881,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaModelOffset, (int)(metadataBlock.mediaModelLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_model_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_model_0, _imageInfo.MediaModel); } @@ -893,7 +893,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaSerialNumberOffset, (int)(metadataBlock.mediaSerialNumberLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_serial_number_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_serial_number_0, _imageInfo.MediaSerialNumber); } @@ -904,7 +904,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaBarcodeOffset, (int)(metadataBlock.mediaBarcodeLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_barcode_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_barcode_0, _imageInfo.MediaBarcode); } @@ -915,7 +915,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaPartNumberOffset, (int)(metadataBlock.mediaPartNumberLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_media_part_number_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_media_part_number_0, _imageInfo.MediaPartNumber); } @@ -927,7 +927,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveManufacturerOffset, (int)(metadataBlock.driveManufacturerLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_drive_manufacturer_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_drive_manufacturer_0, _imageInfo.DriveManufacturer); } @@ -938,7 +938,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveModelOffset, (int)(metadataBlock.driveModelLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_drive_model_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_drive_model_0, _imageInfo.DriveModel); } @@ -950,7 +950,7 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveSerialNumberOffset, (int)(metadataBlock.driveSerialNumberLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Setting_drive_serial_number_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_drive_serial_number_0, _imageInfo.DriveSerialNumber); } @@ -962,12 +962,12 @@ public sealed partial class AaruFormat Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveFirmwareRevisionOffset, (int)(metadataBlock.driveFirmwareRevisionLength - 2)); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_drive_firmware_revision_0, _imageInfo.DriveFirmwareRevision); } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -981,7 +981,7 @@ public sealed partial class AaruFormat if(tracksHeader.identifier != BlockType.TracksBlock) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_identifier_for_tracks_block_at_position_0, entry.offset); @@ -994,7 +994,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(trksCrc, 0) != tracksHeader.crc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing, BitConverter.ToUInt64(trksCrc, 0), tracksHeader.crc64); @@ -1008,7 +1008,7 @@ public sealed partial class AaruFormat _trackFlags = new Dictionary(); _trackIsrcs = new Dictionary(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Found_0_tracks_at_position_1, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_0_tracks_at_position_1, tracksHeader.entries, entry.offset); for(ushort i = 0; i < tracksHeader.entries; i++) @@ -1050,7 +1050,7 @@ public sealed partial class AaruFormat _imageInfo.HasPartitions = true; _imageInfo.HasSessions = true; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1066,7 +1066,7 @@ public sealed partial class AaruFormat if(cicmBlock.identifier != BlockType.CicmBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_CICM_XML_metadata_block_at_position_0, entry.offset); @@ -1091,7 +1091,7 @@ public sealed partial class AaruFormat } catch(XmlException ex) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Exception_0_processing_CICM_XML_metadata_block, ex.Message); @@ -1111,10 +1111,10 @@ public sealed partial class AaruFormat if(aaruMetadataBlock.identifier != BlockType.AaruMetadataJsonBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Aaru_Metadata_block_at_position_0, entry.offset); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); byte[] jsonBytes = new byte[aaruMetadataBlock.length]; @@ -1128,14 +1128,14 @@ public sealed partial class AaruFormat } catch(JsonException ex) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Exception_0_processing_Aaru_Metadata_block, ex.Message); AaruMetadata = null; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1151,7 +1151,7 @@ public sealed partial class AaruFormat if(dumpBlock.identifier != BlockType.DumpHardwareBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_dump_hardware_block_at_position_0, entry.offset); _structureBytes = new byte[dumpBlock.length]; @@ -1160,7 +1160,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing, BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64); @@ -1287,7 +1287,7 @@ public sealed partial class AaruFormat if(partitionHeader.identifier != BlockType.TapePartitionBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_tape_partition_block_at_position_0, entry.offset); byte[] tapePartitionBytes = new byte[partitionHeader.length]; @@ -1321,7 +1321,7 @@ public sealed partial class AaruFormat if(fileHeader.identifier != BlockType.TapeFileBlock) break; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_tape_file_block_at_position_0, entry.offset); byte[] tapeFileBytes = new byte[fileHeader.length]; @@ -1352,7 +1352,7 @@ public sealed partial class AaruFormat if(indexesHeader.identifier != BlockType.CompactDiscIndexesBlock) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_identifier_for_compact_disc_indexes_block_at_position_0, entry.offset); @@ -1366,7 +1366,7 @@ public sealed partial class AaruFormat if(BitConverter.ToUInt64(idsxCrc, 0) != indexesHeader.crc64) { - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing, BitConverter.ToUInt64(idsxCrc, 0), indexesHeader.crc64); @@ -1378,7 +1378,7 @@ public sealed partial class AaruFormat compactDiscIndexes = new List(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_0_compact_disc_indexes_at_position_1, indexesHeader.entries, entry.offset); @@ -1392,7 +1392,7 @@ public sealed partial class AaruFormat CompactDiscIndexEntry>(_structureBytes)); } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); break; @@ -1498,7 +1498,7 @@ public sealed partial class AaruFormat } } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); if(Tracks == null || @@ -1528,7 +1528,7 @@ public sealed partial class AaruFormat _trackIsrcs = new Dictionary(); } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); Sessions = new List(); @@ -1543,7 +1543,7 @@ public sealed partial class AaruFormat EndSector = Tracks.Where(t => t.Session == i).Max(t => t.EndSector) }); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); foreach(Track track in Tracks.OrderBy(t => t.StartSector)) @@ -1586,7 +1586,7 @@ public sealed partial class AaruFormat currentTrackOffset += (track.EndSector - track.StartSector + 1) * (ulong)track.BytesPerSector; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); Track[] tracks = Tracks.ToArray(); @@ -1612,12 +1612,12 @@ public sealed partial class AaruFormat trk.SubchannelType = TrackSubchannelType.Raw; } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); Tracks = tracks.ToList(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Memory_snapshot_0_bytes, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false)); if(compactDiscIndexes != null) @@ -1701,7 +1701,7 @@ public sealed partial class AaruFormat _spamsumProvider = new SpamSumContext(); } - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.In_memory_DDT_0, _inMemoryDdt); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.In_memory_DDT_0, _inMemoryDdt); _imageStream.Seek(0, SeekOrigin.End); @@ -2670,7 +2670,7 @@ public sealed partial class AaruFormat } if(_deduplicate) - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Of_0_sectors_written_1_are_unique_2, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Of_0_sectors_written_1_are_unique_2, _writtenSectors, _deduplicationTable.Count, (double)_deduplicationTable.Count / _writtenSectors); @@ -2698,7 +2698,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_tag_type_0_to_position_1, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_tag_type_0_to_position_1, mediaTag.Key, idxEntry.offset); Crc64Context.Data(mediaTag.Value, out byte[] tagCrc); @@ -2785,7 +2785,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_geometry_block_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_geometry_block_to_position_0, idxEntry.offset); _structureBytes = new byte[Marshal.SizeOf()]; @@ -2916,7 +2916,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_dump_hardware_block_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_dump_hardware_block_to_position_0, idxEntry.offset); Crc64Context.Data(dumpMs.ToArray(), out byte[] dumpCrc); @@ -2956,7 +2956,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_Aaru_Metadata_block_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_Aaru_Metadata_block_to_position_0, idxEntry.offset); var jsonBlock = new AaruMetadataJsonBlock @@ -3069,7 +3069,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_checksum_block_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_checksum_block_to_position_0, idxEntry.offset); _structureBytes = new byte[Marshal.SizeOf()]; @@ -3102,7 +3102,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_tape_partitions_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_tape_partitions_to_position_0, idxEntry.offset); TapePartitionEntry[] tapePartitionEntries = new TapePartitionEntry[TapePartitions.Count]; @@ -3145,7 +3145,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_tape_files_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_tape_files_to_position_0, idxEntry.offset); TapeFileEntry[] tapeFileEntries = new TapeFileEntry[Files.Count]; @@ -3191,7 +3191,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_user_data_DDT_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_user_data_DDT_to_position_0, idxEntry.offset); var ddtHeader = new DdtHeader @@ -3279,7 +3279,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_CD_sector_prefix_block_to_position_0, idxEntry.offset); @@ -3345,7 +3345,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_seconds_to_compress_prefix, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_prefix, compressStopwatch.Elapsed.TotalSeconds); } @@ -3370,7 +3370,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_CD_sector_suffix_block_to_position_0, idxEntry.offset); @@ -3434,7 +3434,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_seconds_to_compress_suffix, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_suffix, compressStopwatch.Elapsed.TotalSeconds); } @@ -3520,21 +3520,21 @@ public sealed partial class AaruFormat } } - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. _0_1_prefixes_are_correct_2_3_prefixes_have_not_been_dumped_4_5_prefixes_have_been_written_to_image, correctPrefixes, correctPrefixes / _imageInfo.Sectors, notDumpedPrefixes, notDumpedPrefixes / _imageInfo.Sectors, writtenPrefixes, writtenPrefixes / _imageInfo.Sectors); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. _0_1_suffixes_are_correct_2_3_suffixes_have_not_been_dumped_4_5_suffixes_have_been_written_to_image, correctSuffixes, correctSuffixes / _imageInfo.Sectors, notDumpedSuffixes, notDumpedSuffixes / _imageInfo.Sectors, writtenSuffixes, writtenSuffixes / _imageInfo.Sectors); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization. _0_1_MODE_2_Form_1_are_correct_2_3_MODE_2_Form_2_are_correct_4_5_MODE_2_Form_2_have_empty_CRC, correctMode2Form1, correctMode2Form1 / _imageInfo.Sectors, @@ -3549,7 +3549,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_CompactDisc_sector_prefix_DDT_to_position_0, idxEntry.offset); @@ -3627,7 +3627,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_CompactDisc_sector_suffix_DDT_to_position_0, idxEntry.offset); @@ -3702,7 +3702,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_CD_sector_corrected_prefix_block_to_position_0, idxEntry.offset); @@ -3767,7 +3767,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_seconds_to_compress_prefix, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_prefix, compressStopwatch.Elapsed.TotalSeconds); } @@ -3796,7 +3796,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_CD_sector_corrected_suffix_block_to_position_0, idxEntry.offset); @@ -3861,7 +3861,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Took_0_seconds_to_compress_suffix, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_suffix, compressStopwatch.Elapsed.TotalSeconds); } @@ -3893,7 +3893,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_CD_MODE2_subheaders_block_to_position_0, idxEntry.offset); @@ -3959,7 +3959,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_MODE2_subheaders, compressStopwatch.Elapsed.TotalSeconds); } @@ -3992,7 +3992,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_CD_subchannel_block_to_position_0, idxEntry.offset); Crc64Context.Data(_sectorSubchannel, out byte[] blockCrc); @@ -4061,7 +4061,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_subchannel, compressStopwatch.Elapsed.TotalSeconds); } @@ -4094,7 +4094,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_DVD_CPR_MAI_block_to_position_0, idxEntry.offset); Crc64Context.Data(_sectorCprMai, out byte[] blockCrc); @@ -4159,7 +4159,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_CPR_MAI, compressStopwatch.Elapsed.TotalSeconds); } @@ -4189,7 +4189,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_DVD_ID_block_to_position_0, idxEntry.offset); Crc64Context.Data(_sectorId, out byte[] blockCrc); @@ -4254,7 +4254,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_ID, compressStopwatch.Elapsed.TotalSeconds); } @@ -4284,7 +4284,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_DVD_IED_block_to_position_0, idxEntry.offset); Crc64Context.Data(_sectorIed, out byte[] blockCrc); @@ -4349,7 +4349,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_IED, compressStopwatch.Elapsed.TotalSeconds); } @@ -4379,7 +4379,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_DVD_EDC_block_to_position_0, idxEntry.offset); Crc64Context.Data(_sectorEdc, out byte[] blockCrc); @@ -4444,7 +4444,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_EDC, compressStopwatch.Elapsed.TotalSeconds); } @@ -4474,7 +4474,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_decrypted_DVD_title_key_block_to_position_0, idxEntry.offset); @@ -4540,7 +4540,7 @@ public sealed partial class AaruFormat compressStopwatch.Stop(); - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Took_0_seconds_to_compress_decrypted_DVD_title_keys, compressStopwatch.Elapsed.TotalSeconds); } @@ -4639,7 +4639,7 @@ public sealed partial class AaruFormat crc64 = BitConverter.ToUInt64(trksCrc, 0) }; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_tracks_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_tracks_to_position_0, _imageStream.Position); _index.RemoveAll(t => t is { blockType: BlockType.TracksBlock, dataType: DataType.NoData }); @@ -4688,7 +4688,7 @@ public sealed partial class AaruFormat crc64 = BitConverter.ToUInt64(cdixCrc, 0) }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_compact_disc_indexes_to_position_0, _imageStream.Position); @@ -4746,7 +4746,7 @@ public sealed partial class AaruFormat offset = (ulong)_imageStream.Position }; - AaruConsole.DebugWriteLine("Aaru Format plugin", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_apple_sector_tag_block_to_position_0, idxEntry.offset); @@ -5020,7 +5020,7 @@ public sealed partial class AaruFormat // Check if we set up any metadata earlier, then write its block if(metadataBlock.identifier == BlockType.MetadataBlock) { - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_metadata_to_position_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_metadata_to_position_0, _imageStream.Position); metadataBlock.blockSize = (uint)blockStream.Length; @@ -5043,7 +5043,7 @@ public sealed partial class AaruFormat _header.indexOffset = (ulong)_imageStream.Position; - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_index_to_position_0, _header.indexOffset); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_index_to_position_0, _header.indexOffset); blockStream = new MemoryStream(); @@ -5093,7 +5093,7 @@ public sealed partial class AaruFormat _imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length); blockStream.Close(); - AaruConsole.DebugWriteLine("Aaru Format plugin", Localization.Writing_header); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_header); _header.lastWrittenTime = DateTime.UtcNow.ToFileTimeUtc(); _imageStream.Position = 0; _structurePointer = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf()); diff --git a/Aaru.Images/Alcohol120/Alcohol120.cs b/Aaru.Images/Alcohol120/Alcohol120.cs index 6096c1957..5ee2463f4 100644 --- a/Aaru.Images/Alcohol120/Alcohol120.cs +++ b/Aaru.Images/Alcohol120/Alcohol120.cs @@ -84,4 +84,6 @@ public sealed partial class Alcohol120 : IWritableOpticalImage DriveSerialNumber = null, DriveFirmwareRevision = null }; + + const string MODULE_NAME = "Alcohol 120% plugin"; } \ No newline at end of file diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs index 7666d371d..03a0b84f1 100644 --- a/Aaru.Images/Alcohol120/Read.cs +++ b/Aaru.Images/Alcohol120/Read.cs @@ -39,7 +39,6 @@ using Aaru.CommonTypes; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; using Aaru.Console; -using Aaru.Decoders.CD; using Aaru.Decoders.DVD; using Aaru.Helpers; using DMI = Aaru.Decoders.Xbox.DMI; @@ -63,39 +62,39 @@ public sealed partial class Alcohol120 stream.EnsureRead(hdr, 0, 88); _header = Marshal.ByteArrayToStructureLittleEndian
(hdr); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.signature = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature = {0}", Encoding.ASCII.GetString(_header.signature)); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.version = {0}.{1}", _header.version[0], + AaruConsole.DebugWriteLine(MODULE_NAME, "header.version = {0}.{1}", _header.version[0], _header.version[1]); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.type = {0}", _header.type); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.sessions = {0}", _header.sessions); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.type = {0}", _header.type); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.sessions = {0}", _header.sessions); for(int i = 0; i < _header.unknown1.Length; i++) - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown1[{1}] = 0x{0:X4}", _header.unknown1[i], + AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown1[{1}] = 0x{0:X4}", _header.unknown1[i], i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.bcaLength = {0}", _header.bcaLength); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.bcaLength = {0}", _header.bcaLength); for(int i = 0; i < _header.unknown2.Length; i++) - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown2[{1}] = 0x{0:X8}", _header.unknown2[i], + AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown2[{1}] = 0x{0:X8}", _header.unknown2[i], i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.bcaOffset = {0}", _header.bcaOffset); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.bcaOffset = {0}", _header.bcaOffset); for(int i = 0; i < _header.unknown3.Length; i++) - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown3[{1}] = 0x{0:X8}", _header.unknown3[i], + AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown3[{1}] = 0x{0:X8}", _header.unknown3[i], i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.structuresOffset = {0}", _header.structuresOffset); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.structuresOffset = {0}", _header.structuresOffset); for(int i = 0; i < _header.unknown4.Length; i++) - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown4[{1}] = 0x{0:X8}", _header.unknown4[i], + AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown4[{1}] = 0x{0:X8}", _header.unknown4[i], i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.sessionOffset = {0}", _header.sessionOffset); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.dpmOffset = {0}", _header.dpmOffset); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.sessionOffset = {0}", _header.sessionOffset); + AaruConsole.DebugWriteLine(MODULE_NAME, "header.dpmOffset = {0}", _header.dpmOffset); if(_header.version[0] > MAXIMUM_SUPPORTED_VERSION) return ErrorNumber.NotSupported; @@ -109,26 +108,26 @@ public sealed partial class Alcohol120 stream.EnsureRead(sesHdr, 0, 24); Session session = Marshal.SpanToStructureLittleEndian(sesHdr); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionStart = {0}", session.sessionStart, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].sessionStart = {0}", session.sessionStart, i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionEnd = {0}", session.sessionEnd, i); + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].sessionEnd = {0}", session.sessionEnd, i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionSequence = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].sessionSequence = {0}", session.sessionSequence, i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].allBlocks = {0}", session.allBlocks, i); + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].allBlocks = {0}", session.allBlocks, i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].nonTrackBlocks = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].nonTrackBlocks = {0}", session.nonTrackBlocks, i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].firstTrack = {0}", session.firstTrack, i); + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].firstTrack = {0}", session.firstTrack, i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].lastTrack = {0}", session.lastTrack, i); + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].lastTrack = {0}", session.lastTrack, i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].unknown = 0x{0:X8}", session.unknown, i); + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].unknown = 0x{0:X8}", session.unknown, i); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].trackOffset = {0}", session.trackOffset, i); + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].trackOffset = {0}", session.trackOffset, i); _alcSessions.Add(session.sessionSequence, session); } @@ -162,64 +161,64 @@ public sealed partial class Alcohol120 oldIncorrectImage = true; } - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].mode = {0}", track.mode, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].mode = {0}", track.mode, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].subMode = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].subMode = {0}", track.subMode, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].adrCtl = {0}", track.adrCtl, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].adrCtl = {0}", track.adrCtl, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].tno = {0}", track.tno, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].tno = {0}", track.tno, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].point = {0:X2}", track.point, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].point = {0:X2}", track.point, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].min = {0}", track.min, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].min = {0}", track.min, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].sec = {0}", track.sec, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].sec = {0}", track.sec, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].frame = {0}", track.frame, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].frame = {0}", track.frame, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].zero = {0}", track.zero, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].zero = {0}", track.zero, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].pmin = {0}", track.pmin, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].pmin = {0}", track.pmin, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].psec = {0}", track.psec, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].psec = {0}", track.psec, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].pframe = {0}", track.pframe, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].pframe = {0}", track.pframe, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].extraOffset = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].extraOffset = {0}", track.extraOffset, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].sectorSize = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].sectorSize = {0}", track.sectorSize, track.point, session.sessionSequence); //for(int j = 0; j < track.unknown.Length; j++) - // AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].unknown[{2}] = {0}", track.unknown[j], i, j, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].startLba = {0}", + // AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].unknown[{2}] = {0}", track.unknown[j], i, j, session.sessionSequence); + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].startLba = {0}", track.startLba, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].startOffset = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].startOffset = {0}", track.startOffset, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].files = {0}", track.files, + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].files = {0}", track.files, track.point, session.sessionSequence); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].footerOffset = {0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].footerOffset = {0}", track.footerOffset, track.point, session.sessionSequence); //for(int j = 0; j < track.unknown2.Length; j++) - // AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].unknown2[{2}] = {0}", track.unknown2[j], i, j, session.sessionSequence); + // AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].unknown2[{2}] = {0}", track.unknown2[j], i, j, session.sessionSequence); if(track.subMode == SubchannelMode.Interleaved) track.sectorSize -= 96; @@ -259,10 +258,10 @@ public sealed partial class Alcohol120 stream.EnsureRead(extHdr, 0, 8); TrackExtra extra = Marshal.SpanToStructureLittleEndian(extHdr); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "track[{1}].extra.pregap = {0}", extra.pregap, + AaruConsole.DebugWriteLine(MODULE_NAME, "track[{1}].extra.pregap = {0}", extra.pregap, track.point); - AaruConsole.DebugWriteLine("Alcohol 120% plugin", "track[{1}].extra.sectors = {0}", extra.sectors, + AaruConsole.DebugWriteLine(MODULE_NAME, "track[{1}].extra.sectors = {0}", extra.sectors, track.point); if(track.point == 1) @@ -290,11 +289,11 @@ public sealed partial class Alcohol120 stream.EnsureRead(footer, 0, 16); _alcFooter = Marshal.SpanToStructureLittleEndian