diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs index 401a8cbb5..0a6f6337a 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs @@ -598,7 +598,7 @@ partial class Dump _resume.BadBlocks.Add(i + r); - AaruConsole.DebugWriteLine("Dump-Media", Localization.Core.READ_error_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf)); mhddLog.Write(i + r, cmdDuration < 500 ? 65535 : cmdDuration); @@ -780,7 +780,7 @@ partial class Dump for(ulong b = i; b < i + _skip; b++) _resume.BadBlocks.Add(b); - AaruConsole.DebugWriteLine("Dump-Media", Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf)); mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration, _skip); ibgLog.Write(i, 0); diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs index 39f4877d0..9fc099972 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs @@ -180,7 +180,7 @@ partial class Dump break; } - AaruConsole.DebugWriteLine("Pregap calculator", bcd switch + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, bcd switch { true => Localization.Core.Subchannel_is_BCD, false => Localization.Core.Subchannel_is_not_BCD, @@ -210,7 +210,7 @@ partial class Dump // First track of each session has at least 150 sectors of pregap and is not always readable if(tracks.Where(trk => trk.Session == track.Session).MinBy(trk => trk.Sequence).Sequence == track.Sequence) { - AaruConsole.DebugWriteLine("Pregap calculator", Localization.Core.Skipping_track_0, track.Sequence); + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence); if(track.Sequence > 1) pregaps[track.Sequence] = 150; @@ -222,21 +222,21 @@ partial class Dump tracks[t - 1].Type == tracks[t].Type && dumping) { - AaruConsole.DebugWriteLine("Pregap calculator", Localization.Core.Skipping_track_0, track.Sequence); + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence); continue; } if(dumping && dev.Manufacturer.ToLowerInvariant().StartsWith("plextor", StringComparison.Ordinal)) { - AaruConsole.DebugWriteLine("Pregap calculator", + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0_due_to_Plextor_firmware_bug, track.Sequence); continue; } - AaruConsole.DebugWriteLine("Pregap calculator", Localization.Core.Track_0, track.Sequence); + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Track_0, track.Sequence); int lba = (int)track.StartSector - 1; bool pregapFound = false; @@ -257,7 +257,7 @@ partial class Dump if(sense) { - AaruConsole.DebugWriteLine("Pregap calculator", Localization.Core.LBA_0_Try_1_Sense_2, lba, + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.LBA_0_Try_1_Sense_2, lba, retries + 1, sense); continue; @@ -268,7 +268,7 @@ partial class Dump CRC16CCITTContext.Data(subBuf, 10, out crc); - AaruConsole.DebugWriteLine("Pregap calculator", + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core. LBA_0_Try_1_Sense_2_Q_3_4_5_6_7_8_9_10_11_12_CRC_13_14_Calculated_CRC_15_16, lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3], @@ -309,7 +309,7 @@ partial class Dump crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11]; if(crcOk) - AaruConsole.DebugWriteLine("Pregap calculator", + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core. LBA_0_Try_1_Sense_2_Q_FIXED_3_4_5_6_7_8_9_10_11_12_CRC_13_14_Calculated_CRC_15_16, lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3], @@ -368,7 +368,7 @@ partial class Dump CRC16CCITTContext.Data(subBuf, 10, out crc); - AaruConsole.DebugWriteLine("Pregap calculator", + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core. LBA_0_Try_1_Sense_2_Q_3_4_5_6_7_8_9_10_11_12_CRC_13_14_Calculated_CRC_15_16, lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3], @@ -410,7 +410,7 @@ partial class Dump if(crcOk) { - AaruConsole.DebugWriteLine("Pregap calculator", + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core. LBA_0_Try_1_Sense_2_Q_FIXED_3_4_5_6_7_8_9_10_11_12_CRC_13_14_Calculated_CRC_15_16, lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], @@ -492,7 +492,7 @@ partial class Dump { inexactPositioning = true; - AaruConsole.DebugWriteLine("Pregap calculator", Localization.Core.All_Q_empty_for_LBA_0, lba); + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.All_Q_empty_for_LBA_0, lba); break; } @@ -558,7 +558,7 @@ partial class Dump if(diff != 0) { - AaruConsole.DebugWriteLine("Pregap calculator", + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Invalid_Q_position_for_LBA_0_got_1, lba, posQ); inexactPositioning = true; @@ -581,7 +581,7 @@ partial class Dump // If CRC is not OK, only accept pregaps less than 10 sectors longer than previously now if(crcOk || pregapQ - pregaps[track.Sequence] < 10) { - AaruConsole.DebugWriteLine("Pregap calculator", Localization.Core.Pregap_for_track_0_1, + AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Pregap_for_track_0_1, track.Sequence, pregapQ); pregaps[track.Sequence] = pregapQ; diff --git a/Aaru.Core/Devices/Dumping/Dump.cs b/Aaru.Core/Devices/Dumping/Dump.cs index 4922de143..68ade5529 100644 --- a/Aaru.Core/Devices/Dumping/Dump.cs +++ b/Aaru.Core/Devices/Dumping/Dump.cs @@ -121,6 +121,8 @@ public partial class Dump readonly Stopwatch _trimStopwatch; readonly Stopwatch _writeStopwatch; readonly Stopwatch _imageCloseStopwatch; + const string PREGAP_MODULE_NAME = "Pregap calculator"; + const string MODULE_NAME = "Media dumping"; /// Initializes dumpers /// Should resume? diff --git a/Aaru.Core/Devices/Dumping/XGD.cs b/Aaru.Core/Devices/Dumping/XGD.cs index 136496702..aaf4f0da1 100644 --- a/Aaru.Core/Devices/Dumping/XGD.cs +++ b/Aaru.Core/Devices/Dumping/XGD.cs @@ -157,7 +157,7 @@ partial class Dump mediaTags.Add(MediaTagType.Xbox_SecuritySector, tmpBuf); // Get video partition size - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Getting_video_partition_size); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_video_partition_size); UpdateStatus?.Invoke(Localization.Core.Locking_drive); _dumpLog.WriteLine(Localization.Core.Locking_drive); sense = _dev.KreonLock(out senseBuf, _dev.Timeout, out _); @@ -205,7 +205,7 @@ partial class Dump Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4); mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf); - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Video_partition_total_size_0_sectors, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize); ulong l0Video = (PFI.Decode(readBuffer, MediaType.DVDROM)?.Layer0EndPSN ?? 0) - @@ -244,7 +244,7 @@ partial class Dump mediaTags.Remove(MediaTagType.DVD_PFI); mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf); - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Video_partition_total_size_0_sectors, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize); l0Video = (PFI.Decode(coldPfi, MediaType.DVDROM)?.Layer0EndPSN ?? 0) - @@ -263,7 +263,7 @@ partial class Dump } // Get game partition size - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Getting_game_partition_size); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_game_partition_size); UpdateStatus?.Invoke(Localization.Core.Unlocking_drive_Xtreme_); _dumpLog.WriteLine(Localization.Core.Unlocking_drive_Xtreme_); sense = _dev.KreonUnlockXtreme(out senseBuf, _dev.Timeout, out _); @@ -293,11 +293,11 @@ partial class Dump ((ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]) & 0xFFFFFFFF) + 1; - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Game_partition_total_size_0_sectors, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Game_partition_total_size_0_sectors, gameSize); // Get middle zone size - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Getting_middle_zone_size); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_middle_zone_size); UpdateStatus?.Invoke(Localization.Core.Unlocking_drive_Wxripper); _dumpLog.WriteLine(Localization.Core.Unlocking_drive_Wxripper); sense = _dev.KreonUnlockWxripper(out senseBuf, _dev.Timeout, out _); @@ -340,7 +340,7 @@ partial class Dump return; } - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Unlocked_total_size_0_sectors, totalSize); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Unlocked_total_size_0_sectors, totalSize); ulong blocks = totalSize + 1; PFI.PhysicalFormatInformation? wxRipperPfiNullable = PFI.Decode(readBuffer, MediaType.DVDROM); @@ -685,7 +685,7 @@ partial class Dump for(ulong b = i; b < i + _skip; b++) _resume.BadBlocks.Add(b); - AaruConsole.DebugWriteLine("Dump-Media", Localization.Core.READ_error_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf)); mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration, _skip); @@ -888,7 +888,7 @@ partial class Dump // TODO: Handle errors in video partition //errored += blocksToRead; //resume.BadBlocks.Add(l1); - AaruConsole.DebugWriteLine("Dump-Media", Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf)); mhddLog.Write(l1, cmdDuration < 500 ? 65535 : cmdDuration, _skip); ibgLog.Write(l1, 0); diff --git a/Aaru.Core/Devices/Info/DeviceInfo.cs b/Aaru.Core/Devices/Info/DeviceInfo.cs index 1c07effe7..8de3c06f2 100644 --- a/Aaru.Core/Devices/Info/DeviceInfo.cs +++ b/Aaru.Core/Devices/Info/DeviceInfo.cs @@ -50,6 +50,8 @@ namespace Aaru.Core.Devices.Info; /// Obtains and contains information about a device public partial class DeviceInfo { + const string MODULE_NAME = "Device information"; + /// Initializes an instance of this class for the specified device /// Device public DeviceInfo(Device dev) @@ -86,21 +88,21 @@ public partial class DeviceInfo if(sense) { - AaruConsole.DebugWriteLine("Device-Info command", "STATUS = 0x{0:X2}", errorRegisters.Status); - AaruConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.Error); + AaruConsole.DebugWriteLine(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status); + AaruConsole.DebugWriteLine(MODULE_NAME, "ERROR = 0x{0:X2}", errorRegisters.Error); - AaruConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount); + AaruConsole.DebugWriteLine(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount); - AaruConsole.DebugWriteLine("Device-Info command", "SECTOR = 0x{0:X2}", errorRegisters.Sector); + AaruConsole.DebugWriteLine(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector); - AaruConsole.DebugWriteLine("Device-Info command", "CYLHIGH = 0x{0:X2}", + AaruConsole.DebugWriteLine(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh); - AaruConsole.DebugWriteLine("Device-Info command", "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow); + AaruConsole.DebugWriteLine(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow); - AaruConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead); + AaruConsole.DebugWriteLine(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead); - AaruConsole.DebugWriteLine("Device-Info command", Localization.Core.Error_code_equals_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError); break; @@ -129,21 +131,21 @@ public partial class DeviceInfo if(sense) { - AaruConsole.DebugWriteLine("Device-Info command", "STATUS = 0x{0:X2}", errorRegisters.Status); - AaruConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.Error); + AaruConsole.DebugWriteLine(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status); + AaruConsole.DebugWriteLine(MODULE_NAME, "ERROR = 0x{0:X2}", errorRegisters.Error); - AaruConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount); + AaruConsole.DebugWriteLine(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount); - AaruConsole.DebugWriteLine("Device-Info command", "SECTOR = 0x{0:X2}", errorRegisters.Sector); + AaruConsole.DebugWriteLine(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector); - AaruConsole.DebugWriteLine("Device-Info command", "CYLHIGH = 0x{0:X2}", + AaruConsole.DebugWriteLine(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh); - AaruConsole.DebugWriteLine("Device-Info command", "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow); + AaruConsole.DebugWriteLine(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow); - AaruConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead); + AaruConsole.DebugWriteLine(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead); - AaruConsole.DebugWriteLine("Device-Info command", Localization.Core.Error_code_equals_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError); break; diff --git a/Aaru.Core/Devices/Reader.cs b/Aaru.Core/Devices/Reader.cs index ea1d8307c..4b14b39a2 100644 --- a/Aaru.Core/Devices/Reader.cs +++ b/Aaru.Core/Devices/Reader.cs @@ -44,6 +44,8 @@ sealed partial class Reader readonly Device _dev; readonly ErrorLog _errorLog; readonly uint _timeout; + const string ATA_MODULE_NAME = "ATA Reader"; + const string SCSI_MODULE_NAME = "SCSI Reader"; internal Reader(Device dev, uint timeout, byte[] identification, ErrorLog errorLog, bool raw = false) { diff --git a/Aaru.Core/Devices/ReaderATA.cs b/Aaru.Core/Devices/ReaderATA.cs index 641d77fbc..8a6884bc9 100644 --- a/Aaru.Core/Devices/ReaderATA.cs +++ b/Aaru.Core/Devices/ReaderATA.cs @@ -420,7 +420,7 @@ sealed partial class Reader if((status & 0x04) == 0x04) recoveredError = true; - AaruConsole.DebugWriteLine("ATA Reader", Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status); return true; } @@ -485,7 +485,7 @@ sealed partial class Reader if((status & 0x04) == 0x04) recoveredError = true; - AaruConsole.DebugWriteLine("ATA Reader", Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status); + AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status); return true; } diff --git a/Aaru.Core/Devices/ReaderSCSI.cs b/Aaru.Core/Devices/ReaderSCSI.cs index 47c65e12b..f752388fa 100644 --- a/Aaru.Core/Devices/ReaderSCSI.cs +++ b/Aaru.Core/Devices/ReaderSCSI.cs @@ -714,7 +714,7 @@ sealed partial class Reader blankCheck = Sense.Decode(senseBuf)?.SenseKey == SenseKeys.BlankCheck; - AaruConsole.DebugWriteLine("SCSI Reader", Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf)); return sense; } diff --git a/Aaru.Core/Devices/Scanning/MediaScan.cs b/Aaru.Core/Devices/Scanning/MediaScan.cs index da173ae1e..0db1c528a 100644 --- a/Aaru.Core/Devices/Scanning/MediaScan.cs +++ b/Aaru.Core/Devices/Scanning/MediaScan.cs @@ -51,6 +51,7 @@ public sealed partial class MediaScan static readonly TimeSpan _oneSecond = 1.Seconds(); readonly Stopwatch _scanStopwatch; readonly Stopwatch _speedStopwatch; + const string MODULE_NAME = "Media scanning"; /// Path to a MHDD log file /// Path to a IMGBurn log file diff --git a/Aaru.Core/Devices/Scanning/SCSI.cs b/Aaru.Core/Devices/Scanning/SCSI.cs index a2c59215e..caa6db443 100644 --- a/Aaru.Core/Devices/Scanning/SCSI.cs +++ b/Aaru.Core/Devices/Scanning/SCSI.cs @@ -414,7 +414,7 @@ public sealed partial class MediaScan if(readcd) { - AaruConsole.DebugWriteLine("Media-Scan", Localization.Core.READ_CD_error_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_CD_error_0, Sense.PrettifySense(senseBuf)); senseDecoded = Sense.Decode(senseBuf); diff --git a/Aaru.Core/ImageFormat.cs b/Aaru.Core/ImageFormat.cs index 223e36e98..5393d947d 100644 --- a/Aaru.Core/ImageFormat.cs +++ b/Aaru.Core/ImageFormat.cs @@ -39,6 +39,8 @@ namespace Aaru.Core; /// Core media image format operations public static class ImageFormat { + const string MODULE_NAME = "Format detection"; + /// Detects the image plugin that recognizes the data inside a filter /// Filter /// Detected image plugin @@ -61,7 +63,7 @@ public static class ImageFormat try { - AaruConsole.DebugWriteLine("Format detection", Localization.Core.Trying_plugin_0, imagePlugin.Name); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name); if(!imagePlugin.Identify(imageFilter)) continue; @@ -91,7 +93,7 @@ public static class ImageFormat if(imagePlugin.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000")) continue; - AaruConsole.DebugWriteLine("Format detection", Localization.Core.Trying_plugin_0, imagePlugin.Name); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name); if(!imagePlugin.Identify(imageFilter)) continue; @@ -121,7 +123,7 @@ public static class ImageFormat try { - AaruConsole.DebugWriteLine("Format detection", Localization.Core.Trying_plugin_0, imagePlugin.Name); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name); if(!imagePlugin.Identify(imageFilter)) continue; diff --git a/Aaru.Core/ImageInfo.cs b/Aaru.Core/ImageInfo.cs index 2a6c2703f..033ad41a4 100644 --- a/Aaru.Core/ImageInfo.cs +++ b/Aaru.Core/ImageInfo.cs @@ -64,6 +64,8 @@ namespace Aaru.Core; /// Image information operations public static class ImageInfo { + const string MODULE_NAME = "Image information"; + /// Prints image information to console /// Media image public static void PrintImageInfo(IBaseImage imageFormat) @@ -637,20 +639,20 @@ public static class ImageInfo case TupleCodes.CISTPL_SPCL: case TupleCodes.CISTPL_SWIL: case TupleCodes.CISTPL_VERS_2: - AaruConsole.DebugWriteLine("Device-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Invoke_Found_undecoded_tuple_ID_0, tuple.Code); break; default: - AaruConsole.DebugWriteLine("Device-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_unknown_tuple_ID_0, (byte)tuple.Code); break; } else - AaruConsole.DebugWriteLine("Device-Info command", Localization.Core.Could_not_get_tuples); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Could_not_get_tuples); } } diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs index b04ad4d2f..e3412a154 100644 --- a/Aaru.Core/Media/Detection/MMC.cs +++ b/Aaru.Core/Media/Detection/MMC.cs @@ -63,6 +63,7 @@ public static class MMC /// SHA256 of PlayStation 2 boot sectors, seen in Japanese discs const string PS2_JAPANESE_HASH = "b82bffb809070d61fe050b7e1545df53d8f3cc648257cdff7502bc0ba6b38870"; + const string MODULE_NAME = "Media detection"; static readonly byte[] _ps3Id = { @@ -295,7 +296,7 @@ public static class MMC { Features.SeparatedFeatures ftr = Features.Separate(cmdBuf); - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.GET_CONFIGURATION_current_profile_is_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.GET_CONFIGURATION_current_profile_is_0, ftr.CurrentProfile); switch(ftr.CurrentProfile) @@ -453,12 +454,12 @@ public static class MMC switch(a0Track.PSEC) { case 0x10: - AaruConsole.DebugWriteLine("Media detection", Localization.Core.TOC_says_disc_type_is_CD_i); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_i); mediaType = MediaType.CDI; break; case 0x20: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_ROM_XA); mediaType = MediaType.CDROMXA; @@ -498,7 +499,7 @@ public static class MMC switch(hasDataTrack) { case true when hasAudioTrack && allFirstSessionTracksAreAudio && sessions == 2: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core. Disc_has_audio_and_data_two_sessions_all_data_second_CD_Plus); @@ -506,7 +507,7 @@ public static class MMC break; case false when hasAudioTrack && sessions == 1: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_only_audio_in_a_session_CD_Digital_Audio); mediaType = MediaType.CDDA; @@ -518,7 +519,7 @@ public static class MMC !hasAudioTrack && sessions == 1) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_only_data_in_a_session_CD_ROM); mediaType = MediaType.CDROM; @@ -528,7 +529,7 @@ public static class MMC !hasDataTrack && sessions == 1) { - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Disc_has_video_tracks_CD_Video); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_video_tracks_CD_Video); mediaType = MediaType.CDV; } @@ -568,7 +569,7 @@ public static class MMC cmdBuf[15] != 0x02) continue; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_a_mode_two_data_track_CD_ROM_XA); mediaType = MediaType.CDROMXA; @@ -684,7 +685,7 @@ public static class MMC { mediaType = MediaType.CDIREADY; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_hidden_CD_i_pregap_CD_i_Ready); return; @@ -739,7 +740,7 @@ public static class MMC { mediaType = MediaType.CDIREADY; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_hidden_CD_i_pregap_CD_i_Ready); return; @@ -1138,7 +1139,7 @@ public static class MMC { if(DMI.IsXbox(cmdBuf)) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, "Found Xbox DMI, setting disc type to Xbox Game Disc (XGD)."); mediaType = MediaType.XGD; @@ -1151,7 +1152,7 @@ public static class MMC // All XGD3 all have the same number of blocks if(blocks is 25063 or 4229664 or 4246304) // Wxripper unlock { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, "Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 3 (XGD3)."); mediaType = MediaType.XGD3; @@ -1159,7 +1160,7 @@ public static class MMC return; } - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, "Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 2 (XGD2)."); mediaType = MediaType.XGD2; @@ -1355,7 +1356,7 @@ public static class MMC case "PHOTO_CD": mediaType = MediaType.PCD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Photo_CD_description_file); return; @@ -1408,7 +1409,7 @@ public static class MMC { mediaType = MediaType.MEGACD; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_Mega_Sega_CD_IP_BIN); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Mega_Sega_CD_IP_BIN); return; } @@ -1417,7 +1418,7 @@ public static class MMC { mediaType = MediaType.SATURNCD; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_Sega_Saturn_IP_BIN); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sega_Saturn_IP_BIN); return; } @@ -1427,7 +1428,7 @@ public static class MMC { mediaType = MediaType.GDROM; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_Sega_Dreamcast_IP_BIN); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sega_Dreamcast_IP_BIN); return; } @@ -1442,7 +1443,7 @@ public static class MMC string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _); - AaruConsole.DebugWriteLine("Media-info Command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.PlayStation_2_boot_sectors_SHA256_0, ps2BootSectorsHash); @@ -1450,7 +1451,7 @@ public static class MMC { mediaType = MediaType.PS2CD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sony_PlayStation_2_boot_sectors); goto hasPs2CdBoot; @@ -1466,7 +1467,7 @@ public static class MMC { mediaType = MediaType.ThreeDO; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_Opera_filesystem); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Opera_filesystem); return; } @@ -1475,7 +1476,7 @@ public static class MMC { mediaType = MediaType.FMTOWNS; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_FM_Towns_boot); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_FM_Towns_boot); return; } @@ -1495,7 +1496,7 @@ public static class MMC { mediaType = MediaType.Playdia; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_Playdia_copyright); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Playdia_copyright); return; } @@ -1510,7 +1511,7 @@ public static class MMC { mediaType = MediaType.SuperCDROM2; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_PC_Engine_CD_signature); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_PC_Engine_CD_signature); return; } @@ -1525,7 +1526,7 @@ public static class MMC { mediaType = MediaType.PCFX; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_PC_FX_copyright); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_PC_FX_copyright); return; } @@ -1544,7 +1545,7 @@ public static class MMC mediaType = MediaType.JaguarCD; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_Atari_signature); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Atari_signature); break; } @@ -1559,7 +1560,7 @@ public static class MMC { mediaType = MediaType.MilCD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sega_Dreamcast_IP_BIN_on_second_session); return; @@ -1572,7 +1573,7 @@ public static class MMC { mediaType = MediaType.VideoNowColor; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_VideoNow_Color_frame); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_VideoNow_Color_frame); return; } @@ -1610,7 +1611,7 @@ public static class MMC { mediaType = MediaType.CDEG; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_enhanced_graphics_RW_packet); return; @@ -1620,7 +1621,7 @@ public static class MMC { mediaType = MediaType.CDG; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_graphics_RW_packet); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_graphics_RW_packet); return; } @@ -1629,7 +1630,7 @@ public static class MMC { mediaType = MediaType.CDMIDI; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_MIDI_RW_packet); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_MIDI_RW_packet); return; } @@ -1789,7 +1790,7 @@ public static class MMC { mediaType = MediaType.CD32; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_CD32_TM_file_in_root); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_CD32_TM_file_in_root); return; } @@ -1798,7 +1799,7 @@ public static class MMC { mediaType = MediaType.CDTV; - AaruConsole.DebugWriteLine("Media detection", Localization.Core.Found_CDTV_TM_file_in_root); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_CDTV_TM_file_in_root); return; } @@ -1939,7 +1940,7 @@ public static class MMC { mediaType = MediaType.NeoGeoCD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_correct_IPL_TXT_file_in_root); return; @@ -2021,21 +2022,21 @@ public static class MMC case "VIDEO_CD": mediaType = MediaType.VCD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Video_CD_description_file); return; case "SUPERVCD": mediaType = MediaType.SVCD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Super_Video_CD_description_file); break; case "HQ-VCD": mediaType = MediaType.CVD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_China_Video_Disc_description_file); break; @@ -2117,7 +2118,7 @@ public static class MMC case "PHOTO_CD": mediaType = MediaType.PCD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Photo_CD_description_file); return; @@ -2210,7 +2211,7 @@ public static class MMC { mediaType = MediaType.PS1CD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_correct_SYSTEM_CNF_file_in_root_PS1); } @@ -2219,7 +2220,7 @@ public static class MMC { mediaType = MediaType.PS2CD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_correct_SYSTEM_CNF_file_in_root_PS2); } } @@ -2246,13 +2247,13 @@ public static class MMC string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _); - AaruConsole.DebugWriteLine("Media-info Command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.PlayStation_2_boot_sectors_SHA256_0, ps2BootSectorsHash); if(ps2BootSectorsHash is PS2_PAL_HASH or PS2_NTSC_HASH or PS2_JAPANESE_HASH) { - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sony_PlayStation_2_boot_sectors_DVD); mediaType = MediaType.PS2DVD; @@ -2268,14 +2269,14 @@ public static class MMC switch(mediaType) { case MediaType.BDROM: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sony_PlayStation_3_boot_sectors); mediaType = MediaType.PS3BD; break; case MediaType.DVDROM: - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sony_PlayStation_3_boot_sectors_DVD); mediaType = MediaType.PS3DVD; @@ -2291,7 +2292,7 @@ public static class MMC { mediaType = MediaType.PS4BD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sony_PlayStation_4_boot_sectors); } } @@ -2304,7 +2305,7 @@ public static class MMC switch(blurayType) { case "XG4": - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Blu_ray_type_XG4_setting_disc_type_XGD4); mediaType = MediaType.XGD4; @@ -2322,14 +2323,14 @@ public static class MMC { mediaType = MediaType.PS5BD; - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sony_PlayStation_5_boot_sectors); break; } } - AaruConsole.DebugWriteLine("Media detection", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Blu_ray_type_BDU_setting_disc_type_UHD); mediaType = MediaType.UHDBD; diff --git a/Aaru.Core/Media/Info/ScsiInfo.cs b/Aaru.Core/Media/Info/ScsiInfo.cs index a79da94cd..941ee33cf 100644 --- a/Aaru.Core/Media/Info/ScsiInfo.cs +++ b/Aaru.Core/Media/Info/ScsiInfo.cs @@ -56,6 +56,8 @@ namespace Aaru.Core.Media.Info; /// Retrieves information from a SCSI device public sealed class ScsiInfo { + const string MODULE_NAME = "Media information"; + /// Initializes this class with the specific device, and fills in the information /// Device public ScsiInfo(Device dev) @@ -273,7 +275,7 @@ public sealed class ScsiInfo AaruConsole.ErrorWriteLine("SCSI READ ATTRIBUTE:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else { - DataFile.WriteTo("Media-Info command", outputPrefix, "_scsi_readattribute.bin", "SCSI READ ATTRIBUTE", seqBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_scsi_readattribute.bin", "SCSI READ ATTRIBUTE", seqBuf); } */ break; @@ -300,7 +302,7 @@ public sealed class ScsiInfo if(sense) { - AaruConsole.DebugWriteLine("Media-Info command", "READ GET CONFIGURATION:\n{0}", + AaruConsole.DebugWriteLine(MODULE_NAME, "READ GET CONFIGURATION:\n{0}", Sense.PrettifySense(senseBuf)); if(dev.IsUsb && @@ -312,7 +314,7 @@ public sealed class ScsiInfo MmcConfiguration = cmdBuf; Features.SeparatedFeatures ftr = Features.Separate(cmdBuf); - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.GET_CONFIGURATION_current_profile_is_0, ftr.CurrentProfile); @@ -459,7 +461,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.RecognizedFormatLayers, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Recognized_Format_Layers_0, Sense.PrettifySense(senseBuf)); else @@ -469,7 +471,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.WriteProtectionStatus, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Write_Protection_Status_0, Sense.PrettifySense(senseBuf)); else @@ -479,9 +481,9 @@ public sealed class ScsiInfo /* sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Capability List\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: Capability List\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_capabilitylist.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_capabilitylist.bin", "SCSI READ DISC STRUCTURE", cmdBuf); */ #region All DVD and HD DVD types @@ -494,7 +496,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_PFI_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_PFI_0, Sense.PrettifySense(senseBuf)); else { @@ -530,7 +532,7 @@ public sealed class ScsiInfo out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_DMI_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DMI_0, Sense.PrettifySense(senseBuf)); else { @@ -557,7 +559,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_CMI_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_CMI_0, Sense.PrettifySense(senseBuf)); else DvdCmi = cmdBuf; @@ -574,7 +576,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_BCA_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_BCA_0, Sense.PrettifySense(senseBuf)); else DvdBca = cmdBuf; @@ -583,7 +585,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.DvdAacs, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DVD_AACS_0, Sense.PrettifySense(senseBuf)); else @@ -599,7 +601,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.DvdramDds, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_DDS_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DDS_0, Sense.PrettifySense(senseBuf)); else DvdRamDds = cmdBuf; @@ -608,7 +610,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.DvdramMediumStatus, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Medium_Status_0, Sense.PrettifySense(senseBuf)); else @@ -619,7 +621,7 @@ public sealed class ScsiInfo out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_SAI_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_SAI_0, Sense.PrettifySense(senseBuf)); else DvdRamSpareArea = cmdBuf; @@ -634,7 +636,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.LastBorderOutRmd, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Last_Out_Border_RMD_0, Sense.PrettifySense(senseBuf)); else @@ -653,7 +655,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.DiscKey, dvdDecrypt.Agid, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_Disc_Key_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Disc_Key_0, Sense.PrettifySense(senseBuf)); else DvdDiscKey = cmdBuf; @@ -663,7 +665,7 @@ public sealed class ScsiInfo dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_Sector_CMI_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Sector_CMI_0, Sense.PrettifySense(senseBuf)); else DvdSectorCmi = cmdBuf; @@ -673,49 +675,49 @@ public sealed class ScsiInfo /* sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaIdentifier, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_dvd_mediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaKeyBlock, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_dvd_mkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSVolId, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Volume ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS Volume ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsvolid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_aacsvolid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaSerial, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Media Serial Number\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS Media Serial Number\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacssn.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_aacssn.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaId, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsmediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_aacsmediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKB, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_aacsmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSLBAExtents, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS LBA Extents\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS LBA Extents\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacslbaextents.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_aacslbaextents.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKBCPRM, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS CPRM MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS CPRM MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacscprmmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_aacscprmmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSDataKeys, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Data Keys\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS Data Keys\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else - DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsdatakeys.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_aacsdatakeys.bin", "SCSI READ DISC STRUCTURE", cmdBuf); */ #endregion Require drive authentication, won't work @@ -726,7 +728,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Pre_Recorded_Info_0, Sense.PrettifySense(senseBuf)); else @@ -750,7 +752,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.DvdrMediaIdentifier, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DVD_R_Media_ID_0, Sense.PrettifySense(senseBuf)); else @@ -761,7 +763,7 @@ public sealed class ScsiInfo out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DVD_R_PFI_0, Sense.PrettifySense(senseBuf)); else @@ -783,7 +785,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.Adip, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_ADIP_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_ADIP_0, Sense.PrettifySense(senseBuf)); else DvdPlusAdip = cmdBuf; @@ -792,7 +794,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.Dcb, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_DCB_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DCB_0, Sense.PrettifySense(senseBuf)); else DvdPlusDcb = cmdBuf; @@ -807,7 +809,7 @@ public sealed class ScsiInfo out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_HD_DVD_CMI_0, Sense.PrettifySense(senseBuf)); else @@ -826,7 +828,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.HddvdrMediumStatus, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_HD_DVD_R_Medium_Status, Sense.PrettifySense(senseBuf)); else @@ -836,7 +838,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.HddvdrLastRmd, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Last_RMD_0, Sense.PrettifySense(senseBuf)); else @@ -852,7 +854,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.DvdrLayerCapacity, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Layer_Capacity_0, Sense.PrettifySense(senseBuf)); else @@ -871,7 +873,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.MiddleZoneStart, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Middle_Zone_Start_0, Sense.PrettifySense(senseBuf)); else @@ -881,7 +883,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.JumpIntervalSize, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Jump_Interval_Size_0, Sense.PrettifySense(senseBuf)); else @@ -892,7 +894,7 @@ public sealed class ScsiInfo out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Manual_Layer_Jump_Start_LBA_0, Sense.PrettifySense(senseBuf)); else @@ -902,7 +904,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.RemapAnchorPoint, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Remap_Anchor_Point_0, Sense.PrettifySense(senseBuf)); else @@ -922,7 +924,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_DI_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DI_0, Sense.PrettifySense(senseBuf)); else BlurayDiscInformation = cmdBuf; @@ -931,7 +933,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.Pac, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_PAC_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_PAC_0, Sense.PrettifySense(senseBuf)); else BlurayPac = cmdBuf; @@ -949,7 +951,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.BdBurstCuttingArea, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_BCA_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_BCA_0, Sense.PrettifySense(senseBuf)); else BlurayBurstCuttingArea = cmdBuf; @@ -966,7 +968,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.BdDds, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_DDS_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DDS_0, Sense.PrettifySense(senseBuf)); else BlurayDds = cmdBuf; @@ -975,7 +977,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.CartridgeStatus, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Cartridge_Status_0, Sense.PrettifySense(senseBuf)); else @@ -985,7 +987,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.BdSpareAreaInformation, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: Spare Area Information\n{0}", Sense.PrettifySense(senseBuf)); else @@ -995,7 +997,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.RawDfl, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_Raw_DFL_0, Sense.PrettifySense(senseBuf)); else @@ -1005,7 +1007,7 @@ public sealed class ScsiInfo MmcDiscInformationDataTypes.TrackResources, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_001b_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_001b_0, Sense.PrettifySense(senseBuf)); else BlurayTrackResources = cmdBuf; @@ -1014,7 +1016,7 @@ public sealed class ScsiInfo dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_010b_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_010b_0, Sense.PrettifySense(senseBuf)); else BlurayPowResources = cmdBuf; @@ -1033,7 +1035,7 @@ public sealed class ScsiInfo bool tocSense = dev.ReadTocPmaAtip(out cmdBuf, out senseBuf, false, 0, 0, dev.Timeout, out _); if(tocSense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_TOC_PMA_ATIP_TOC_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_TOC_PMA_ATIP_TOC_0, Sense.PrettifySense(senseBuf)); else { @@ -1049,7 +1051,7 @@ public sealed class ScsiInfo sense = dev.ReadAtip(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_TOC_PMA_ATIP_ATIP_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_TOC_PMA_ATIP_ATIP_0, Sense.PrettifySense(senseBuf)); else { @@ -1070,7 +1072,7 @@ public sealed class ScsiInfo sense = dev.ReadSessionInfo(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_TOC_PMA_ATIP_Session_Info_0, Sense.PrettifySense(senseBuf)); else if(cmdBuf.Length > 4) @@ -1088,7 +1090,7 @@ public sealed class ScsiInfo sense = dev.ReadRawToc(out cmdBuf, out senseBuf, 1, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_TOC_PMA_ATIP_Raw_TOC_0, Sense.PrettifySense(senseBuf)); else if(cmdBuf.Length > 4) @@ -1101,7 +1103,7 @@ public sealed class ScsiInfo sense = dev.ReadPma(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_TOC_PMA_ATIP_PMA_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_TOC_PMA_ATIP_PMA_0, Sense.PrettifySense(senseBuf)); else if(cmdBuf.Length > 4) Pma = cmdBuf; @@ -1109,7 +1111,7 @@ public sealed class ScsiInfo sense = dev.ReadCdText(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_TOC_PMA_ATIP_CD_TEXT_0, Sense.PrettifySense(senseBuf)); else if(cmdBuf.Length > 4) @@ -1153,7 +1155,7 @@ public sealed class ScsiInfo MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_PFI_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_PFI_0, Sense.PrettifySense(senseBuf)); else { @@ -1180,7 +1182,7 @@ public sealed class ScsiInfo out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_STRUCTURE_DMI_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_STRUCTURE_DMI_0, Sense.PrettifySense(senseBuf)); else DvdDmi = cmdBuf; @@ -1191,7 +1193,7 @@ public sealed class ScsiInfo sense = dev.ReadMediaSerialNumber(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_MEDIA_SERIAL_NUMBER_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_MEDIA_SERIAL_NUMBER_0, Sense.PrettifySense(senseBuf)); else { @@ -1217,7 +1219,7 @@ public sealed class ScsiInfo sense = dev.KreonExtractSs(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.KREON_EXTRACT_SS_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.KREON_EXTRACT_SS_0, Sense.PrettifySense(senseBuf)); else XboxSecuritySector = cmdBuf; @@ -1225,7 +1227,7 @@ public sealed class ScsiInfo DecodedXboxSecuritySector = SS.Decode(cmdBuf); // Get video partition size - AaruConsole.DebugWriteLine("Dump-media command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_video_partition_size); sense = dev.KreonLock(out senseBuf, dev.Timeout, out _); @@ -1259,7 +1261,7 @@ public sealed class ScsiInfo break; } - AaruConsole.DebugWriteLine("Dump-media command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize); ulong l0Video = PFI.Decode(cmdBuf, MediaType).Value.Layer0EndPSN - @@ -1268,7 +1270,7 @@ public sealed class ScsiInfo ulong l1Video = totalSize - l0Video + 1; // Get game partition size - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Getting_game_partition_size); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_game_partition_size); sense = dev.KreonUnlockXtreme(out senseBuf, dev.Timeout, out _); if(sense) @@ -1291,11 +1293,11 @@ public sealed class ScsiInfo ((ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) & 0xFFFFFFFF) + 1; - AaruConsole.DebugWriteLine("Dump-media command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Game_partition_total_size_0_sectors, gameSize); // Get middle zone size - AaruConsole.DebugWriteLine("Dump-media command", Localization.Core.Getting_middle_zone_size); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_middle_zone_size); sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out _); if(sense) @@ -1327,7 +1329,7 @@ public sealed class ScsiInfo break; } - AaruConsole.DebugWriteLine("Dump-media command", + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Unlocked_total_size_0_sectors, totalSize); ulong middleZone = @@ -1377,7 +1379,7 @@ public sealed class ScsiInfo dev.Timeout, out _); if(sense) - AaruConsole.DebugWriteLine("Media-Info command", Localization.Core.READ_DISC_INFORMATION_000b_0, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_DISC_INFORMATION_000b_0, Sense.PrettifySense(senseBuf)); else { diff --git a/Aaru.Core/Partitions.cs b/Aaru.Core/Partitions.cs index b70ca8342..b0a46c641 100644 --- a/Aaru.Core/Partitions.cs +++ b/Aaru.Core/Partitions.cs @@ -43,6 +43,8 @@ namespace Aaru.Core; /// Implements methods for handling partitions public static class Partitions { + const string MODULE_NAME = "Partitions"; + /// Gets a list of all partitions present in the specified image /// Image /// List of found partitions @@ -70,7 +72,7 @@ public static class Partitions foundPartitions.AddRange(partitions); - AaruConsole.DebugWriteLine("Partitions", Localization.Core.Found_0_at_1, part.Name, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_0_at_1, part.Name, tapeFile.FirstBlock); } @@ -91,7 +93,7 @@ public static class Partitions foundPartitions.AddRange(partitions); - AaruConsole.DebugWriteLine("Partitions", Localization.Core.Found_0_at_1, part.Name, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_0_at_1, part.Name, imagePartition.Start); } @@ -110,7 +112,7 @@ public static class Partitions continue; foundPartitions.AddRange(partitions); - AaruConsole.DebugWriteLine("Partitions", Localization.Core.Found_0_at_zero, part.Name); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_0_at_zero, part.Name); } checkedLocations.Add(0); @@ -133,13 +135,13 @@ public static class Partitions if(Activator.CreateInstance(pluginType) is not IPartition part) continue; - AaruConsole.DebugWriteLine("Partitions", Localization.Core.Trying_0_at_1, part.Name, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Trying_0_at_1, part.Name, foundPartitions[0].Start); if(!part.GetInformation(image, out List partitions, foundPartitions[0].Start)) continue; - AaruConsole.DebugWriteLine("Partitions", Localization.Core.Found_0_at_1, part.Name, + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_0_at_1, part.Name, foundPartitions[0].Start); children.AddRange(partitions); @@ -147,7 +149,7 @@ public static class Partitions checkedLocations.Add(foundPartitions[0].Start); - AaruConsole.DebugWriteLine("Partitions", Localization.Core.Got_0_children, children.Count); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Got_0_children, children.Count); if(children.Count > 0) { @@ -165,8 +167,8 @@ public static class Partitions foundPartitions.RemoveAt(0); } - AaruConsole.DebugWriteLine("Partitions", Localization.Core.Got_0_parents, foundPartitions.Count); - AaruConsole.DebugWriteLine("Partitions", Localization.Core.Got_0_partitions, childPartitions.Count); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Got_0_parents, foundPartitions.Count); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Got_0_partitions, childPartitions.Count); } // Be sure that device partitions are not excluded if not mapped by any scheme... diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs index 55923825f..b07f32b05 100644 --- a/Aaru.Core/Sidecar/BlockMedia.cs +++ b/Aaru.Core/Sidecar/BlockMedia.cs @@ -743,7 +743,7 @@ public sealed partial class Sidecar catch #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body { - //AaruConsole.DebugWriteLine("Create-sidecar command", "Plugin {0} crashed", _plugin.Name); + //AaruConsole.DebugWriteLine(MODULE_NAME, "Plugin {0} crashed", _plugin.Name); } if(lstFs.Count > 0) @@ -808,7 +808,7 @@ public sealed partial class Sidecar catch #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body { - //AaruConsole.DebugWriteLine("Create-sidecar command", "Plugin {0} crashed", _plugin.Name); + //AaruConsole.DebugWriteLine(MODULE_NAME, "Plugin {0} crashed", _plugin.Name); } if(lstFs.Count > 0) diff --git a/Aaru.Core/Sidecar/Files.cs b/Aaru.Core/Sidecar/Files.cs index 010ead3d7..40a786546 100644 --- a/Aaru.Core/Sidecar/Files.cs +++ b/Aaru.Core/Sidecar/Files.cs @@ -62,7 +62,7 @@ public sealed partial class Sidecar if(ret != ErrorNumber.NoError) { - AaruConsole.DebugWriteLine("Create-Sidecar command", Localization.Core.Cannot_stat_0, dirent); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent); continue; } @@ -122,7 +122,7 @@ public sealed partial class Sidecar if(ret != ErrorNumber.NoError) { - AaruConsole.DebugWriteLine("Create-Sidecar command", Localization.Core.Cannot_stat_0, dirent); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent); continue; } diff --git a/Aaru.Core/Sidecar/OpticalDisc.cs b/Aaru.Core/Sidecar/OpticalDisc.cs index 9d6997469..3468ccf77 100644 --- a/Aaru.Core/Sidecar/OpticalDisc.cs +++ b/Aaru.Core/Sidecar/OpticalDisc.cs @@ -561,7 +561,7 @@ public sealed partial class Sidecar catch #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body { - //AaruConsole.DebugWriteLine("Create-sidecar command", "Plugin {0} crashed", _plugin.Name); + //AaruConsole.DebugWriteLine(MODULE_NAME, "Plugin {0} crashed", _plugin.Name); } if(lstFs.Count > 0) @@ -622,7 +622,7 @@ public sealed partial class Sidecar catch #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body { - //AaruConsole.DebugWriteLine("Create-sidecar command", "Plugin {0} crashed", _plugin.Name); + //AaruConsole.DebugWriteLine(MODULE_NAME, "Plugin {0} crashed", _plugin.Name); } if(lstFs.Count > 0) diff --git a/Aaru.Core/Sidecar/Sidecar.cs b/Aaru.Core/Sidecar/Sidecar.cs index 3e14078a7..9e132c25a 100644 --- a/Aaru.Core/Sidecar/Sidecar.cs +++ b/Aaru.Core/Sidecar/Sidecar.cs @@ -44,6 +44,7 @@ namespace Aaru.Core; public sealed partial class Sidecar { + const string MODULE_NAME = "Sidecar creation"; readonly List _emptyChecksums; readonly Encoding _encoding; readonly FileInfo _fi; diff --git a/Aaru.Core/Statistics.cs b/Aaru.Core/Statistics.cs index 1e4b85a47..46bac4771 100644 --- a/Aaru.Core/Statistics.cs +++ b/Aaru.Core/Statistics.cs @@ -56,6 +56,7 @@ namespace Aaru.Core; /// Handles anonymous usage statistics public static class Statistics { + const string MODULE_NAME = "Stats"; /// Statistics file semaphore static bool _submitStatsLock; @@ -88,8 +89,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } @@ -104,8 +105,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } if(Settings.Settings.Current.Stats is { ShareStats: true }) @@ -332,7 +333,7 @@ public static class Statistics #if DEBUG System.Console.WriteLine(Localization.Core.Uploading_statistics); #else - Aaru.Console.AaruConsole.DebugWriteLine("Submit stats", Localization.Core.Uploading_statistics); + Aaru.Console.AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Uploading_statistics); #endif string json = JsonSerializer.Serialize(dto, typeof(StatsDto), StatsDtoContext.Default); @@ -684,8 +685,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } @@ -714,8 +715,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } @@ -744,8 +745,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } @@ -774,8 +775,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } @@ -804,8 +805,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } @@ -846,8 +847,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } @@ -875,8 +876,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } @@ -918,8 +919,8 @@ public static class Statistics } catch(SqliteException ex) { - AaruConsole.DebugWriteLine("Stats", Localization.Core.Exception_while_trying_to_save_statistics); - AaruConsole.DebugWriteLine("Stats", "{0}", ex); + AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics); + AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", ex); } } } \ No newline at end of file