aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-05-18 01:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Aaru.Console to Aaru.Logging

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-17 06:11:22 +01:00
parent f2268c0bbb
commit 50061ca7d5
352 changed files with 12048 additions and 12048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Aaru.Archives/Symbian/Info.cs
View File

@@ -83,35 +83,35 @@ public sealed partial class Symbian
stream.EnsureRead(buffer, 0, buffer.Length);
SymbianHeader sh = Marshal.ByteArrayToStructureLittleEndian<SymbianHeader>(buffer);
AaruConsole.Debug(MODULE_NAME, "sh.uid1 = {0}", sh.uid1);
AaruConsole.Debug(MODULE_NAME, "sh.uid2 = {0}", sh.uid2);
AaruConsole.Debug(MODULE_NAME, "sh.uid3 = {0}", sh.uid3);
AaruConsole.Debug(MODULE_NAME, "sh.uid4 = {0}", sh.uid4);
AaruConsole.Debug(MODULE_NAME, "sh.crc16 = {0}", sh.crc16);
AaruConsole.Debug(MODULE_NAME, "sh.languages = {0}", sh.languages);
AaruConsole.Debug(MODULE_NAME, "sh.files = {0}", sh.files);
AaruConsole.Debug(MODULE_NAME, "sh.requisites = {0}", sh.requisites);
AaruConsole.Debug(MODULE_NAME, "sh.inst_lang = {0}", sh.inst_lang);
AaruConsole.Debug(MODULE_NAME, "sh.inst_files = {0}", sh.inst_files);
AaruConsole.Debug(MODULE_NAME, "sh.inst_drive = {0}", sh.inst_drive);
AaruConsole.Debug(MODULE_NAME, "sh.capabilities = {0}", sh.capabilities);
AaruConsole.Debug(MODULE_NAME, "sh.inst_version = {0}", sh.inst_version);
AaruConsole.Debug(MODULE_NAME, "sh.options = {0}", sh.options);
AaruConsole.Debug(MODULE_NAME, "sh.type = {0}", sh.type);
AaruConsole.Debug(MODULE_NAME, "sh.major = {0}", sh.major);
AaruConsole.Debug(MODULE_NAME, "sh.minor = {0}", sh.minor);
AaruConsole.Debug(MODULE_NAME, "sh.variant = {0}", sh.variant);
AaruConsole.Debug(MODULE_NAME, "sh.lang_ptr = {0}", sh.lang_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.files_ptr = {0}", sh.files_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.reqs_ptr = {0}", sh.reqs_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.certs_ptr = {0}", sh.certs_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.comp_ptr = {0}", sh.comp_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.sig_ptr = {0}", sh.sig_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.caps_ptr = {0}", sh.caps_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.instspace = {0}", sh.instspace);
AaruConsole.Debug(MODULE_NAME, "sh.maxinsspc = {0}", sh.maxinsspc);
AaruConsole.Debug(MODULE_NAME, "sh.reserved1 = {0}", sh.reserved1);
AaruConsole.Debug(MODULE_NAME, "sh.reserved2 = {0}", sh.reserved2);
AaruLogging.Debug(MODULE_NAME, "sh.uid1 = {0}", sh.uid1);
AaruLogging.Debug(MODULE_NAME, "sh.uid2 = {0}", sh.uid2);
AaruLogging.Debug(MODULE_NAME, "sh.uid3 = {0}", sh.uid3);
AaruLogging.Debug(MODULE_NAME, "sh.uid4 = {0}", sh.uid4);
AaruLogging.Debug(MODULE_NAME, "sh.crc16 = {0}", sh.crc16);
AaruLogging.Debug(MODULE_NAME, "sh.languages = {0}", sh.languages);
AaruLogging.Debug(MODULE_NAME, "sh.files = {0}", sh.files);
AaruLogging.Debug(MODULE_NAME, "sh.requisites = {0}", sh.requisites);
AaruLogging.Debug(MODULE_NAME, "sh.inst_lang = {0}", sh.inst_lang);
AaruLogging.Debug(MODULE_NAME, "sh.inst_files = {0}", sh.inst_files);
AaruLogging.Debug(MODULE_NAME, "sh.inst_drive = {0}", sh.inst_drive);
AaruLogging.Debug(MODULE_NAME, "sh.capabilities = {0}", sh.capabilities);
AaruLogging.Debug(MODULE_NAME, "sh.inst_version = {0}", sh.inst_version);
AaruLogging.Debug(MODULE_NAME, "sh.options = {0}", sh.options);
AaruLogging.Debug(MODULE_NAME, "sh.type = {0}", sh.type);
AaruLogging.Debug(MODULE_NAME, "sh.major = {0}", sh.major);
AaruLogging.Debug(MODULE_NAME, "sh.minor = {0}", sh.minor);
AaruLogging.Debug(MODULE_NAME, "sh.variant = {0}", sh.variant);
AaruLogging.Debug(MODULE_NAME, "sh.lang_ptr = {0}", sh.lang_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.files_ptr = {0}", sh.files_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.reqs_ptr = {0}", sh.reqs_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.certs_ptr = {0}", sh.certs_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.comp_ptr = {0}", sh.comp_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.sig_ptr = {0}", sh.sig_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.caps_ptr = {0}", sh.caps_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.instspace = {0}", sh.instspace);
AaruLogging.Debug(MODULE_NAME, "sh.maxinsspc = {0}", sh.maxinsspc);
AaruLogging.Debug(MODULE_NAME, "sh.reserved1 = {0}", sh.reserved1);
AaruLogging.Debug(MODULE_NAME, "sh.reserved2 = {0}", sh.reserved2);
_release6 = false;
@@ -187,7 +187,7 @@ public sealed partial class Symbian
for(int i = 0; i < sh.languages; i++)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Found component name for language {0} at {1} with a length of {2} bytes",
languages[i],
componentRecord.namesPointers[i],

60
Aaru.Archives/Symbian/Open.cs
View File

@@ -62,41 +62,41 @@ public sealed partial class Symbian
_stream.EnsureRead(buffer, 0, buffer.Length);
SymbianHeader sh = Marshal.ByteArrayToStructureLittleEndian<SymbianHeader>(buffer);
AaruConsole.Debug(MODULE_NAME, "sh.uid1 = {0}", sh.uid1);
AaruConsole.Debug(MODULE_NAME, "sh.uid2 = {0}", sh.uid2);
AaruConsole.Debug(MODULE_NAME, "sh.uid3 = {0}", sh.uid3);
AaruConsole.Debug(MODULE_NAME, "sh.uid4 = {0}", sh.uid4);
AaruConsole.Debug(MODULE_NAME, "sh.crc16 = {0}", sh.crc16);
AaruConsole.Debug(MODULE_NAME, "sh.languages = {0}", sh.languages);
AaruConsole.Debug(MODULE_NAME, "sh.files = {0}", sh.files);
AaruConsole.Debug(MODULE_NAME, "sh.requisites = {0}", sh.requisites);
AaruConsole.Debug(MODULE_NAME, "sh.inst_lang = {0}", sh.inst_lang);
AaruConsole.Debug(MODULE_NAME, "sh.inst_files = {0}", sh.inst_files);
AaruConsole.Debug(MODULE_NAME, "sh.inst_drive = {0}", sh.inst_drive);
AaruConsole.Debug(MODULE_NAME, "sh.capabilities = {0}", sh.capabilities);
AaruConsole.Debug(MODULE_NAME, "sh.inst_version = {0}", sh.inst_version);
AaruConsole.Debug(MODULE_NAME, "sh.options = {0}", sh.options);
AaruConsole.Debug(MODULE_NAME, "sh.type = {0}", sh.type);
AaruConsole.Debug(MODULE_NAME, "sh.major = {0}", sh.major);
AaruConsole.Debug(MODULE_NAME, "sh.minor = {0}", sh.minor);
AaruConsole.Debug(MODULE_NAME, "sh.variant = {0}", sh.variant);
AaruConsole.Debug(MODULE_NAME, "sh.lang_ptr = {0}", sh.lang_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.files_ptr = {0}", sh.files_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.reqs_ptr = {0}", sh.reqs_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.certs_ptr = {0}", sh.certs_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.comp_ptr = {0}", sh.comp_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.sig_ptr = {0}", sh.sig_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.caps_ptr = {0}", sh.caps_ptr);
AaruConsole.Debug(MODULE_NAME, "sh.instspace = {0}", sh.instspace);
AaruConsole.Debug(MODULE_NAME, "sh.maxinsspc = {0}", sh.maxinsspc);
AaruConsole.Debug(MODULE_NAME, "sh.reserved1 = {0}", sh.reserved1);
AaruConsole.Debug(MODULE_NAME, "sh.reserved2 = {0}", sh.reserved2);
AaruLogging.Debug(MODULE_NAME, "sh.uid1 = {0}", sh.uid1);
AaruLogging.Debug(MODULE_NAME, "sh.uid2 = {0}", sh.uid2);
AaruLogging.Debug(MODULE_NAME, "sh.uid3 = {0}", sh.uid3);
AaruLogging.Debug(MODULE_NAME, "sh.uid4 = {0}", sh.uid4);
AaruLogging.Debug(MODULE_NAME, "sh.crc16 = {0}", sh.crc16);
AaruLogging.Debug(MODULE_NAME, "sh.languages = {0}", sh.languages);
AaruLogging.Debug(MODULE_NAME, "sh.files = {0}", sh.files);
AaruLogging.Debug(MODULE_NAME, "sh.requisites = {0}", sh.requisites);
AaruLogging.Debug(MODULE_NAME, "sh.inst_lang = {0}", sh.inst_lang);
AaruLogging.Debug(MODULE_NAME, "sh.inst_files = {0}", sh.inst_files);
AaruLogging.Debug(MODULE_NAME, "sh.inst_drive = {0}", sh.inst_drive);
AaruLogging.Debug(MODULE_NAME, "sh.capabilities = {0}", sh.capabilities);
AaruLogging.Debug(MODULE_NAME, "sh.inst_version = {0}", sh.inst_version);
AaruLogging.Debug(MODULE_NAME, "sh.options = {0}", sh.options);
AaruLogging.Debug(MODULE_NAME, "sh.type = {0}", sh.type);
AaruLogging.Debug(MODULE_NAME, "sh.major = {0}", sh.major);
AaruLogging.Debug(MODULE_NAME, "sh.minor = {0}", sh.minor);
AaruLogging.Debug(MODULE_NAME, "sh.variant = {0}", sh.variant);
AaruLogging.Debug(MODULE_NAME, "sh.lang_ptr = {0}", sh.lang_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.files_ptr = {0}", sh.files_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.reqs_ptr = {0}", sh.reqs_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.certs_ptr = {0}", sh.certs_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.comp_ptr = {0}", sh.comp_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.sig_ptr = {0}", sh.sig_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.caps_ptr = {0}", sh.caps_ptr);
AaruLogging.Debug(MODULE_NAME, "sh.instspace = {0}", sh.instspace);
AaruLogging.Debug(MODULE_NAME, "sh.maxinsspc = {0}", sh.maxinsspc);
AaruLogging.Debug(MODULE_NAME, "sh.reserved1 = {0}", sh.reserved1);
AaruLogging.Debug(MODULE_NAME, "sh.reserved2 = {0}", sh.reserved2);
_release6 = false;
if(sh.uid1 == SYMBIAN9_MAGIC)
{
AaruConsole.Error("Symbian Installation Files from Symbian OS 9 or later are not yet supported.");
AaruLogging.Error("Symbian Installation Files from Symbian OS 9 or later are not yet supported.");
return ErrorNumber.NotSupported;
}

6
Aaru.Archives/Symbian/Parser.cs
View File

@@ -55,7 +55,7 @@ public sealed partial class Symbian
for(int i = 0; i < conditionLevel; i++) tabulationChars[i] = '\t';
string tabulation = new(tabulationChars);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Seeking to {0} for parsing of file {1} of {2}",
offset,
currentFile,
@@ -64,7 +64,7 @@ public sealed partial class Symbian
br.BaseStream.Seek(offset, SeekOrigin.Begin);
var recordType = (FileRecordType)br.ReadUInt32();
AaruConsole.Debug(MODULE_NAME, "Found record with type {0}", recordType);
AaruLogging.Debug(MODULE_NAME, "Found record with type {0}", recordType);
br.BaseStream.Seek(-sizeof(FileRecordType), SeekOrigin.Current);
@@ -118,7 +118,7 @@ public sealed partial class Symbian
decodedFileRecord.mime = _encoding.GetString(buffer);
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Found file for \"{0}\" with length {1} at {2}",
decodedFileRecord.destinationName,
decodedFileRecord.length,

64
Aaru.Checksums/CDChecksums.cs
View File

@@ -187,7 +187,7 @@ public static class CdChecksums
channel[0x00B] != 0x00)
return null;
//AaruConsole.DebugWriteLine(MODULE_NAME, "Data sector, address {0:X2}:{1:X2}:{2:X2}", channel[0x00C],
//AaruLogging.DebugWriteLine(MODULE_NAME, "Data sector, address {0:X2}:{1:X2}:{2:X2}", channel[0x00C],
// channel[0x00D], channel[0x00E]);
switch(channel[0x00F] & 0x03)
@@ -195,13 +195,13 @@ public static class CdChecksums
// mode (1 byte)
case 0x00:
{
//AaruConsole.DebugWriteLine(MODULE_NAME, "Mode 0 sector at address {0:X2}:{1:X2}:{2:X2}",
//AaruLogging.DebugWriteLine(MODULE_NAME, "Mode 0 sector at address {0:X2}:{1:X2}:{2:X2}",
// channel[0x00C], channel[0x00D], channel[0x00E]);
for(int i = 0x010; i < 0x930; i++)
{
if(channel[i] == 0x00) continue;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 0 sector with error at address: {0:X2}:{1:X2}:{2:X2}",
channel[0x00C],
channel[0x00D],
@@ -214,7 +214,7 @@ public static class CdChecksums
}
// mode (1 byte)
//AaruConsole.DebugWriteLine(MODULE_NAME, "Mode 1 sector at address {0:X2}:{1:X2}:{2:X2}",
//AaruLogging.DebugWriteLine(MODULE_NAME, "Mode 1 sector at address {0:X2}:{1:X2}:{2:X2}",
// channel[0x00C], channel[0x00D], channel[0x00E]);
case 0x01 when channel[0x814] != 0x00 || // reserved (8 bytes)
channel[0x815] != 0x00 ||
@@ -224,7 +224,7 @@ public static class CdChecksums
channel[0x819] != 0x00 ||
channel[0x81A] != 0x00 ||
channel[0x81B] != 0x00:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 1 sector with data in reserved bytes at address: {0:X2}:{1:X2}:{2:X2}",
channel[0x00C],
channel[0x00D],
@@ -253,7 +253,7 @@ public static class CdChecksums
if(failedEccP)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check",
channel[0x00C],
channel[0x00D],
@@ -262,7 +262,7 @@ public static class CdChecksums
if(failedEccQ)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check",
channel[0x00C],
channel[0x00D],
@@ -276,7 +276,7 @@ public static class CdChecksums
if(calculatedEdc == storedEdc) return !failedEccP && !failedEccQ;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
channel[0x00C],
channel[0x00D],
@@ -290,7 +290,7 @@ public static class CdChecksums
// mode (1 byte)
case 0x02:
{
//AaruConsole.DebugWriteLine(MODULE_NAME, "Mode 2 sector at address {0:X2}:{1:X2}:{2:X2}",
//AaruLogging.DebugWriteLine(MODULE_NAME, "Mode 2 sector at address {0:X2}:{1:X2}:{2:X2}",
// channel[0x00C], channel[0x00D], channel[0x00E]);
byte[] mode2Sector = new byte[channel.Length - 0x10];
Array.Copy(channel, 0x10, mode2Sector, 0, mode2Sector.Length);
@@ -302,7 +302,7 @@ public static class CdChecksums
channel[0x012] != channel[0x016] ||
channel[0x013] != channel[0x017])
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Subheader copies differ in mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}",
channel[0x00C],
channel[0x00D],
@@ -320,7 +320,7 @@ public static class CdChecksums
if(calculatedEdc == storedEdc) return true;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
channel[0x00C],
channel[0x00D],
@@ -337,7 +337,7 @@ public static class CdChecksums
channel[0x012] != channel[0x016] ||
channel[0x013] != channel[0x017])
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Subheader copies differ in mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}",
channel[0x00C],
channel[0x00D],
@@ -359,7 +359,7 @@ public static class CdChecksums
if(failedEccP)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check",
channel[0x00C],
channel[0x00D],
@@ -368,7 +368,7 @@ public static class CdChecksums
if(failedEccQ)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check",
channel[0x00C],
channel[0x00D],
@@ -382,7 +382,7 @@ public static class CdChecksums
if(calculatedEdc == storedEdc) return !failedEccP && !failedEccQ;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Mode 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
channel[0x00C],
channel[0x00D],
@@ -394,7 +394,7 @@ public static class CdChecksums
}
}
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}",
channel[0x00F],
channel[0x00C],
@@ -534,35 +534,35 @@ public static class CdChecksums
switch(cdSubRwPack1[0])
{
case 0x00:
AaruConsole.Debug(MODULE_NAME, Localization.Detected_Zero_Pack_in_subchannel);
AaruLogging.Debug(MODULE_NAME, Localization.Detected_Zero_Pack_in_subchannel);
break;
case 0x08:
AaruConsole.Debug(MODULE_NAME, Localization.Detected_Line_Graphics_Pack_in_subchannel);
AaruLogging.Debug(MODULE_NAME, Localization.Detected_Line_Graphics_Pack_in_subchannel);
break;
case 0x09:
AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_G_Pack_in_subchannel);
AaruLogging.Debug(MODULE_NAME, Localization.Detected_CD_G_Pack_in_subchannel);
break;
case 0x0A:
AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_EG_Pack_in_subchannel);
AaruLogging.Debug(MODULE_NAME, Localization.Detected_CD_EG_Pack_in_subchannel);
break;
case 0x14:
AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_TEXT_Pack_in_subchannel);
AaruLogging.Debug(MODULE_NAME, Localization.Detected_CD_TEXT_Pack_in_subchannel);
break;
case 0x18:
AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_MIDI_Pack_in_subchannel);
AaruLogging.Debug(MODULE_NAME, Localization.Detected_CD_MIDI_Pack_in_subchannel);
break;
case 0x38:
AaruConsole.Debug(MODULE_NAME, Localization.Detected_User_Pack_in_subchannel);
AaruLogging.Debug(MODULE_NAME, Localization.Detected_User_Pack_in_subchannel);
break;
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Detected_unknown_Pack_type_in_subchannel_mode_0_item_1,
Convert.ToString(cdSubRwPack1[0] & 0x38, 2),
Convert.ToString(cdSubRwPack1[0] & 0x07, 2));
@@ -577,7 +577,7 @@ public static class CdChecksums
if(qSubChannelCrc != calculatedQcrc)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Q_subchannel_CRC_0_expected_1,
calculatedQcrc,
qSubChannelCrc);
@@ -594,7 +594,7 @@ public static class CdChecksums
if(cdTextPack1Crc != calculatedCdtp1Crc && cdTextPack1Crc != 0)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.CD_Text_Pack_one_CRC_0_expected_1,
cdTextPack1Crc,
calculatedCdtp1Crc);
@@ -610,14 +610,14 @@ public static class CdChecksums
Array.Copy(cdTextPack2, 0, cdTextPack2ForCrc, 0, 16);
ushort calculatedCdtp2Crc = CRC16CcittContext.Calculate(cdTextPack2ForCrc);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Cyclic_CDTP2_0_Calc_CDTP2_1,
cdTextPack2Crc,
calculatedCdtp2Crc);
if(cdTextPack2Crc != calculatedCdtp2Crc && cdTextPack2Crc != 0)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.CD_Text_Pack_two_CRC_0_expected_1,
cdTextPack2Crc,
calculatedCdtp2Crc);
@@ -633,14 +633,14 @@ public static class CdChecksums
Array.Copy(cdTextPack3, 0, cdTextPack3ForCrc, 0, 16);
ushort calculatedCdtp3Crc = CRC16CcittContext.Calculate(cdTextPack3ForCrc);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Cyclic_CDTP3_0_Calc_CDTP3_1,
cdTextPack3Crc,
calculatedCdtp3Crc);
if(cdTextPack3Crc != calculatedCdtp3Crc && cdTextPack3Crc != 0)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.CD_Text_Pack_three_CRC_0_expected_1,
cdTextPack3Crc,
calculatedCdtp3Crc);
@@ -656,14 +656,14 @@ public static class CdChecksums
Array.Copy(cdTextPack4, 0, cdTextPack4ForCrc, 0, 16);
ushort calculatedCdtp4Crc = CRC16CcittContext.Calculate(cdTextPack4ForCrc);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Cyclic_CDTP4_0_Calc_CDTP4_1,
cdTextPack4Crc,
calculatedCdtp4Crc);
if(cdTextPack4Crc == calculatedCdtp4Crc || cdTextPack4Crc == 0) return status;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.CD_Text_Pack_four_CRC_0_expected_1,
cdTextPack4Crc,
calculatedCdtp4Crc);

16
Aaru.Checksums/ReedSolomon.cs
View File

@@ -452,17 +452,17 @@ public class ReedSolomon
if(count != noEras)
{
AaruConsole.Debug(MODULE_NAME, Localization.lambda_is_wrong);
AaruLogging.Debug(MODULE_NAME, Localization.lambda_is_wrong);
return -1;
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Erasure_positions_as_determined_by_roots_of_Eras_Loc_Poly);
for(i = 0; i < count; i++) AaruConsole.Debug(MODULE_NAME, "{0} ", loc[i]);
for(i = 0; i < count; i++) AaruLogging.Debug(MODULE_NAME, "{0} ", loc[i]);
AaruConsole.Debug(MODULE_NAME, "\n");
AaruLogging.Debug(MODULE_NAME, "\n");
#endif
}
@@ -569,11 +569,11 @@ public class ReedSolomon
}
#if DEBUG
AaruConsole.Debug(MODULE_NAME, Localization.Final_error_positions);
AaruLogging.Debug(MODULE_NAME, Localization.Final_error_positions);
for(i = 0; i < count; i++) AaruConsole.Debug(MODULE_NAME, "{0} ", loc[i]);
for(i = 0; i < count; i++) AaruLogging.Debug(MODULE_NAME, "{0} ", loc[i]);
AaruConsole.Debug(MODULE_NAME, "\n");
AaruLogging.Debug(MODULE_NAME, "\n");
#endif
if(degLambda != count) return -1;
@@ -625,7 +625,7 @@ public class ReedSolomon
if(den == 0)
{
AaruConsole.Debug(MODULE_NAME, Localization.ERROR_denominator_equals_zero);
AaruLogging.Debug(MODULE_NAME, Localization.ERROR_denominator_equals_zero);
return -1;
}

2
Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs
View File

@@ -62,7 +62,7 @@ public static partial class MediaTypeFromDevice
blocks != 1961069)
return MediaType.Unknown;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ);

28
Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs
View File

@@ -59,7 +59,7 @@ public static partial class MediaTypeFromDevice
{
if(blocks == 1281856)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
mediumType,
@@ -69,7 +69,7 @@ public static partial class MediaTypeFromDevice
return MediaType.PD650_WORM;
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
mediumType,
@@ -79,21 +79,21 @@ public static partial class MediaTypeFromDevice
return MediaType.PD650;
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc,
mediumType);
return MediaType.CD;
case 0x01:
case 0x05:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM,
mediumType);
return MediaType.CDROM;
case 0x02:
case 0x06:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc_Digital_Audio,
mediumType);
@@ -101,13 +101,13 @@ public static partial class MediaTypeFromDevice
return MediaType.CDDA;
case 0x03:
case 0x07:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_Plus,
mediumType);
return MediaType.CDPLUS;
case 0x04:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_Photo_CD,
mediumType);
@@ -121,7 +121,7 @@ public static partial class MediaTypeFromDevice
case 0x16:
case 0x17:
case 0x18:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR,
mediumType);
@@ -135,7 +135,7 @@ public static partial class MediaTypeFromDevice
case 0x26:
case 0x27:
case 0x28:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_CDRW,
mediumType);
@@ -143,7 +143,7 @@ public static partial class MediaTypeFromDevice
case 0x40 when isUsb && !opticalDisc:
case 0x41 when isUsb && !opticalDisc:
case 0x42 when isUsb && !opticalDisc:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_and_device_is_USB_setting_media_type_to_Flash_Drive,
mediumType);
@@ -155,7 +155,7 @@ public static partial class MediaTypeFromDevice
switch(densityCode)
{
case 0x42:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO2,
mediumType,
@@ -163,7 +163,7 @@ public static partial class MediaTypeFromDevice
return MediaType.LTO2;
case 0x44:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO3,
mediumType,
@@ -171,7 +171,7 @@ public static partial class MediaTypeFromDevice
return MediaType.LTO3;
case 0x46:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO4,
mediumType,
@@ -179,7 +179,7 @@ public static partial class MediaTypeFromDevice
return MediaType.LTO4;
case 0x58:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO5,
mediumType,

80
Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs
View File

@@ -47,7 +47,7 @@ public static partial class MediaTypeFromDevice
{
if(mediumType != 0x01 && mediumType != 0x02 && mediumType != 0x03 && mediumType != 0x05 && mediumType != 0x07)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_medium_type_is_0_setting_media_type_to_unknown_magneto_optical,
mediumType);
@@ -61,7 +61,7 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 248826:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA154,
mediumType,
blocks,
@@ -69,7 +69,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_154;
case 429975:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA201_embossed,
mediumType,
blocks,
@@ -77,7 +77,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_201_ROM;
case 446325:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA201,
mediumType,
blocks,
@@ -85,7 +85,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_201;
case 694929:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA223,
mediumType,
blocks,
@@ -93,7 +93,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_223_512;
case 904995:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA183,
mediumType,
blocks,
@@ -101,7 +101,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_183_512;
case 1041500:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO15041,
mediumType,
blocks,
@@ -110,7 +110,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ISO_15041_512;
case 1128772:
case 1163337:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
@@ -118,7 +118,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_184_512;
case 1281856:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
mediumType,
@@ -127,7 +127,7 @@ public static partial class MediaTypeFromDevice
return MediaType.PD650_WORM;
case 1298496:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
mediumType,
@@ -137,7 +137,7 @@ public static partial class MediaTypeFromDevice
return MediaType.PD650;
case 1644581:
case 1647371:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA195,
mediumType,
blocks,
@@ -145,7 +145,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_195_512;
case 2244958:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO14517,
mediumType,
blocks,
@@ -153,7 +153,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ISO_14517_512;
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
@@ -168,7 +168,7 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 314569:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO10089,
mediumType,
blocks,
@@ -176,7 +176,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ISO_10089;
case 371371:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA223,
mediumType,
blocks,
@@ -184,7 +184,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_223;
case 498526:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
@@ -193,7 +193,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_183;
case 603466:
case 637041:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA184,
mediumType,
blocks,
@@ -202,7 +202,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_184;
case 936921:
case 948770:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA195,
mediumType,
blocks,
@@ -210,7 +210,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_195;
case 1244621:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA238,
mediumType,
blocks,
@@ -218,7 +218,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_238;
case 1273011:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO14517,
mediumType,
blocks,
@@ -226,7 +226,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ISO_14517;
case 2319786:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO15286,
mediumType,
blocks,
@@ -234,7 +234,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ISO_15286_1024;
case 4383356:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
@@ -242,7 +242,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_322_1k;
case 14476734:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA260,
mediumType,
blocks,
@@ -250,7 +250,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_260;
case 24445990:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA260,
mediumType,
blocks,
@@ -258,7 +258,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_260_Double;
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
@@ -276,7 +276,7 @@ public static partial class MediaTypeFromDevice
case 318988:
case 320332:
case 321100:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA239,
mediumType,
blocks,
@@ -284,7 +284,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_239;
case 605846:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_GigaMO,
mediumType,
blocks,
@@ -292,7 +292,7 @@ public static partial class MediaTypeFromDevice
return MediaType.GigaMo;
case 1063146:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_GigaMO2,
mediumType,
blocks,
@@ -300,7 +300,7 @@ public static partial class MediaTypeFromDevice
return MediaType.GigaMo2;
case 1128134:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA280,
mediumType,
blocks,
@@ -308,7 +308,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_280;
case 1263472:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ISO15286,
mediumType,
blocks,
@@ -316,7 +316,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ISO_15286;
case 2043664:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
@@ -324,7 +324,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_322_2k;
case 7355716:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA317,
mediumType,
blocks,
@@ -332,7 +332,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_317;
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
@@ -347,7 +347,7 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 1095840:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ECMA322,
mediumType,
blocks,
@@ -355,7 +355,7 @@ public static partial class MediaTypeFromDevice
return MediaType.ECMA_322;
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
@@ -370,7 +370,7 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 1834348:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_UDO,
mediumType,
blocks,
@@ -378,7 +378,7 @@ public static partial class MediaTypeFromDevice
return MediaType.UDO;
case 3668759:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_UDO2,
mediumType,
blocks,
@@ -386,7 +386,7 @@ public static partial class MediaTypeFromDevice
return MediaType.UDO2_WORM;
case 3669724:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_UDO2,
mediumType,
blocks,
@@ -394,7 +394,7 @@ public static partial class MediaTypeFromDevice
return MediaType.UDO2;
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,
@@ -405,7 +405,7 @@ public static partial class MediaTypeFromDevice
}
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Unknown_MO,
mediumType,
blocks,

284
Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs
View File

File diff suppressed because it is too large Load Diff

12
Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs
View File

@@ -84,7 +84,7 @@ public static partial class MediaTypeFromDevice
model.StartsWith("MDH", StringComparison.Ordinal):
if(blockSize == 2048)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MDDATA,
scsiPeripheralType,
blocks,
@@ -96,7 +96,7 @@ public static partial class MediaTypeFromDevice
switch(blocks)
{
case 57312:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD60_MDDATA,
scsiPeripheralType,
blocks,
@@ -104,7 +104,7 @@ public static partial class MediaTypeFromDevice
return MediaType.MD60;
case 70464:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD74_MDDATA,
scsiPeripheralType,
blocks,
@@ -112,7 +112,7 @@ public static partial class MediaTypeFromDevice
return MediaType.MD74;
case 76096:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD80_MDDATA,
scsiPeripheralType,
blocks,
@@ -121,7 +121,7 @@ public static partial class MediaTypeFromDevice
return MediaType.MD80;
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_MD60_MDDATA,
scsiPeripheralType,
blocks,
@@ -131,7 +131,7 @@ public static partial class MediaTypeFromDevice
// Host managed zoned block device
case 0x14:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_ZBC_Host_Managed,
scsiPeripheralType,
blocks,

192
Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs
View File

@@ -53,70 +53,70 @@ public static partial class MediaTypeFromDevice
switch(densityCode)
{
case 0x04:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_QIC11,
mediumType,
densityCode);
return MediaType.QIC11;
case 0x05:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_QIC24,
mediumType,
densityCode);
return MediaType.QIC24;
case 0x09:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3490,
mediumType,
densityCode);
return MediaType.IBM3490;
case 0x0F:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_QIC120,
mediumType,
densityCode);
return MediaType.QIC120;
case 0x10:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_QIC150,
mediumType,
densityCode);
return MediaType.QIC150;
case 0x13:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS,
mediumType,
densityCode);
return MediaType.DDS1;
case 0x24:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS2,
mediumType,
densityCode);
return MediaType.DDS2;
case 0x25:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS3,
mediumType,
densityCode);
return MediaType.DDS3;
case 0x26:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS4,
mediumType,
densityCode);
return MediaType.DDS4;
case 0x28:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3490E,
mediumType,
densityCode);
@@ -125,7 +125,7 @@ public static partial class MediaTypeFromDevice
case 0x40:
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO_ult,
mediumType,
densityCode);
@@ -135,7 +135,7 @@ public static partial class MediaTypeFromDevice
if(model.StartsWith("sdz", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_SAIT,
mediumType,
densityCode);
@@ -149,7 +149,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO2_ult,
mediumType,
densityCode);
@@ -164,7 +164,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO2_ult,
mediumType,
densityCode);
@@ -174,7 +174,7 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9840A,
mediumType,
densityCode);
@@ -189,7 +189,7 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9940A,
mediumType,
densityCode);
@@ -204,7 +204,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO3,
mediumType,
densityCode);
@@ -214,7 +214,7 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9940B,
mediumType,
densityCode);
@@ -229,7 +229,7 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9940C,
mediumType,
densityCode);
@@ -244,7 +244,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO4,
mediumType,
densityCode);
@@ -254,7 +254,7 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T9840D,
mediumType,
densityCode);
@@ -269,7 +269,7 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T10000A,
mediumType,
densityCode);
@@ -284,7 +284,7 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T10000B,
mediumType,
densityCode);
@@ -299,7 +299,7 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T10000C,
mediumType,
densityCode);
@@ -314,7 +314,7 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_T10000D,
mediumType,
densityCode);
@@ -329,7 +329,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO5,
mediumType,
densityCode);
@@ -343,7 +343,7 @@ public static partial class MediaTypeFromDevice
// Used by some HP drives for all generations
case 0x8C:
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS,
mediumType,
densityCode);
@@ -361,7 +361,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO3,
mediumType,
densityCode);
@@ -376,7 +376,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO4,
mediumType,
densityCode);
@@ -391,7 +391,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO5,
mediumType,
densityCode);
@@ -413,7 +413,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO_ult,
mediumType,
densityCode);
@@ -426,7 +426,7 @@ public static partial class MediaTypeFromDevice
case 0x40:
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO,
mediumType,
densityCode);
@@ -445,7 +445,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO2_ult,
mediumType,
densityCode);
@@ -458,7 +458,7 @@ public static partial class MediaTypeFromDevice
case 0x42:
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO2,
mediumType,
densityCode);
@@ -478,7 +478,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS3_dat,
mediumType,
densityCode);
@@ -501,7 +501,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS4_alt,
mediumType,
densityCode);
@@ -524,7 +524,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DAT72_dat,
mediumType,
densityCode);
@@ -547,7 +547,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO3,
mediumType,
densityCode);
@@ -570,7 +570,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO3,
mediumType,
densityCode);
@@ -593,7 +593,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO4,
mediumType,
densityCode);
@@ -616,7 +616,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO4,
mediumType,
densityCode);
@@ -639,7 +639,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DDS2_dat,
mediumType,
densityCode);
@@ -662,7 +662,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO5,
mediumType,
densityCode);
@@ -685,7 +685,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO5,
mediumType,
densityCode);
@@ -708,7 +708,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO6_ult,
mediumType,
densityCode);
@@ -731,7 +731,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO6_ult,
mediumType,
densityCode);
@@ -754,7 +754,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_LTO7_ult,
mediumType,
densityCode);
@@ -777,7 +777,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_WORM_LTO7_ult,
mediumType,
densityCode);
@@ -799,7 +799,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_15m,
mediumType,
densityCode);
@@ -809,7 +809,7 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3592,
mediumType,
densityCode);
@@ -819,7 +819,7 @@ public static partial class MediaTypeFromDevice
if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_VXA,
mediumType,
densityCode);
@@ -838,7 +838,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_15m,
mediumType,
densityCode);
@@ -854,7 +854,7 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3592,
mediumType,
densityCode);
@@ -869,7 +869,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_VXA,
mediumType,
densityCode);
@@ -891,7 +891,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_28m,
mediumType,
densityCode);
@@ -901,7 +901,7 @@ public static partial class MediaTypeFromDevice
if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3592,
mediumType,
densityCode);
@@ -916,7 +916,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_CompactTape,
mediumType,
densityCode);
@@ -935,7 +935,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_28m,
mediumType,
densityCode);
@@ -950,7 +950,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_CompactTapeII,
mediumType,
densityCode);
@@ -966,7 +966,7 @@ public static partial class MediaTypeFromDevice
{
if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_IBM3592,
mediumType,
densityCode);
@@ -981,7 +981,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_VXA2,
mediumType,
densityCode);
@@ -996,7 +996,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_VXA3,
mediumType,
densityCode);
@@ -1018,7 +1018,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_54m,
mediumType,
densityCode);
@@ -1028,7 +1028,7 @@ public static partial class MediaTypeFromDevice
if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIII,
mediumType,
densityCode);
@@ -1047,7 +1047,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_54m,
mediumType,
densityCode);
@@ -1066,7 +1066,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIII,
mediumType,
densityCode);
@@ -1088,7 +1088,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_80m,
mediumType,
densityCode);
@@ -1098,7 +1098,7 @@ public static partial class MediaTypeFromDevice
if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIIIxt,
mediumType,
densityCode);
@@ -1117,7 +1117,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_80m,
mediumType,
densityCode);
@@ -1134,7 +1134,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIIIxt,
mediumType,
densityCode);
@@ -1156,7 +1156,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_106m,
mediumType,
densityCode);
@@ -1168,7 +1168,7 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIV,
mediumType,
densityCode);
@@ -1178,7 +1178,7 @@ public static partial class MediaTypeFromDevice
if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Travan5_stt,
mediumType,
densityCode);
@@ -1197,7 +1197,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_106m,
mediumType,
densityCode);
@@ -1225,7 +1225,7 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_DLTtapeIV,
mediumType,
densityCode);
@@ -1240,7 +1240,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Travan5_stt,
mediumType,
densityCode);
@@ -1263,7 +1263,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_160m,
mediumType,
densityCode);
@@ -1275,7 +1275,7 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_SDLT,
mediumType,
densityCode);
@@ -1290,7 +1290,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_160m,
mediumType,
densityCode);
@@ -1309,7 +1309,7 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_SDLT,
mediumType,
densityCode);
@@ -1334,7 +1334,7 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_SDLT2,
mediumType,
densityCode);
@@ -1361,7 +1361,7 @@ public static partial class MediaTypeFromDevice
model.StartsWith("sdlt", StringComparison.OrdinalIgnoreCase) ||
model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_VStape,
mediumType,
densityCode);
@@ -1379,7 +1379,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Travan7,
mediumType,
densityCode);
@@ -1395,7 +1395,7 @@ public static partial class MediaTypeFromDevice
{
case 0x45:
// HP Colorado tapes have a different capacity but return same density code at least in Seagate drives
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Travan4,
mediumType,
densityCode);
@@ -1410,7 +1410,7 @@ public static partial class MediaTypeFromDevice
switch(densityCode)
{
case 0x47:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Travan5,
mediumType,
densityCode);
@@ -1432,7 +1432,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_22m,
mediumType,
densityCode);
@@ -1459,7 +1459,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_40m,
mediumType,
densityCode);
@@ -1486,7 +1486,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_76m,
mediumType,
densityCode);
@@ -1513,7 +1513,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_112m,
mediumType,
densityCode);
@@ -1537,7 +1537,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_22m_AME,
mediumType,
densityCode);
@@ -1561,7 +1561,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_170m,
mediumType,
densityCode);
@@ -1585,7 +1585,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_125m,
mediumType,
densityCode);
@@ -1609,7 +1609,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_45m,
mediumType,
densityCode);
@@ -1633,7 +1633,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_225m,
mediumType,
densityCode);
@@ -1657,7 +1657,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_150m,
mediumType,
densityCode);
@@ -1681,7 +1681,7 @@ public static partial class MediaTypeFromDevice
{
if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SCSI_Media_Type_Description_Exatape_75m,
mediumType,
densityCode);

2
Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs
View File

@@ -800,7 +800,7 @@ public static class Identify
if(IdentifyDeviceResponse.Length != 512)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.IDENTIFY_response_is_different_than_512_bytes_not_decoding);
return null;

4
Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs
View File

@@ -275,7 +275,7 @@ public struct Inquiry
if(SCSIInquiryResponse.Length < 36 && SCSIInquiryResponse.Length != 5)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.INQUIRY_response_is_0_bytes_less_than_minimum_of_36_bytes,
SCSIInquiryResponse.Length);
@@ -285,7 +285,7 @@ public struct Inquiry
if(SCSIInquiryResponse.Length < SCSIInquiryResponse[4] + 4 &&
SCSIInquiryResponse.Length != SCSIInquiryResponse[4])
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.INQUIRY_response_length_0_bytes_is_different_than_specified_in_length_field,
SCSIInquiryResponse.Length,

2
Aaru.Core/ArchiveFormat.cs
View File

@@ -59,7 +59,7 @@ public static class ArchiveFormat
try
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, plugin.Name);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, plugin.Name);
if(!plugin.Identify(archiveFilter)) continue;

6
Aaru.Core/ArchiveInfo.cs
View File

@@ -44,12 +44,12 @@ public static class ArchiveInfo
/// <param name="imageFormat">Archive</param>
public static void PrintArchiveInfo(IArchive imageFormat, IFilter filter, Encoding encoding)
{
AaruConsole.WriteLine(Localization.Core.Archive_Information_With_Markup);
AaruLogging.WriteLine(Localization.Core.Archive_Information_With_Markup);
imageFormat.GetInformation(filter, encoding, out string information);
AaruConsole.WriteLine(Markup.Escape(information));
AaruLogging.WriteLine(Markup.Escape(information));
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
}

6
Aaru.Core/DataFile.cs
View File

@@ -137,7 +137,7 @@ public sealed class DataFile
File.Delete(filename);
else
{
AaruConsole.Error(Localization.Core.Not_overwriting_file_0, filename);
AaruLogging.Error(Localization.Core.Not_overwriting_file_0, filename);
return;
}
@@ -145,14 +145,14 @@ public sealed class DataFile
try
{
AaruConsole.Debug(who, string.Format(Localization.Core.Writing_0_to_1, whatWriting, filename));
AaruLogging.Debug(who, string.Format(Localization.Core.Writing_0_to_1, whatWriting, filename));
var outputFs = new FileStream(filename, FileMode.CreateNew);
outputFs.Write(data, 0, data.Length);
outputFs.Close();
}
catch
{
AaruConsole.Error(Localization.Core.Unable_to_write_file_0, filename);
AaruLogging.Error(Localization.Core.Unable_to_write_file_0, filename);
}
}
}

4
Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
View File

@@ -903,7 +903,7 @@ partial class Dump
_resume.BadBlocks.Add(i + r);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_error_0,
Sense.PrettifySense(senseBuf));
@@ -1104,7 +1104,7 @@ partial class Dump
for(ulong b = i; b < i + _skip; b++) _resume.BadBlocks.Add(b);
AaruConsole.Debug(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration, _skip);
ibgLog.Write(i, 0);

2
Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
View File

@@ -1687,7 +1687,7 @@ sealed partial class Dump
{
if(tag.Value is null)
{
AaruConsole.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
AaruLogging.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
continue;
}

2
Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
View File

@@ -207,7 +207,7 @@ partial class Dump
UpdateStatus?.Invoke(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
_dumpLog.WriteLine(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);

26
Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
View File

@@ -189,7 +189,7 @@ partial class Dump
break;
}
AaruConsole.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(PREGAP_MODULE_NAME,
bcd switch
{
true => Localization.Core.Subchannel_is_BCD,
@@ -219,7 +219,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.Debug(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence);
AaruLogging.Debug(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence);
if(track.Sequence > 1) pregaps[track.Sequence] = 150;
@@ -228,21 +228,21 @@ partial class Dump
if(t > 0 && tracks[t - 1].Type == tracks[t].Type && dumping)
{
AaruConsole.Debug(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence);
AaruLogging.Debug(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence);
continue;
}
if(dumping && dev.Manufacturer.ToLowerInvariant().StartsWith("plextor", StringComparison.Ordinal))
{
AaruConsole.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(PREGAP_MODULE_NAME,
Localization.Core.Skipping_track_0_due_to_Plextor_firmware_bug,
track.Sequence);
continue;
}
AaruConsole.Debug(PREGAP_MODULE_NAME, Localization.Core.Track_0, track.Sequence);
AaruLogging.Debug(PREGAP_MODULE_NAME, Localization.Core.Track_0, track.Sequence);
int lba = (int)track.StartSector - 1;
bool pregapFound = false;
@@ -263,7 +263,7 @@ partial class Dump
if(sense)
{
AaruConsole.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(PREGAP_MODULE_NAME,
Localization.Core.LBA_0_Try_1_Sense_2,
lba,
retries + 1,
@@ -276,7 +276,7 @@ partial class Dump
CRC16CcittContext.Data(subBuf, 10, out crc);
AaruConsole.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(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,
@@ -329,7 +329,7 @@ partial class Dump
if(crcOk)
{
AaruConsole.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(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,
@@ -403,7 +403,7 @@ partial class Dump
CRC16CcittContext.Data(subBuf, 10, out crc);
AaruConsole.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(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,
@@ -456,7 +456,7 @@ partial class Dump
if(crcOk)
{
AaruConsole.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(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,
@@ -549,7 +549,7 @@ partial class Dump
{
inexactPositioning = true;
AaruConsole.Debug(PREGAP_MODULE_NAME, Localization.Core.All_Q_empty_for_LBA_0, lba);
AaruLogging.Debug(PREGAP_MODULE_NAME, Localization.Core.All_Q_empty_for_LBA_0, lba);
break;
}
@@ -611,7 +611,7 @@ partial class Dump
if(diff != 0)
{
AaruConsole.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(PREGAP_MODULE_NAME,
Localization.Core.Invalid_Q_position_for_LBA_0_got_1,
lba,
posQ);
@@ -635,7 +635,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.Debug(PREGAP_MODULE_NAME,
AaruLogging.Debug(PREGAP_MODULE_NAME,
Localization.Core.Pregap_for_track_0_1,
track.Sequence,
pregapQ);

2
Aaru.Core/Devices/Dumping/MiniDisc.cs
View File

@@ -635,7 +635,7 @@ partial class Dump
UpdateStatus?.Invoke(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
_dumpLog.WriteLine(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);

2
Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
View File

@@ -519,7 +519,7 @@ public partial class Dump
UpdateStatus?.Invoke(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
_dumpLog.WriteLine(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);

4
Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs
View File

@@ -536,7 +536,7 @@ public partial class Dump
UpdateStatus?.Invoke(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
_dumpLog.WriteLine(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
@@ -643,7 +643,7 @@ public partial class Dump
}
EndProgress?.Invoke();
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
#endregion Error handling

2
Aaru.Core/Devices/Dumping/Sbc/Dump.cs
View File

@@ -972,7 +972,7 @@ partial class Dump
{
if(tag.Value is null)
{
AaruConsole.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
AaruLogging.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
continue;
}

2
Aaru.Core/Devices/Dumping/Sbc/Error.cs
View File

@@ -233,7 +233,7 @@ partial class Dump
UpdateStatus?.Invoke(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
_dumpLog.WriteLine(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);

2
Aaru.Core/Devices/Dumping/Sbc/Optical.cs
View File

@@ -88,7 +88,7 @@ partial class Dump
// TODO: Find a place where MEDIUM SCAN works properly
else if(buffer?.Length > 0 && !ArrayHelpers.ArrayIsNullOrEmpty(buffer))
AaruConsole.WriteLine(Localization.Core.MEDIUM_SCAN_github_plead_message);
AaruLogging.WriteLine(Localization.Core.MEDIUM_SCAN_github_plead_message);
changingCounter = false;
changingWritten = false;

26
Aaru.Core/Devices/Dumping/XGD.cs
View File

@@ -90,7 +90,7 @@ partial class Dump
if(!isAdmin)
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.Because_of_commands_sent_dumping_XGD_must_be_administrative_Cannot_continue);
_dumpLog.WriteLine(Localization.Core.Cannot_dump_XGD_without_administrative_privileges);
@@ -162,7 +162,7 @@ partial class Dump
mediaTags.Add(MediaTagType.Xbox_SecuritySector, tmpBuf);
// Get video partition size
AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_video_partition_size);
AaruLogging.Debug(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 _);
@@ -217,7 +217,7 @@ partial class Dump
Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
AaruConsole.Debug(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize);
ulong l0Video = (PFI.Decode(readBuffer, MediaType.DVDROM)?.Layer0EndPSN ?? 0) -
(PFI.Decode(readBuffer, MediaType.DVDROM)?.DataAreaStartPSN ?? 0) +
@@ -266,7 +266,7 @@ partial class Dump
mediaTags.Remove(MediaTagType.DVD_PFI);
mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
AaruConsole.Debug(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize);
l0Video = (PFI.Decode(coldPfi, MediaType.DVDROM)?.Layer0EndPSN ?? 0) -
(PFI.Decode(coldPfi, MediaType.DVDROM)?.DataAreaStartPSN ?? 0) +
@@ -285,7 +285,7 @@ partial class Dump
}
// Get game partition size
AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_game_partition_size);
AaruLogging.Debug(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 _);
@@ -316,10 +316,10 @@ partial class Dump
0xFFFFFFFF) +
1;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Game_partition_total_size_0_sectors, gameSize);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Game_partition_total_size_0_sectors, gameSize);
// Get middle zone size
AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_middle_zone_size);
AaruLogging.Debug(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 _);
@@ -369,7 +369,7 @@ partial class Dump
return;
}
AaruConsole.Debug(MODULE_NAME, Localization.Core.Unlocked_total_size_0_sectors, totalSize);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Unlocked_total_size_0_sectors, totalSize);
ulong blocks = totalSize + 1;
PFI.PhysicalFormatInformation? wxRipperPfiNullable = PFI.Decode(readBuffer, MediaType.DVDROM);
@@ -772,7 +772,7 @@ partial class Dump
for(ulong b = i; b < i + _skip; b++) _resume.BadBlocks.Add(b);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_error_0,
Sense.PrettifySense(senseBuf));
@@ -984,7 +984,7 @@ partial class Dump
// TODO: Handle errors in video partition
//errored += blocksToRead;
//resume.BadBlocks.Add(l1);
AaruConsole.Debug(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
mhddLog.Write(l1, cmdDuration < 500 ? 65535 : cmdDuration, _skip);
ibgLog.Write(l1, 0);
@@ -1037,7 +1037,7 @@ partial class Dump
}
_dumpStopwatch.Stop();
AaruConsole.WriteLine();
AaruLogging.WriteLine();
mhddLog.Close();
ibgLog.Close(_dev,
@@ -1261,7 +1261,7 @@ partial class Dump
UpdateStatus?.Invoke(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
_dumpLog.WriteLine(Localization.Core
.Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
@@ -1384,7 +1384,7 @@ partial class Dump
{
if(tag.Value is null)
{
AaruConsole.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
AaruLogging.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
continue;
}

62
Aaru.Core/Devices/Info/DeviceInfo.cs
View File

@@ -88,27 +88,27 @@ public partial class DeviceInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status);
AaruConsole.Debug(MODULE_NAME, "ERROR = 0x{0:X2}", errorRegisters.Error);
AaruLogging.Debug(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status);
AaruLogging.Debug(MODULE_NAME, "ERROR = 0x{0:X2}", errorRegisters.Error);
AaruConsole.Debug(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount);
AaruLogging.Debug(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount);
AaruConsole.Debug(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector);
AaruLogging.Debug(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector);
AaruConsole.Debug(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh);
AaruLogging.Debug(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh);
AaruConsole.Debug(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow);
AaruLogging.Debug(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow);
AaruConsole.Debug(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead);
AaruLogging.Debug(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead);
AaruConsole.Debug(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError);
break;
}
if(dev.Error)
{
AaruConsole.Error(Localization.Core.Error_0_querying_ATA_IDENTIFY, dev.LastError);
AaruLogging.Error(Localization.Core.Error_0_querying_ATA_IDENTIFY, dev.LastError);
break;
}
@@ -128,20 +128,20 @@ public partial class DeviceInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status);
AaruConsole.Debug(MODULE_NAME, "ERROR = 0x{0:X2}", errorRegisters.Error);
AaruLogging.Debug(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status);
AaruLogging.Debug(MODULE_NAME, "ERROR = 0x{0:X2}", errorRegisters.Error);
AaruConsole.Debug(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount);
AaruLogging.Debug(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount);
AaruConsole.Debug(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector);
AaruLogging.Debug(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector);
AaruConsole.Debug(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh);
AaruLogging.Debug(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh);
AaruConsole.Debug(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow);
AaruLogging.Debug(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow);
AaruConsole.Debug(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead);
AaruLogging.Debug(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead);
AaruConsole.Debug(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError);
break;
}
@@ -149,7 +149,7 @@ public partial class DeviceInfo
if(!dev.Error)
AtapiIdentify = ataBuf;
else
AaruConsole.Error(Localization.Core.Error_0_querying_ATA_PACKET_IDENTIFY, dev.LastError);
AaruLogging.Error(Localization.Core.Error_0_querying_ATA_PACKET_IDENTIFY, dev.LastError);
// ATAPI devices are also SCSI devices
goto case DeviceType.SCSI;
@@ -161,7 +161,7 @@ public partial class DeviceInfo
if(sense)
{
AaruConsole.Error(Localization.Core.SCSI_error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Error(Localization.Core.SCSI_error_0, Sense.PrettifySense(senseBuf));
break;
}
@@ -297,11 +297,11 @@ public partial class DeviceInfo
foreach (Decoders.SCSI.DiscStructureCapabilities.Capability cap in caps)
{
if (cap.SDS && cap.RDS)
AaruConsole.WriteLine("Drive can READ/SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
AaruLogging.WriteLine("Drive can READ/SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
else if (cap.SDS)
AaruConsole.WriteLine("Drive can SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
AaruLogging.WriteLine("Drive can SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
else if (cap.RDS)
AaruConsole.WriteLine("Drive can READ DISC STRUCTURE format {0:X2}h", cap.FormatCode);
AaruLogging.WriteLine("Drive can READ DISC STRUCTURE format {0:X2}h", cap.FormatCode);
}
}
}
@@ -316,11 +316,11 @@ public partial class DeviceInfo
foreach (Decoders.SCSI.DiscStructureCapabilities.Capability cap in caps)
{
if (cap.SDS && cap.RDS)
AaruConsole.WriteLine("Drive can READ/SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
AaruLogging.WriteLine("Drive can READ/SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
else if (cap.SDS)
AaruConsole.WriteLine("Drive can SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
AaruLogging.WriteLine("Drive can SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
else if (cap.RDS)
AaruConsole.WriteLine("Drive can READ DISC STRUCTURE format {0:X2}h", cap.FormatCode);
AaruLogging.WriteLine("Drive can READ DISC STRUCTURE format {0:X2}h", cap.FormatCode);
}
}
}
@@ -458,10 +458,10 @@ public partial class DeviceInfo
// TODO: Check which one is each one
/*
if(plxtBuf[6] > 0)
AaruConsole.WriteLine("\tTray eject speed limited to {0}",
AaruLogging.WriteLine("\tTray eject speed limited to {0}",
-(plxtBuf[6] + 48));
if(plxtBuf[7] > 0)
AaruConsole.WriteLine("\tTray eject speed limited to {0}",
AaruLogging.WriteLine("\tTray eject speed limited to {0}",
plxtBuf[7] - 47);
*/
}
@@ -546,14 +546,14 @@ public partial class DeviceInfo
sense = dev.ReadBlockLimits(out byte[] seqBuf, out senseBuf, dev.Timeout, out _);
if(sense)
AaruConsole.Error("READ BLOCK LIMITS:\n{0}", Sense.PrettifySense(senseBuf));
AaruLogging.Error("READ BLOCK LIMITS:\n{0}", Sense.PrettifySense(senseBuf));
else
BlockLimits = seqBuf;
sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, dev.Timeout, out _);
if(sense)
AaruConsole.Error("REPORT DENSITY SUPPORT:\n{0}", Sense.PrettifySense(senseBuf));
AaruLogging.Error("REPORT DENSITY SUPPORT:\n{0}", Sense.PrettifySense(senseBuf));
else
{
DensitySupport = seqBuf;
@@ -564,7 +564,7 @@ public partial class DeviceInfo
if(sense)
{
AaruConsole.Error("REPORT DENSITY SUPPORT (MEDIUM):\n{0}",
AaruLogging.Error("REPORT DENSITY SUPPORT (MEDIUM):\n{0}",
Sense.PrettifySense(senseBuf));
}
else
@@ -621,7 +621,7 @@ public partial class DeviceInfo
break;
default:
AaruConsole.Error(Localization.Core.Unknown_device_type_0_cannot_get_information, dev.Type);
AaruLogging.Error(Localization.Core.Unknown_device_type_0_cannot_get_information, dev.Type);
break;
}

24
Aaru.Core/Devices/ReaderATA.cs
View File

@@ -193,25 +193,25 @@ sealed partial class Reader
}
if(_ataReadDmaLba48)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_DMA_EXT_command);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_DMA_EXT_command);
else if(_ataReadLba48)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_EXT_command);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_EXT_command);
else if(_ataReadDmaRetryLba)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_DMA_command_with_retries_LBA);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_DMA_command_with_retries_LBA);
else if(_ataReadDmaLba)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_DMA_command_LBA);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_DMA_command_LBA);
else if(_ataReadRetryLba)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_command_with_retries_LBA);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_command_with_retries_LBA);
else if(_ataReadLba)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_command_LBA);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_command_LBA);
else if(_ataReadDmaRetry)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_DMA_command_with_retries_CHS);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_DMA_command_with_retries_CHS);
else if(_ataReadDma)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_DMA_command_CHS);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_DMA_command_CHS);
else if(_ataReadRetry)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_command_with_retries_CHS);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_command_with_retries_CHS);
else if(_ataRead)
AaruConsole.WriteLine(Localization.Core.Using_ATA_READ_command_CHS);
AaruLogging.WriteLine(Localization.Core.Using_ATA_READ_command_CHS);
else
{
ErrorMessage = Localization.Core.Could_not_get_a_working_read_command;
@@ -395,7 +395,7 @@ sealed partial class Reader
if((status & 0x04) == 0x04) recoveredError = true;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status);
return true;
}
@@ -454,7 +454,7 @@ sealed partial class Reader
if((status & 0x04) == 0x04) recoveredError = true;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status);
return true;
}

24
Aaru.Core/Devices/ReaderSCSI.cs
View File

@@ -612,26 +612,26 @@ sealed partial class Reader
if(CanReadRaw)
{
if(_readLong16)
AaruConsole.WriteLine(Localization.Core.Using_SCSI_READ_LONG_16_command);
AaruLogging.WriteLine(Localization.Core.Using_SCSI_READ_LONG_16_command);
else if(_readLong10 || _readLongDvd)
AaruConsole.WriteLine(Localization.Core.Using_SCSI_READ_LONG_10_command);
AaruLogging.WriteLine(Localization.Core.Using_SCSI_READ_LONG_10_command);
else if(_syqReadLong10)
AaruConsole.WriteLine(Localization.Core.Using_SyQuest_READ_LONG_10_command);
AaruLogging.WriteLine(Localization.Core.Using_SyQuest_READ_LONG_10_command);
else if(_syqReadLong6)
AaruConsole.WriteLine(Localization.Core.Using_SyQuest_READ_LONG_6_command);
AaruLogging.WriteLine(Localization.Core.Using_SyQuest_READ_LONG_6_command);
else if(HldtstReadRaw)
AaruConsole.WriteLine(Localization.Core.Using_HL_DT_ST_raw_DVD_reading);
AaruLogging.WriteLine(Localization.Core.Using_HL_DT_ST_raw_DVD_reading);
else if(_plextorReadRaw)
AaruConsole.WriteLine(Localization.Core.Using_Plextor_raw_DVD_reading);
else if(LiteOnReadRaw) AaruConsole.WriteLine(Localization.Core.Using_Lite_On_raw_DVD_reading);
AaruLogging.WriteLine(Localization.Core.Using_Plextor_raw_DVD_reading);
else if(LiteOnReadRaw) AaruLogging.WriteLine(Localization.Core.Using_Lite_On_raw_DVD_reading);
}
else if(_read6)
AaruConsole.WriteLine(Localization.Core.Using_SCSI_READ_6_command);
AaruLogging.WriteLine(Localization.Core.Using_SCSI_READ_6_command);
else if(_read10)
AaruConsole.WriteLine(Localization.Core.Using_SCSI_READ_10_command);
AaruLogging.WriteLine(Localization.Core.Using_SCSI_READ_10_command);
else if(_read12)
AaruConsole.WriteLine(Localization.Core.Using_SCSI_READ_12_command);
else if(_read16) AaruConsole.WriteLine(Localization.Core.Using_SCSI_READ_16_command);
AaruLogging.WriteLine(Localization.Core.Using_SCSI_READ_12_command);
else if(_read16) AaruLogging.WriteLine(Localization.Core.Using_SCSI_READ_16_command);
return false;
}
@@ -920,7 +920,7 @@ sealed partial class Reader
blankCheck = Sense.Decode(senseBuf)?.SenseKey == SenseKeys.BlankCheck;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
return sense;
}

64
Aaru.Core/Devices/Report/ATA.cs
View File

@@ -192,7 +192,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadSectors =
!sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -210,7 +210,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadRetry =
!sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -228,7 +228,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadDma =
!sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -246,7 +246,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadDmaRetry =
!sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -263,7 +263,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2,
sense,
errorChs.Status,
@@ -278,7 +278,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadLba =
!sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -296,7 +296,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadRetryLba =
!sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -314,7 +314,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadDmaLba =
!sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -332,7 +332,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadDmaRetryLba =
!sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -349,7 +349,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2,
sense,
errorChs.Status,
@@ -364,7 +364,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadLba48 =
!sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -382,7 +382,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsReadDmaLba48 =
!sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -431,7 +431,7 @@ public sealed partial class DeviceReport
readBuf.Length > 0 &&
BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -461,7 +461,7 @@ public sealed partial class DeviceReport
readBuf.Length > 0 &&
BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -489,7 +489,7 @@ public sealed partial class DeviceReport
readBuf.Length > 0 &&
BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -517,7 +517,7 @@ public sealed partial class DeviceReport
readBuf.Length > 0 &&
BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -656,7 +656,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadSectors =
!sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -674,7 +674,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadRetry =
!sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -692,7 +692,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadDma =
!sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -710,7 +710,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadDmaRetry =
!sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -727,7 +727,7 @@ public sealed partial class DeviceReport
capabilities.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2,
sense,
errorChs.Status,
@@ -742,7 +742,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadLba =
!sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorLba.Status,
@@ -760,7 +760,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadRetryLba =
!sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorLba.Status,
@@ -778,7 +778,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadDmaLba =
!sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorLba.Status,
@@ -796,7 +796,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadDmaRetryLba =
!sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorLba.Status,
@@ -813,7 +813,7 @@ public sealed partial class DeviceReport
capabilities.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2,
sense,
errorLba.Status,
@@ -828,7 +828,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadLba48 =
!sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorLba48.Status,
@@ -846,7 +846,7 @@ public sealed partial class DeviceReport
capabilities.SupportsReadDmaLba48 =
!sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorLba48.Status,
@@ -895,7 +895,7 @@ public sealed partial class DeviceReport
readBuf.Length > 0 &&
BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -925,7 +925,7 @@ public sealed partial class DeviceReport
readBuf.Length > 0 &&
BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorChs.Status,
@@ -953,7 +953,7 @@ public sealed partial class DeviceReport
readBuf.Length > 0 &&
BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorLba.Status,
@@ -981,7 +981,7 @@ public sealed partial class DeviceReport
readBuf.Length > 0 &&
BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
AaruConsole.Debug(ATA_MODULE_NAME,
AaruLogging.Debug(ATA_MODULE_NAME,
Localization.Core.Sense_0_Status_1_Error_2_Length_3,
sense,
errorLba.Status,

212
Aaru.Core/Devices/Report/GdRomSwapTrick.cs
View File

@@ -55,11 +55,11 @@ public sealed partial class DeviceReport
while(pressedKey.Key != ConsoleKey.Y && pressedKey.Key != ConsoleKey.N)
{
AaruConsole.Write(Localization.Core
AaruLogging.Write(Localization.Core
.Have_you_previously_tried_with_a_GD_ROM_disc_and_did_the_computer_hang_or_crash_Q);
pressedKey = Console.ReadKey();
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
if(pressedKey.Key == ConsoleKey.Y)
@@ -69,16 +69,16 @@ public sealed partial class DeviceReport
return;
}
AaruConsole.WriteLine(Localization.Core.Ejecting_disc);
AaruLogging.WriteLine(Localization.Core.Ejecting_disc);
_dev.AllowMediumRemoval(out _, _dev.Timeout, out _);
_dev.EjectTray(out _, _dev.Timeout, out _);
AaruConsole.WriteLine(Localization.Core.Please_insert_trap_disc_inside);
AaruConsole.WriteLine(Localization.Core.Press_any_key_to_continue);
AaruLogging.WriteLine(Localization.Core.Please_insert_trap_disc_inside);
AaruLogging.WriteLine(Localization.Core.Press_any_key_to_continue);
Console.ReadLine();
AaruConsole.WriteLine(Localization.Core.Sending_READ_FULL_TOC_to_the_device);
AaruLogging.WriteLine(Localization.Core.Sending_READ_FULL_TOC_to_the_device);
int retries = 0;
bool sense;
@@ -103,8 +103,8 @@ public sealed partial class DeviceReport
if(sense)
{
AaruConsole.WriteLine(Localization.Core.READ_FULL_TOC_failed);
AaruConsole.Debug(GDROM_MODULE_NAME, "{0}", Sense.PrettifySense(senseBuffer));
AaruLogging.WriteLine(Localization.Core.READ_FULL_TOC_failed);
AaruLogging.Debug(GDROM_MODULE_NAME, "{0}", Sense.PrettifySense(senseBuffer));
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
report.GdRomSwapDiscCapabilities.TestCrashed = false;
@@ -116,7 +116,7 @@ public sealed partial class DeviceReport
if(decodedToc is null)
{
AaruConsole.WriteLine(Localization.Core.Could_not_decode_TOC);
AaruLogging.WriteLine(Localization.Core.Could_not_decode_TOC);
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
report.GdRomSwapDiscCapabilities.TestCrashed = false;
@@ -131,7 +131,7 @@ public sealed partial class DeviceReport
if(leadOutTrack.POINT != 0xA2)
{
AaruConsole.WriteLine(Localization.Core.Cannot_find_lead_out);
AaruLogging.WriteLine(Localization.Core.Cannot_find_lead_out);
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
report.GdRomSwapDiscCapabilities.TestCrashed = false;
@@ -174,11 +174,11 @@ public sealed partial class DeviceReport
int sectors = min * 60 * 75 + sec * 75 + frame - 150;
AaruConsole.WriteLine(Localization.Core.Trap_disc_shows_0_sectors, sectors);
AaruLogging.WriteLine(Localization.Core.Trap_disc_shows_0_sectors, sectors);
if(sectors < 450000)
{
AaruConsole.WriteLine(Localization.Core.Trap_disc_doesnt_have_enough_sectors);
AaruLogging.WriteLine(Localization.Core.Trap_disc_doesnt_have_enough_sectors);
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
report.GdRomSwapDiscCapabilities.TestCrashed = false;
@@ -188,18 +188,18 @@ public sealed partial class DeviceReport
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = true;
AaruConsole.WriteLine(Localization.Core.Stopping_motor);
AaruLogging.WriteLine(Localization.Core.Stopping_motor);
_dev.StopUnit(out _, _dev.Timeout, out _);
AaruConsole.WriteLine(Localization.Core.Please_MANUALLY_get_the_trap_disc_out_and_put_the_GD_ROM_disc_inside);
AaruConsole.WriteLine(Localization.Core.Press_any_key_to_continue);
AaruLogging.WriteLine(Localization.Core.Please_MANUALLY_get_the_trap_disc_out_and_put_the_GD_ROM_disc_inside);
AaruLogging.WriteLine(Localization.Core.Press_any_key_to_continue);
Console.ReadLine();
AaruConsole.WriteLine(Localization.Core.Waiting_5_seconds);
AaruLogging.WriteLine(Localization.Core.Waiting_5_seconds);
Thread.Sleep(5000);
AaruConsole.WriteLine(Localization.Core.Sending_READ_FULL_TOC_to_the_device);
AaruLogging.WriteLine(Localization.Core.Sending_READ_FULL_TOC_to_the_device);
retries = 0;
@@ -217,8 +217,8 @@ public sealed partial class DeviceReport
if(sense)
{
AaruConsole.WriteLine(Localization.Core.READ_FULL_TOC_failed);
AaruConsole.Debug(GDROM_MODULE_NAME, "{0}", Sense.PrettifySense(senseBuffer));
AaruLogging.WriteLine(Localization.Core.READ_FULL_TOC_failed);
AaruLogging.Debug(GDROM_MODULE_NAME, "{0}", Sense.PrettifySense(senseBuffer));
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
report.GdRomSwapDiscCapabilities.TestCrashed = false;
@@ -230,7 +230,7 @@ public sealed partial class DeviceReport
if(decodedToc is null)
{
AaruConsole.WriteLine(Localization.Core.Could_not_decode_TOC);
AaruLogging.WriteLine(Localization.Core.Could_not_decode_TOC);
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
report.GdRomSwapDiscCapabilities.TestCrashed = false;
@@ -245,7 +245,7 @@ public sealed partial class DeviceReport
if(newLeadOutTrack.POINT != 0xA2)
{
AaruConsole.WriteLine(Localization.Core.Cannot_find_lead_out);
AaruLogging.WriteLine(Localization.Core.Cannot_find_lead_out);
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
report.GdRomSwapDiscCapabilities.TestCrashed = false;
@@ -259,7 +259,7 @@ public sealed partial class DeviceReport
newLeadOutTrack.PSEC != leadOutTrack.PSEC ||
newLeadOutTrack.PFRAME != leadOutTrack.PFRAME)
{
AaruConsole.WriteLine(Localization.Core
AaruLogging.WriteLine(Localization.Core
.Lead_out_has_changed_this_drive_does_not_support_hot_swapping_discs);
report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
@@ -270,7 +270,7 @@ public sealed partial class DeviceReport
_dev.SetCdSpeed(out _, RotationalControl.PureCav, 170, 0, _dev.Timeout, out _);
AaruConsole.Write(Localization.Core.Reading_LBA_zero);
AaruLogging.Write(Localization.Core.Reading_LBA_zero);
report.GdRomSwapDiscCapabilities.Lba0Readable = !_dev.ReadCd(out byte[] lba0Buffer,
out byte[] lba0Sense,
@@ -293,11 +293,11 @@ public sealed partial class DeviceReport
report.GdRomSwapDiscCapabilities.Lba0Sense = lba0Sense;
report.GdRomSwapDiscCapabilities.Lba0DecodedSense = Sense.PrettifySense(lba0Sense);
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba0Readable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba0Readable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_zero_as_audio_scrambled);
AaruLogging.Write(Localization.Core.Reading_LBA_zero_as_audio_scrambled);
report.GdRomSwapDiscCapabilities.Lba0ScrambledReadable = !_dev.ReadCd(out byte[] lba0ScrambledBuffer,
out byte[] lba0ScrambledSense,
@@ -320,11 +320,11 @@ public sealed partial class DeviceReport
report.GdRomSwapDiscCapabilities.Lba0ScrambledSense = lba0ScrambledSense;
report.GdRomSwapDiscCapabilities.Lba0ScrambledDecodedSense = Sense.PrettifySense(lba0ScrambledSense);
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba0ScrambledReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba0ScrambledReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_100000_as_audio);
AaruLogging.Write(Localization.Core.Reading_LBA_100000_as_audio);
uint cluster = 16;
while(true)
@@ -361,11 +361,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_50000_as_audio);
AaruLogging.Write(Localization.Core.Reading_LBA_50000_as_audio);
cluster = 16;
while(true)
@@ -401,11 +401,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_450000_as_audio);
AaruLogging.Write(Localization.Core.Reading_LBA_450000_as_audio);
cluster = 16;
while(true)
@@ -442,11 +442,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_400000_as_audio);
AaruLogging.Write(Localization.Core.Reading_LBA_400000_as_audio);
cluster = 16;
while(true)
@@ -483,11 +483,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_45000_as_audio);
AaruLogging.Write(Localization.Core.Reading_LBA_45000_as_audio);
cluster = 16;
while(true)
@@ -523,11 +523,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_44990_as_audio);
AaruLogging.Write(Localization.Core.Reading_LBA_44990_as_audio);
cluster = 16;
while(true)
@@ -563,11 +563,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_100000_as_audio_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_100000_as_audio_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -604,11 +604,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_50000_as_audio_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_50000_as_audio_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -645,11 +645,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_450000_as_audio_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_450000_as_audio_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -686,11 +686,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_400000_as_audio_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_400000_as_audio_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -727,11 +727,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_45000_as_audio_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_45000_as_audio_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -768,11 +768,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_44990_as_audio_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_44990_as_audio_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -809,11 +809,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_100000_as_audio_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_100000_as_audio_with_RW_subchannel);
cluster = 16;
while(true)
@@ -850,11 +850,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_50000_as_audio_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_50000_as_audio_with_RW_subchannel);
cluster = 16;
while(true)
@@ -891,11 +891,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_450000_as_audio_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_450000_as_audio_with_RW_subchannel);
cluster = 16;
while(true)
@@ -932,11 +932,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_400000_as_audio_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_400000_as_audio_with_RW_subchannel);
cluster = 16;
while(true)
@@ -973,11 +973,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_45000_as_audio_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_45000_as_audio_with_RW_subchannel);
cluster = 16;
while(true)
@@ -1014,11 +1014,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_44990_as_audio_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_44990_as_audio_with_RW_subchannel);
cluster = 16;
while(true)
@@ -1055,11 +1055,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_100000);
AaruLogging.Write(Localization.Core.Reading_LBA_100000);
cluster = 16;
while(true)
@@ -1093,11 +1093,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000Readable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000Readable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_50000);
AaruLogging.Write(Localization.Core.Reading_LBA_50000);
cluster = 16;
while(true)
@@ -1131,11 +1131,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000Readable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000Readable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_450000);
AaruLogging.Write(Localization.Core.Reading_LBA_450000);
cluster = 16;
while(true)
@@ -1169,11 +1169,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000Readable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000Readable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_400000);
AaruLogging.Write(Localization.Core.Reading_LBA_400000);
cluster = 16;
while(true)
@@ -1207,11 +1207,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000Readable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000Readable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_45000);
AaruLogging.Write(Localization.Core.Reading_LBA_45000);
cluster = 16;
while(true)
@@ -1245,11 +1245,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000Readable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000Readable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_44990);
AaruLogging.Write(Localization.Core.Reading_LBA_44990);
cluster = 16;
while(true)
@@ -1283,11 +1283,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990Readable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990Readable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_100000_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_100000_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -1321,11 +1321,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000PqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000PqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_50000_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_50000_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -1359,11 +1359,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000PqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000PqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_450000_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_450000_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -1397,11 +1397,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000PqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000PqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_400000_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_400000_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -1435,11 +1435,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000PqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000PqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_45000_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_45000_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -1473,11 +1473,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000PqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000PqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_44990_with_PQ_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_44990_with_PQ_subchannel);
cluster = 16;
while(true)
@@ -1511,11 +1511,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990PqReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990PqReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_100000_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_100000_with_RW_subchannel);
cluster = 16;
while(true)
@@ -1549,11 +1549,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000RwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000RwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_50000_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_50000_with_RW_subchannel);
cluster = 16;
while(true)
@@ -1587,11 +1587,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000RwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000RwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_450000_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_450000_with_RW_subchannel);
cluster = 16;
while(true)
@@ -1625,11 +1625,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000RwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000RwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_400000_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_400000_with_RW_subchannel);
cluster = 16;
while(true)
@@ -1663,11 +1663,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000RwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000RwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_45000_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_45000_with_RW_subchannel);
cluster = 16;
while(true)
@@ -1701,11 +1701,11 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000RwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000RwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
AaruConsole.Write(Localization.Core.Reading_LBA_44990_with_RW_subchannel);
AaruLogging.Write(Localization.Core.Reading_LBA_44990_with_RW_subchannel);
cluster = 16;
while(true)
@@ -1739,7 +1739,7 @@ public sealed partial class DeviceReport
cluster /= 2;
}
AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990RwReadable
AaruLogging.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990RwReadable
? Localization.Core.Success
: Localization.Core.FAIL);
@@ -1759,10 +1759,10 @@ public sealed partial class DeviceReport
while(pressedKey.Key != ConsoleKey.Y && pressedKey.Key != ConsoleKey.N)
{
AaruConsole.Write(Localization.Core.Test_read_whole_high_density_area_proceed_Q);
AaruLogging.Write(Localization.Core.Test_read_whole_high_density_area_proceed_Q);
pressedKey = Console.ReadKey();
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
if(pressedKey.Key == ConsoleKey.N) return;
@@ -1898,20 +1898,20 @@ public sealed partial class DeviceReport
byte[] lastSuccessfulRw = null;
bool trackModeChange = false;
AaruConsole.WriteLine();
AaruLogging.WriteLine();
for(uint lba = startingSector; lba < sectors; lba += cluster)
{
if(aborted)
{
AaruConsole.WriteLine();
AaruConsole.WriteLine(Localization.Core.Aborted);
AaruLogging.WriteLine();
AaruLogging.WriteLine(Localization.Core.Aborted);
break;
}
AaruConsole.Write("\r");
AaruConsole.Write(Localization.Core.Reading_LBA_0_of_1, lba, sectors);
AaruLogging.Write("\r");
AaruLogging.Write(Localization.Core.Reading_LBA_0_of_1, lba, sectors);
sense = readAsAudio
? _dev.ReadCd(out buffer,
@@ -1978,7 +1978,7 @@ public sealed partial class DeviceReport
report.GdRomSwapDiscCapabilities.MaximumReadableSectorInHdArea = lba + cluster - 1;
}
AaruConsole.WriteLine();
AaruLogging.WriteLine();
report.GdRomSwapDiscCapabilities.MaximumReadablePqInHdArea = lastSuccessfulPq;
report.GdRomSwapDiscCapabilities.MaximumReadableRwInHdArea = lastSuccessfulRw;

160
Aaru.Core/Devices/Report/MMC.cs
View File

@@ -674,7 +674,7 @@ public sealed partial class DeviceReport
!_dev.ReadTocPmaAtip(out buffer, out senseBuffer, false, 0, 0, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadTOC);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadTOC);
mediaTest.TocData = buffer;
Spectre.ProgressSingleSpinner(ctx =>
@@ -683,7 +683,7 @@ public sealed partial class DeviceReport
mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadFullTOC);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadFullTOC);
mediaTest.FullTocData = buffer;
}
@@ -696,7 +696,7 @@ public sealed partial class DeviceReport
mediaTest.CanReadATIP = !_dev.ReadAtip(out buffer, out senseBuffer, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadATIP);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadATIP);
mediaTest.AtipData = buffer;
@@ -706,7 +706,7 @@ public sealed partial class DeviceReport
mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPMA);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPMA);
mediaTest.PmaData = buffer;
}
@@ -731,7 +731,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPFI);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPFI);
mediaTest.PfiData = buffer;
@@ -750,7 +750,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDMI);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDMI);
mediaTest.DmiData = buffer;
}
@@ -772,7 +772,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadCMI);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadCMI);
mediaTest.CmiData = buffer;
}
@@ -796,7 +796,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
mediaTest.DvdBcaData = buffer;
@@ -815,7 +815,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadAACS);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadAACS);
mediaTest.DvdAacsData = buffer;
@@ -837,7 +837,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
mediaTest.DvdBcaData = buffer;
@@ -856,7 +856,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPFI);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPFI);
mediaTest.PfiData = buffer;
@@ -875,7 +875,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDMI);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDMI);
mediaTest.DmiData = buffer;
@@ -902,7 +902,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
mediaTest.BluBcaData = buffer;
@@ -926,7 +926,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDDS);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDDS);
mediaTest.DvdDdsData = buffer;
@@ -946,7 +946,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadSpareAreaInformation);
@@ -972,7 +972,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDDS);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDDS);
mediaTest.BluDdsData = buffer;
@@ -992,7 +992,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadSpareAreaInformation);
@@ -1016,7 +1016,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPRI);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPRI);
mediaTest.PriData = buffer;
}
@@ -1038,7 +1038,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadMediaID);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadMediaID);
Spectre.ProgressSingleSpinner(ctx =>
{
@@ -1055,7 +1055,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadRecordablePFI);
@@ -1079,7 +1079,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadADIP);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadADIP);
mediaTest.AdipData = buffer;
@@ -1098,7 +1098,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDCB);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDCB);
mediaTest.DcbData = buffer;
}
@@ -1120,7 +1120,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadHDCMI);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadHDCMI);
mediaTest.HdCmiData = buffer;
}
@@ -1142,7 +1142,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadLayerCapacity);
@@ -1172,7 +1172,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadDiscInformation);
@@ -1193,7 +1193,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPAC);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPAC);
mediaTest.BluPacData = buffer;
}
@@ -1233,7 +1233,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 512, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
mediaTest.Read6Data = buffer;
@@ -1256,7 +1256,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
mediaTest.Read10Data = buffer;
@@ -1280,7 +1280,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
mediaTest.Read12Data = buffer;
@@ -1303,7 +1303,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
mediaTest.Read16Data = buffer;
}
@@ -1315,7 +1315,7 @@ public sealed partial class DeviceReport
mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 2048, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
mediaTest.Read6Data = buffer;
@@ -1338,7 +1338,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
mediaTest.Read10Data = buffer;
@@ -1362,7 +1362,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
mediaTest.Read12Data = buffer;
@@ -1385,7 +1385,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
mediaTest.Read16Data = buffer;
}
@@ -1418,7 +1418,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsReadCd);
@@ -1445,7 +1445,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsReadCdMsf);
@@ -1475,7 +1475,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsReadCd);
@@ -1502,7 +1502,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsReadCdMsf);
@@ -1530,7 +1530,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsReadCdRaw);
@@ -1557,7 +1557,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsReadCdMsfRaw);
@@ -1614,7 +1614,7 @@ public sealed partial class DeviceReport
// ReSharper restore IntVariableOverflowInUncheckedContext
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, sense);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, sense);
mediaTest.Track1PregapData = buffer;
@@ -1676,7 +1676,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, sense);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, sense);
mediaTest.LeadInData = buffer;
@@ -1734,7 +1734,7 @@ public sealed partial class DeviceReport
}
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadLeadOut);
@@ -1789,7 +1789,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadC2Pointers);
@@ -1818,7 +1818,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadPQSubchannel);
@@ -1841,7 +1841,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadRWSubchannel);
@@ -1869,7 +1869,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadCorrectedSubchannel);
@@ -1927,7 +1927,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadPQSubchannelWithC2);
@@ -1970,7 +1970,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadRWSubchannelWithC2);
@@ -2013,7 +2013,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadCorrectedSubchannelWithC2);
@@ -2069,7 +2069,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadC2Pointers);
@@ -2098,7 +2098,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadPQSubchannel);
@@ -2121,7 +2121,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadRWSubchannel);
@@ -2149,7 +2149,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadCorrectedSubchannel);
@@ -2206,7 +2206,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadPQSubchannelWithC2);
@@ -2249,7 +2249,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadRWSubchannelWithC2);
@@ -2297,7 +2297,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadCorrectedSubchannelWithC2);
@@ -2354,7 +2354,7 @@ public sealed partial class DeviceReport
}
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadC2Pointers);
@@ -2382,7 +2382,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadPQSubchannel);
@@ -2405,7 +2405,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadRWSubchannel);
@@ -2433,7 +2433,7 @@ public sealed partial class DeviceReport
_dev.Timeout,
out _);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadCorrectedSubchannel);
@@ -2490,7 +2490,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadPQSubchannelWithC2);
@@ -2533,7 +2533,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadRWSubchannelWithC2);
@@ -2576,7 +2576,7 @@ public sealed partial class DeviceReport
out _);
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadCorrectedSubchannelWithC2);
@@ -2602,7 +2602,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsPlextorReadCDDA);
@@ -2626,7 +2626,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsPioneerReadCDDA);
@@ -2647,7 +2647,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsPioneerReadCDDAMSF);
@@ -2664,7 +2664,7 @@ public sealed partial class DeviceReport
!_dev.NecReadCdDa(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsNECReadCDDA);
@@ -2727,7 +2727,7 @@ public sealed partial class DeviceReport
!_dev.PlextorReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsPlextorReadRawDVD);
@@ -2747,7 +2747,7 @@ public sealed partial class DeviceReport
!_dev.HlDtStReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _, 0xffff, false);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsHLDTSTReadRawDVD);
@@ -2767,7 +2767,7 @@ public sealed partial class DeviceReport
!_dev.LiteOnReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _, 0xffff, false);
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.SupportsLiteOnReadRawDVD);
@@ -2882,7 +2882,7 @@ public sealed partial class DeviceReport
mediaTest.ReadF1_06Data = mediaTest.CanReadF1_06 == true ? buffer : senseBuffer;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadF1_06);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadF1_06);
});
Spectre.ProgressSingleSpinner(ctx =>
@@ -3035,7 +3035,7 @@ public sealed partial class DeviceReport
mediaTest.ReadF1_06LeadOutData = senseBuffer;
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadF1_06LeadOut);
});
@@ -3050,7 +3050,7 @@ public sealed partial class DeviceReport
mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadFullTOC);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadFullTOC);
mediaTest.FullTocData = buffer;
@@ -3066,7 +3066,7 @@ public sealed partial class DeviceReport
if(!decodedToc.TrackDescriptors.Any(t => t.SessionNumber > 1))
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.Could_not_find_second_session_Have_you_inserted_the_correct_type_of_disc);
return null;
@@ -3080,19 +3080,19 @@ public sealed partial class DeviceReport
if(firstSessionLeadOutTrack.SessionNumber == 0 || secondSessionFirstTrack.SessionNumber == 0)
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.Could_not_find_second_session_Have_you_inserted_the_correct_type_of_disc);
return null;
}
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.First_session_Lead_Out_starts_at_0_1_2,
firstSessionLeadOutTrack.PMIN,
firstSessionLeadOutTrack.PSEC,
firstSessionLeadOutTrack.PFRAME);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Second_session_starts_at_0_1_2,
secondSessionFirstTrack.PMIN,
secondSessionFirstTrack.PSEC,
@@ -3171,7 +3171,7 @@ public sealed partial class DeviceReport
}
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadingIntersessionLeadOut);
@@ -3238,7 +3238,7 @@ public sealed partial class DeviceReport
}
});
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.Core.Sense_equals_0,
!mediaTest.CanReadingIntersessionLeadIn);

16
Aaru.Core/Devices/Report/Scsi.cs
View File

@@ -600,7 +600,7 @@ public sealed partial class DeviceReport
!_dev.Read6(out buffer, out senseBuffer, 0, mediaTest.BlockSize ?? 512, _dev.Timeout, out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
mediaTest.Read6Data = buffer;
Spectre.ProgressSingleSpinner(ctx =>
@@ -622,7 +622,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
mediaTest.Read10Data = buffer;
Spectre.ProgressSingleSpinner(ctx =>
@@ -645,7 +645,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
mediaTest.Read12Data = buffer;
Spectre.ProgressSingleSpinner(ctx =>
@@ -667,7 +667,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
mediaTest.Read16Data = buffer;
mediaTest.LongBlockSize = mediaTest.BlockSize;
@@ -981,7 +981,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead6);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead6);
capabilities.Read6Data = buffer;
Spectre.ProgressSingleSpinner(ctx =>
@@ -1003,7 +1003,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead10);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead10);
capabilities.Read10Data = buffer;
Spectre.ProgressSingleSpinner(ctx =>
@@ -1026,7 +1026,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead12);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead12);
capabilities.Read12Data = buffer;
Spectre.ProgressSingleSpinner(ctx =>
@@ -1048,7 +1048,7 @@ public sealed partial class DeviceReport
out _);
});
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead16);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead16);
capabilities.Read16Data = buffer;
capabilities.LongBlockSize = capabilities.BlockSize;

20
Aaru.Core/Devices/Report/SecureDigital.cs
View File

@@ -58,7 +58,7 @@ public sealed partial class DeviceReport
if(!sense)
{
AaruConsole.WriteLine(Localization.Core.CID_obtained_correctly);
AaruLogging.WriteLine(Localization.Core.CID_obtained_correctly);
switch(_dev.Type)
{
@@ -86,7 +86,7 @@ public sealed partial class DeviceReport
report.CID = cid;
}
else
AaruConsole.WriteLine(Localization.Core.Could_not_read_CID);
AaruLogging.WriteLine(Localization.Core.Could_not_read_CID);
Spectre.ProgressSingleSpinner(ctx =>
{
@@ -96,11 +96,11 @@ public sealed partial class DeviceReport
if(!sense)
{
AaruConsole.WriteLine(Localization.Core.CSD_obtained_correctly);
AaruLogging.WriteLine(Localization.Core.CSD_obtained_correctly);
report.CSD = csd;
}
else
AaruConsole.WriteLine(Localization.Core.Could_not_read_CSD);
AaruLogging.WriteLine(Localization.Core.Could_not_read_CSD);
sense = true;
byte[] ocr = null;
@@ -119,11 +119,11 @@ public sealed partial class DeviceReport
if(!sense)
{
AaruConsole.WriteLine(Localization.Core.OCR_obtained_correctly);
AaruLogging.WriteLine(Localization.Core.OCR_obtained_correctly);
report.OCR = ocr;
}
else
AaruConsole.WriteLine(Localization.Core.Could_not_read_OCR);
AaruLogging.WriteLine(Localization.Core.Could_not_read_OCR);
switch(_dev.Type)
{
@@ -137,11 +137,11 @@ public sealed partial class DeviceReport
if(!sense)
{
AaruConsole.WriteLine(Localization.Core.Extended_CSD_obtained_correctly);
AaruLogging.WriteLine(Localization.Core.Extended_CSD_obtained_correctly);
report.ExtendedCSD = ecsd;
}
else
AaruConsole.WriteLine(Localization.Core.Could_not_read_Extended_CSD);
AaruLogging.WriteLine(Localization.Core.Could_not_read_Extended_CSD);
break;
}
@@ -155,11 +155,11 @@ public sealed partial class DeviceReport
if(!sense)
{
AaruConsole.WriteLine(Localization.Core.SCR_obtained_correctly);
AaruLogging.WriteLine(Localization.Core.SCR_obtained_correctly);
report.SCR = scr;
}
else
AaruConsole.WriteLine(Localization.Core.Could_not_read_SCR);
AaruLogging.WriteLine(Localization.Core.Could_not_read_SCR);
break;
}

2
Aaru.Core/Devices/Scanning/SCSI.cs
View File

@@ -453,7 +453,7 @@ public sealed partial class MediaScan
if(readcd)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_CD_error_0,
Sense.PrettifySense(senseBuf));

20
Aaru.Core/Entropy.cs
View File

@@ -84,7 +84,7 @@ public sealed class Entropy
if(_inputFormat is not IOpticalMediaImage opticalMediaImage)
{
AaruConsole.Error(Localization.Core.The_selected_image_does_not_support_tracks);
AaruLogging.Error(Localization.Core.The_selected_image_does_not_support_tracks);
return entropyResults.ToArray();
}
@@ -115,7 +115,7 @@ public sealed class Entropy
trackEntropy.Sectors = currentTrack.EndSector - currentTrack.StartSector + 1;
AaruConsole.Verbose(Localization.Core.Track_0_has_1_sectors,
AaruLogging.Verbose(Localization.Core.Track_0_has_1_sectors,
currentTrack.Sequence,
trackEntropy.Sectors);
@@ -133,7 +133,7 @@ public sealed class Entropy
if(errno != ErrorNumber.NoError)
{
AaruConsole.Error(string.Format(Localization.Core
AaruLogging.Error(string.Format(Localization.Core
.Error_0_while_reading_sector_1_continuing,
errno,
i));
@@ -170,12 +170,12 @@ public sealed class Entropy
{
if(_debug)
{
AaruConsole.Debug(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
AaruConsole.Exception(ex);
AaruLogging.Debug(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
AaruLogging.Exception(ex);
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.Unable_to_get_separate_tracks_not_calculating_their_entropy);
}
}
@@ -200,7 +200,7 @@ public sealed class Entropy
List<string> uniqueSectors = [];
entropy.Sectors = mediaImage.Info.Sectors;
AaruConsole.WriteLine(Localization.Core.Sectors_0, entropy.Sectors);
AaruLogging.WriteLine(Localization.Core.Sectors_0, entropy.Sectors);
InitProgressEvent?.Invoke();
for(ulong i = 0; i < entropy.Sectors; i++)
@@ -213,7 +213,7 @@ public sealed class Entropy
if(errno != ErrorNumber.NoError)
{
AaruConsole.Error(string.Format(Localization.Core.Error_0_while_reading_sector_1_continuing,
AaruLogging.Error(string.Format(Localization.Core.Error_0_while_reading_sector_1_continuing,
errno,
i));
@@ -258,14 +258,14 @@ public sealed class Entropy
byte[] data = new byte[byteAddressableImage.Info.Sectors];
entropy.Sectors = _inputFormat.Info.Sectors;
AaruConsole.WriteLine(Localization.Core._0_bytes, entropy.Sectors);
AaruLogging.WriteLine(Localization.Core._0_bytes, entropy.Sectors);
InitProgressEvent?.Invoke();
ErrorNumber errno = byteAddressableImage.ReadBytes(data, 0, data.Length, out int bytesRead);
if(errno != ErrorNumber.NoError)
{
AaruConsole.Error(string.Format(Localization.Core.Error_0_while_reading_data__not_continuing,
AaruLogging.Error(string.Format(Localization.Core.Error_0_while_reading_data__not_continuing,
errno));
return entropy;

4
Aaru.Core/Filesystems.cs
View File

@@ -66,11 +66,11 @@ public static class Filesystems
}
catch(Exception ex)
{
AaruConsole
AaruLogging
.Error("Error identifying filesystem {0}. Please open a report with the following line in a Github issue.",
plugin.Name);
AaruConsole.Exception(ex);
AaruLogging.Exception(ex);
}
}
}

6
Aaru.Core/ImageFormat.cs
View File

@@ -62,7 +62,7 @@ public static class ImageFormat
try
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
if(!imagePlugin.Identify(imageFilter)) continue;
@@ -88,7 +88,7 @@ public static class ImageFormat
if(imagePlugin.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000")) continue;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
if(!imagePlugin.Identify(imageFilter)) continue;
@@ -114,7 +114,7 @@ public static class ImageFormat
try
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
if(!imagePlugin.Identify(imageFilter)) continue;

260
Aaru.Core/ImageInfo.cs
View File

@@ -71,127 +71,127 @@ public static class ImageInfo
/// <param name="imageFormat">Media image</param>
public static void PrintImageInfo(IBaseImage imageFormat)
{
AaruConsole.WriteLine(Localization.Core.Image_information_WithMarkup);
AaruLogging.WriteLine(Localization.Core.Image_information_WithMarkup);
if(!string.IsNullOrWhiteSpace(imageFormat.Info.Version))
{
AaruConsole.WriteLine(Localization.Core.Format_0_version_1_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Format_0_version_1_WithMarkup,
Markup.Escape(imageFormat.Format),
Markup.Escape(imageFormat.Info.Version));
}
else
AaruConsole.WriteLine(Localization.Core.Format_0_WithMarkup, Markup.Escape(imageFormat.Format));
AaruLogging.WriteLine(Localization.Core.Format_0_WithMarkup, Markup.Escape(imageFormat.Format));
switch(string.IsNullOrWhiteSpace(imageFormat.Info.Application))
{
case false when !string.IsNullOrWhiteSpace(imageFormat.Info.ApplicationVersion):
AaruConsole.WriteLine(Localization.Core.Was_created_with_0_version_1_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Was_created_with_0_version_1_WithMarkup,
Markup.Escape(imageFormat.Info.Application),
Markup.Escape(imageFormat.Info.ApplicationVersion));
break;
case false:
AaruConsole.WriteLine(Localization.Core.Was_created_with_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Was_created_with_0_WithMarkup,
Markup.Escape(imageFormat.Info.Application));
break;
}
AaruConsole.WriteLine(Localization.Core.Image_without_headers_is_0_bytes_long, imageFormat.Info.ImageSize);
AaruLogging.WriteLine(Localization.Core.Image_without_headers_is_0_bytes_long, imageFormat.Info.ImageSize);
AaruConsole.WriteLine(Localization.Core.Contains_a_media_of_0_sectors_with_a_maximum_sector_size_of_1_bytes_etc,
AaruLogging.WriteLine(Localization.Core.Contains_a_media_of_0_sectors_with_a_maximum_sector_size_of_1_bytes_etc,
imageFormat.Info.Sectors,
imageFormat.Info.SectorSize,
ByteSize.FromBytes(imageFormat.Info.Sectors * imageFormat.Info.SectorSize).Humanize());
if(!string.IsNullOrWhiteSpace(imageFormat.Info.Creator))
AaruConsole.WriteLine(Localization.Core.Created_by_0_WithMarkup, Markup.Escape(imageFormat.Info.Creator));
AaruLogging.WriteLine(Localization.Core.Created_by_0_WithMarkup, Markup.Escape(imageFormat.Info.Creator));
if(imageFormat.Info.CreationTime != DateTime.MinValue)
AaruConsole.WriteLine(Localization.Core.Created_on_0, imageFormat.Info.CreationTime);
AaruLogging.WriteLine(Localization.Core.Created_on_0, imageFormat.Info.CreationTime);
if(imageFormat.Info.LastModificationTime != DateTime.MinValue)
AaruConsole.WriteLine(Localization.Core.Last_modified_on_0, imageFormat.Info.LastModificationTime);
AaruLogging.WriteLine(Localization.Core.Last_modified_on_0, imageFormat.Info.LastModificationTime);
AaruConsole.WriteLine(Localization.Core.Contains_a_media_of_type_0_and_XML_type_1_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Contains_a_media_of_type_0_and_XML_type_1_WithMarkup,
imageFormat.Info.MediaType,
imageFormat.Info.MetadataMediaType);
AaruConsole.WriteLine(imageFormat.Info.HasPartitions
AaruLogging.WriteLine(imageFormat.Info.HasPartitions
? Localization.Core.Has_partitions
: Localization.Core.Doesnt_have_partitions);
AaruConsole.WriteLine(imageFormat.Info.HasSessions
AaruLogging.WriteLine(imageFormat.Info.HasSessions
? Localization.Core.Has_sessions
: Localization.Core.Doesnt_have_sessions);
if(!string.IsNullOrWhiteSpace(imageFormat.Info.Comments))
AaruConsole.WriteLine(Localization.Core.Comments_0_WithMarkup, Markup.Escape(imageFormat.Info.Comments));
AaruLogging.WriteLine(Localization.Core.Comments_0_WithMarkup, Markup.Escape(imageFormat.Info.Comments));
if(imageFormat.Info.MediaSequence != 0 && imageFormat.Info.LastMediaSequence != 0)
{
AaruConsole.WriteLine(Localization.Core.Media_is_number_0_on_a_set_of_1_medias,
AaruLogging.WriteLine(Localization.Core.Media_is_number_0_on_a_set_of_1_medias,
imageFormat.Info.MediaSequence,
imageFormat.Info.LastMediaSequence);
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaTitle))
{
AaruConsole.WriteLine(Localization.Core.Media_title_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Media_title_0_WithMarkup,
Markup.Escape(imageFormat.Info.MediaTitle));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaManufacturer))
{
AaruConsole.WriteLine(Localization.Core.Media_manufacturer_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Media_manufacturer_0_WithMarkup,
Markup.Escape(imageFormat.Info.MediaManufacturer));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaModel))
{
AaruConsole.WriteLine(Localization.Core.Media_model_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Media_model_0_WithMarkup,
Markup.Escape(imageFormat.Info.MediaModel));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaSerialNumber))
{
AaruConsole.WriteLine(Localization.Core.Media_serial_number_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Media_serial_number_0_WithMarkup,
Markup.Escape(imageFormat.Info.MediaSerialNumber));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaBarcode))
{
AaruConsole.WriteLine(Localization.Core.Media_barcode_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Media_barcode_0_WithMarkup,
Markup.Escape(imageFormat.Info.MediaBarcode));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaPartNumber))
{
AaruConsole.WriteLine(Localization.Core.Media_part_number_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Media_part_number_0_WithMarkup,
Markup.Escape(imageFormat.Info.MediaPartNumber));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveManufacturer))
{
AaruConsole.WriteLine(Localization.Core.Drive_manufacturer_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Drive_manufacturer_0_WithMarkup,
Markup.Escape(imageFormat.Info.DriveManufacturer));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveModel))
{
AaruConsole.WriteLine(Localization.Core.Drive_model_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Drive_model_0_WithMarkup,
Markup.Escape(imageFormat.Info.DriveModel));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveSerialNumber))
{
AaruConsole.WriteLine(Localization.Core.Drive_serial_number_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Drive_serial_number_0_WithMarkup,
Markup.Escape(imageFormat.Info.DriveSerialNumber));
}
if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveFirmwareRevision))
{
AaruConsole.WriteLine(Localization.Core.Drive_firmware_info_0_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Drive_firmware_info_0_WithMarkup,
Markup.Escape(imageFormat.Info.DriveFirmwareRevision));
}
@@ -200,7 +200,7 @@ public static class ImageInfo
imageFormat.Info.MetadataMediaType != MetadataMediaType.OpticalDisc &&
imageFormat is not ITapeImage { IsTape: true })
{
AaruConsole.WriteLine(Localization.Core.Media_geometry_0_cylinders_1_heads_2_sectors_per_track_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Media_geometry_0_cylinders_1_heads_2_sectors_per_track_WithMarkup,
imageFormat.Info.Cylinders,
imageFormat.Info.Heads,
imageFormat.Info.SectorsPerTrack);
@@ -208,27 +208,27 @@ public static class ImageInfo
if(imageFormat.Info.ReadableMediaTags is { Count: > 0 })
{
AaruConsole.WriteLine(Localization.Core.Contains_0_readable_media_tags_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Contains_0_readable_media_tags_WithMarkup,
imageFormat.Info.ReadableMediaTags.Count);
foreach(MediaTagType tag in imageFormat.Info.ReadableMediaTags.OrderBy(t => t))
AaruConsole.Write("[italic]{0}[/] ", Markup.Escape(tag.ToString()));
AaruLogging.Write("[italic]{0}[/] ", Markup.Escape(tag.ToString()));
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
if(imageFormat.Info.ReadableSectorTags is { Count: > 0 })
{
AaruConsole.WriteLine(Localization.Core.Contains_0_readable_sector_tags_WithMarkup,
AaruLogging.WriteLine(Localization.Core.Contains_0_readable_sector_tags_WithMarkup,
imageFormat.Info.ReadableSectorTags.Count);
foreach(SectorTagType tag in imageFormat.Info.ReadableSectorTags.OrderBy(t => t))
AaruConsole.Write("[italic]{0}[/] ", tag);
AaruLogging.Write("[italic]{0}[/] ", tag);
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
AaruConsole.WriteLine();
AaruLogging.WriteLine();
if(imageFormat.Info.MetadataMediaType == MetadataMediaType.LinearMedia)
PrintByteAddressableImageInfo(imageFormat as IByteAddressableImage);
@@ -296,7 +296,7 @@ public static class ImageInfo
}
}
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
static void PrintByteAddressableImageInfo(IByteAddressableImage imageFormat)
@@ -305,9 +305,9 @@ public static class ImageInfo
if(errno != ErrorNumber.NoError) return;
AaruConsole.WriteLine(Localization.Core.Mapping_WithMarkup);
AaruLogging.WriteLine(Localization.Core.Mapping_WithMarkup);
AaruConsole.WriteLine("{0}",
AaruLogging.WriteLine("{0}",
Markup.Escape(JsonSerializer.Serialize(mappings,
new JsonSerializerOptions
{
@@ -341,9 +341,9 @@ public static class ImageInfo
Array.Copy(inquiry, 8, scsiVendorId, 0, 8);
}
AaruConsole.WriteLine(Localization.Core.SCSI_INQUIRY_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Inquiry.Prettify(inquiry));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.SCSI_INQUIRY_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Inquiry.Prettify(inquiry));
AaruLogging.WriteLine();
}
}
@@ -354,9 +354,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.ATA_IDENTIFY_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Identify.Prettify(identify));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.ATA_IDENTIFY_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Identify.Prettify(identify));
AaruLogging.WriteLine();
}
}
@@ -367,9 +367,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.ATAPI_IDENTIFY_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Identify.Prettify(identify));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.ATAPI_IDENTIFY_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Identify.Prettify(identify));
AaruLogging.WriteLine();
}
}
@@ -384,9 +384,9 @@ public static class ImageInfo
if(decMode.HasValue)
{
AaruConsole.WriteLine(Localization.Core.SCSI_MODE_SENSE_10_contained_in_image_WithMarkup);
AaruLogging.WriteLine(Localization.Core.SCSI_MODE_SENSE_10_contained_in_image_WithMarkup);
PrintScsiModePages.Print(decMode.Value, scsiDeviceType, scsiVendorId);
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
}
}
@@ -400,9 +400,9 @@ public static class ImageInfo
if(decMode.HasValue)
{
AaruConsole.WriteLine(Localization.Core.SCSI_MODE_SENSE_6_contained_in_image_WithMarkup);
AaruLogging.WriteLine(Localization.Core.SCSI_MODE_SENSE_6_contained_in_image_WithMarkup);
PrintScsiModePages.Print(decMode.Value, scsiDeviceType, scsiVendorId);
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
}
}
@@ -412,8 +412,8 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.Write("{0}", Modes.PrettifyModePage_2A(mode2A));
AaruConsole.WriteLine();
AaruLogging.Write("{0}", Modes.PrettifyModePage_2A(mode2A));
AaruLogging.WriteLine();
}
}
@@ -434,9 +434,9 @@ public static class ImageInfo
toc = tmp;
}
AaruConsole.WriteLine(Localization.Core.CompactDisc_Table_of_Contents_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", FullTOC.Prettify(toc));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.CompactDisc_Table_of_Contents_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", FullTOC.Prettify(toc));
AaruLogging.WriteLine();
}
}
@@ -457,11 +457,11 @@ public static class ImageInfo
pma = tmp;
}
AaruConsole.WriteLine(Localization.Core
AaruLogging.WriteLine(Localization.Core
.CompactDisc_Power_Management_Area_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", PMA.Prettify(pma));
AaruConsole.WriteLine();
AaruLogging.Write("{0}", PMA.Prettify(pma));
AaruLogging.WriteLine();
}
}
@@ -484,11 +484,11 @@ public static class ImageInfo
atip = tmp;
}
AaruConsole.WriteLine(Localization.Core
AaruLogging.WriteLine(Localization.Core
.CompactDisc_Absolute_Time_In_Pregroove_ATIP_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", ATIP.Prettify(atip));
AaruConsole.WriteLine();
AaruLogging.Write("{0}", ATIP.Prettify(atip));
AaruLogging.WriteLine();
}
}
@@ -511,9 +511,9 @@ public static class ImageInfo
cdtext = tmp;
}
AaruConsole.WriteLine(Localization.Core.CompactDisc_Lead_in_CD_Text_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", CDTextOnLeadIn.Prettify(cdtext));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.CompactDisc_Lead_in_CD_Text_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", CDTextOnLeadIn.Prettify(cdtext));
AaruLogging.WriteLine();
}
}
@@ -523,11 +523,11 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core
AaruLogging.WriteLine(Localization.Core
.CompactDisc_Media_Catalogue_Number_contained_in_image_0_WithMarkup,
Encoding.UTF8.GetString(mcn));
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
}
@@ -537,9 +537,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.DVD_RW_Pre_Recorded_Information_WithMarkup);
AaruConsole.Write("{0}", PRI.Prettify(pri));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.DVD_RW_Pre_Recorded_Information_WithMarkup);
AaruLogging.Write("{0}", PRI.Prettify(pri));
AaruLogging.WriteLine();
}
}
@@ -549,9 +549,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.DVD_Physical_Format_Information_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", PFI.Prettify(pfi, imageFormat.Info.MediaType));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.DVD_Physical_Format_Information_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", PFI.Prettify(pfi, imageFormat.Info.MediaType));
AaruLogging.WriteLine();
}
}
@@ -561,11 +561,11 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core
AaruLogging.WriteLine(Localization.Core
.DVD_RAM_Disc_Definition_Structure_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", DDS.Prettify(dds));
AaruConsole.WriteLine();
AaruLogging.Write("{0}", DDS.Prettify(dds));
AaruLogging.WriteLine();
}
}
@@ -575,11 +575,11 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core
AaruLogging.WriteLine(Localization.Core
.DVD_R_Physical_Format_Information_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", PFI.Prettify(pfi, imageFormat.Info.MediaType));
AaruConsole.WriteLine();
AaruLogging.Write("{0}", PFI.Prettify(pfi, imageFormat.Info.MediaType));
AaruLogging.WriteLine();
}
}
@@ -589,9 +589,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.Bluray_Disc_Information_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", DI.Prettify(di));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.Bluray_Disc_Information_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", DI.Prettify(di));
AaruLogging.WriteLine();
}
}
@@ -601,9 +601,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.Bluray_Disc_Definition_Structure_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.Bluray.DDS.Prettify(dds));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.Bluray_Disc_Definition_Structure_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.Bluray.DDS.Prettify(dds));
AaruLogging.WriteLine();
}
}
@@ -613,7 +613,7 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.PCMCIA_CIS_WithMarkup);
AaruLogging.WriteLine(Localization.Core.PCMCIA_CIS_WithMarkup);
Tuple[] tuples = CIS.GetTuples(cis);
if(tuples != null)
@@ -627,15 +627,15 @@ public static class ImageInfo
break;
case TupleCodes.CISTPL_DEVICEGEO:
case TupleCodes.CISTPL_DEVICEGEO_A:
AaruConsole.WriteLine("{0}", CIS.PrettifyDeviceGeometryTuple(tuple));
AaruLogging.WriteLine("{0}", CIS.PrettifyDeviceGeometryTuple(tuple));
break;
case TupleCodes.CISTPL_MANFID:
AaruConsole.WriteLine("{0}", CIS.PrettifyManufacturerIdentificationTuple(tuple));
AaruLogging.WriteLine("{0}", CIS.PrettifyManufacturerIdentificationTuple(tuple));
break;
case TupleCodes.CISTPL_VERS_1:
AaruConsole.WriteLine("{0}", CIS.PrettifyLevel1VersionTuple(tuple));
AaruLogging.WriteLine("{0}", CIS.PrettifyLevel1VersionTuple(tuple));
break;
case TupleCodes.CISTPL_ALTSTR:
@@ -672,13 +672,13 @@ public static class ImageInfo
case TupleCodes.CISTPL_SPCL:
case TupleCodes.CISTPL_SWIL:
case TupleCodes.CISTPL_VERS_2:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Invoke_Found_undecoded_tuple_ID_0,
tuple.Code);
break;
default:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_unknown_tuple_ID_0,
(byte)tuple.Code);
@@ -687,7 +687,7 @@ public static class ImageInfo
}
}
else
AaruConsole.Debug(MODULE_NAME, Localization.Core.Could_not_get_tuples);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Could_not_get_tuples);
}
}
@@ -697,9 +697,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.SecureDigital_CID_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(cid));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.SecureDigital_CID_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(cid));
AaruLogging.WriteLine();
}
}
@@ -709,9 +709,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.SecureDigital_CSD_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(csd));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.SecureDigital_CSD_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(csd));
AaruLogging.WriteLine();
}
}
@@ -721,9 +721,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.SecureDigital_SCR_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(scr));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.SecureDigital_SCR_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(scr));
AaruLogging.WriteLine();
}
}
@@ -733,9 +733,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.SecureDigital_OCR_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(ocr));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.SecureDigital_OCR_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(ocr));
AaruLogging.WriteLine();
}
}
@@ -745,9 +745,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.MultiMediaCard_CID_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyCID(cid));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.MultiMediaCard_CID_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.MMC.Decoders.PrettifyCID(cid));
AaruLogging.WriteLine();
}
}
@@ -757,9 +757,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.MultiMediaCard_CSD_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyCSD(csd));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.MultiMediaCard_CSD_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.MMC.Decoders.PrettifyCSD(csd));
AaruLogging.WriteLine();
}
}
@@ -769,9 +769,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.MultiMediaCard_Extended_CSD_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(ecsd));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.MultiMediaCard_Extended_CSD_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(ecsd));
AaruLogging.WriteLine();
}
}
@@ -781,9 +781,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.MultiMediaCard_OCR_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", Decoders.MMC.Decoders.PrettifyOCR(ocr));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.MultiMediaCard_OCR_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", Decoders.MMC.Decoders.PrettifyOCR(ocr));
AaruLogging.WriteLine();
}
}
@@ -793,9 +793,9 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.Xbox_Physical_Format_Information_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", PFI.Prettify(xpfi, imageFormat.Info.MediaType));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.Xbox_Physical_Format_Information_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", PFI.Prettify(xpfi, imageFormat.Info.MediaType));
AaruLogging.WriteLine();
}
}
@@ -811,9 +811,9 @@ public static class ImageInfo
if(xmi.HasValue)
{
AaruConsole.WriteLine(Localization.Core.Xbox_DMI_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", DMI.PrettifyXbox(xmi));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.Xbox_DMI_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", DMI.PrettifyXbox(xmi));
AaruLogging.WriteLine();
}
}
@@ -823,9 +823,9 @@ public static class ImageInfo
if(xmi.HasValue)
{
AaruConsole.WriteLine(Localization.Core.Xbox_360_DMI_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", DMI.PrettifyXbox360(xmi));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.Xbox_360_DMI_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", DMI.PrettifyXbox360(xmi));
AaruLogging.WriteLine();
}
}
}
@@ -837,13 +837,13 @@ public static class ImageInfo
if(errno == ErrorNumber.NoError)
{
AaruConsole.WriteLine(Localization.Core.Xbox_Security_Sectors_contained_in_image_WithMarkup);
AaruConsole.Write("{0}", SS.Prettify(toc));
AaruConsole.WriteLine();
AaruLogging.WriteLine(Localization.Core.Xbox_Security_Sectors_contained_in_image_WithMarkup);
AaruLogging.Write("{0}", SS.Prettify(toc));
AaruLogging.WriteLine();
}
}
if(imageFormat is IFluxImage) AaruConsole.WriteLine(Localization.Core.Image_flux_captures);
if(imageFormat is IFluxImage) AaruLogging.WriteLine(Localization.Core.Image_flux_captures);
if(imageFormat is not IOpticalMediaImage opticalImage) return;
@@ -872,7 +872,7 @@ public static class ImageInfo
}
AnsiConsole.Write(table);
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
}
catch
@@ -914,7 +914,7 @@ public static class ImageInfo
if(!opticalImage.Tracks.Any(t => t.Indexes.Any())) return;
AaruConsole.WriteLine();
AaruLogging.WriteLine();
table = new Table
{
@@ -939,7 +939,7 @@ public static class ImageInfo
}
finally
{
AaruConsole.WriteLine();
AaruLogging.WriteLine();
}
}
}

94
Aaru.Core/Media/Detection/MMC.cs
View File

@@ -270,7 +270,7 @@ public static class MMC
{
Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.GET_CONFIGURATION_current_profile_is_0,
ftr.CurrentProfile);
@@ -346,12 +346,12 @@ public static class MMC
switch(a0Track.PSEC)
{
case 0x10:
AaruConsole.Debug(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_i);
AaruLogging.Debug(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_i);
mediaType = MediaType.CDI;
break;
case 0x20:
AaruConsole.Debug(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_ROM_XA);
AaruLogging.Debug(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_ROM_XA);
mediaType = MediaType.CDROMXA;
@@ -393,7 +393,7 @@ public static class MMC
switch(hasDataTrack)
{
case true when hasAudioTrack && allFirstSessionTracksAreAudio && sessions == 2:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core
.Disc_has_audio_and_data_two_sessions_all_data_second_CD_Plus);
@@ -401,7 +401,7 @@ public static class MMC
break;
case false when hasAudioTrack && sessions == 1:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Disc_has_only_audio_in_a_session_CD_Digital_Audio);
mediaType = MediaType.CDDA;
@@ -411,14 +411,14 @@ public static class MMC
if(hasDataTrack && !hasAudioTrack && sessions == 1)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Disc_has_only_data_in_a_session_CD_ROM);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Disc_has_only_data_in_a_session_CD_ROM);
mediaType = MediaType.CDROM;
}
if(hasVideoTrack && !hasDataTrack && sessions == 1)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Disc_has_video_tracks_CD_Video);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Disc_has_video_tracks_CD_Video);
mediaType = MediaType.CDV;
}
@@ -473,7 +473,7 @@ public static class MMC
cmdBuf[15] != 0x02)
continue;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Disc_has_a_mode_two_data_track_CD_ROM_XA);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Disc_has_a_mode_two_data_track_CD_ROM_XA);
mediaType = MediaType.CDROMXA;
@@ -689,7 +689,7 @@ public static class MMC
{
mediaType = MediaType.CDIREADY;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Disc_has_hidden_CD_i_pregap_CD_i_Ready);
return;
@@ -781,7 +781,7 @@ public static class MMC
{
mediaType = MediaType.CDIREADY;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Disc_has_hidden_CD_i_pregap_CD_i_Ready);
return;
@@ -1496,7 +1496,7 @@ public static class MMC
{
if(DMI.IsXbox(cmdBuf))
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Found Xbox DMI, setting disc type to Xbox Game Disc (XGD).");
mediaType = MediaType.XGD;
@@ -1509,7 +1509,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.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 3 (XGD3).");
mediaType = MediaType.XGD3;
@@ -1517,7 +1517,7 @@ public static class MMC
return;
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 2 (XGD2).");
mediaType = MediaType.XGD2;
@@ -1760,7 +1760,7 @@ public static class MMC
case "PHOTO_CD":
mediaType = MediaType.PCD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Photo_CD_description_file);
return;
@@ -1813,7 +1813,7 @@ public static class MMC
{
mediaType = MediaType.MEGACD;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Mega_Sega_CD_IP_BIN);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_Mega_Sega_CD_IP_BIN);
return;
}
@@ -1822,7 +1822,7 @@ public static class MMC
{
mediaType = MediaType.SATURNCD;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Sega_Saturn_IP_BIN);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_Sega_Saturn_IP_BIN);
return;
}
@@ -1832,7 +1832,7 @@ public static class MMC
{
mediaType = MediaType.GDROM;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Sega_Dreamcast_IP_BIN);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_Sega_Dreamcast_IP_BIN);
return;
}
@@ -1846,7 +1846,7 @@ public static class MMC
string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.PlayStation_2_boot_sectors_SHA256_0,
ps2BootSectorsHash);
@@ -1854,7 +1854,7 @@ public static class MMC
{
mediaType = MediaType.PS2CD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Sony_PlayStation_2_boot_sectors);
goto hasPs2CdBoot;
@@ -1870,7 +1870,7 @@ public static class MMC
{
mediaType = MediaType.ThreeDO;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Opera_filesystem);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_Opera_filesystem);
return;
}
@@ -1879,7 +1879,7 @@ public static class MMC
{
mediaType = MediaType.FMTOWNS;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_FM_Towns_boot);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_FM_Towns_boot);
return;
}
@@ -1897,7 +1897,7 @@ public static class MMC
{
mediaType = MediaType.Playdia;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Playdia_copyright);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_Playdia_copyright);
return;
}
@@ -1912,7 +1912,7 @@ public static class MMC
{
mediaType = MediaType.SuperCDROM2;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_PC_Engine_CD_signature);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_PC_Engine_CD_signature);
return;
}
@@ -1927,7 +1927,7 @@ public static class MMC
{
mediaType = MediaType.PCFX;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_PC_FX_copyright);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_PC_FX_copyright);
return;
}
@@ -1945,7 +1945,7 @@ public static class MMC
mediaType = MediaType.JaguarCD;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Atari_signature);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_Atari_signature);
break;
}
@@ -1960,7 +1960,7 @@ public static class MMC
{
mediaType = MediaType.MilCD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Sega_Dreamcast_IP_BIN_on_second_session);
return;
@@ -1973,7 +1973,7 @@ public static class MMC
{
mediaType = MediaType.VideoNowColor;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_VideoNow_Color_frame);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_VideoNow_Color_frame);
return;
}
@@ -2021,7 +2021,7 @@ public static class MMC
{
mediaType = MediaType.CDEG;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_enhanced_graphics_RW_packet);
return;
@@ -2031,7 +2031,7 @@ public static class MMC
{
mediaType = MediaType.CDG;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_graphics_RW_packet);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_graphics_RW_packet);
return;
}
@@ -2040,7 +2040,7 @@ public static class MMC
{
mediaType = MediaType.CDMIDI;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_MIDI_RW_packet);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_MIDI_RW_packet);
return;
}
@@ -2227,7 +2227,7 @@ public static class MMC
{
mediaType = MediaType.CD32;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_CD32_TM_file_in_root);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_CD32_TM_file_in_root);
return;
}
@@ -2236,7 +2236,7 @@ public static class MMC
{
mediaType = MediaType.CDTV;
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_CDTV_TM_file_in_root);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_CDTV_TM_file_in_root);
return;
}
@@ -2382,7 +2382,7 @@ public static class MMC
{
mediaType = MediaType.NeoGeoCD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_correct_IPL_TXT_file_in_root);
return;
@@ -2484,21 +2484,21 @@ public static class MMC
case "VIDEO_CD":
mediaType = MediaType.VCD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Video_CD_description_file);
return;
case "SUPERVCD":
mediaType = MediaType.SVCD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Super_Video_CD_description_file);
break;
case "HQ-VCD":
mediaType = MediaType.CVD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_China_Video_Disc_description_file);
break;
@@ -2600,7 +2600,7 @@ public static class MMC
case "PHOTO_CD":
mediaType = MediaType.PCD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Photo_CD_description_file);
return;
@@ -2697,7 +2697,7 @@ public static class MMC
{
mediaType = MediaType.PS1CD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_correct_SYSTEM_CNF_file_in_root_PS1);
}
@@ -2705,7 +2705,7 @@ public static class MMC
{
mediaType = MediaType.PS2CD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_correct_SYSTEM_CNF_file_in_root_PS2);
}
}
@@ -2732,13 +2732,13 @@ public static class MMC
string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(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.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Sony_PlayStation_2_boot_sectors_DVD);
mediaType = MediaType.PS2DVD;
@@ -2755,14 +2755,14 @@ public static class MMC
switch(mediaType)
{
case MediaType.BDROM:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Sony_PlayStation_3_boot_sectors);
mediaType = MediaType.PS3BD;
break;
case MediaType.DVDROM:
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Sony_PlayStation_3_boot_sectors_DVD);
mediaType = MediaType.PS3DVD;
@@ -2778,7 +2778,7 @@ public static class MMC
{
mediaType = MediaType.PS4BD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Sony_PlayStation_4_boot_sectors);
}
}
@@ -2790,7 +2790,7 @@ public static class MMC
switch(blurayType)
{
case "XG4":
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Blu_ray_type_XG4_setting_disc_type_XGD4);
mediaType = MediaType.XGD4;
@@ -2808,14 +2808,14 @@ public static class MMC
{
mediaType = MediaType.PS5BD;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_Sony_PlayStation_5_boot_sectors);
break;
}
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Blu_ray_type_BDU_setting_disc_type_UHD);
mediaType = MediaType.UHDBD;

164
Aaru.Core/Media/Info/ScsiInfo.cs
View File

@@ -101,7 +101,7 @@ public sealed class ScsiInfo
while(leftRetries > 0)
{
//AaruConsole.WriteLine("\rWaiting for drive to become ready");
//AaruLogging.WriteLine("\rWaiting for drive to become ready");
Thread.Sleep(2000);
sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
@@ -112,7 +112,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Error(Localization.Core.Please_insert_media_in_drive);
AaruLogging.Error(Localization.Core.Please_insert_media_in_drive);
return;
}
@@ -125,7 +125,7 @@ public sealed class ScsiInfo
while(leftRetries > 0)
{
//AaruConsole.WriteLine("\rWaiting for drive to become ready");
//AaruLogging.WriteLine("\rWaiting for drive to become ready");
Thread.Sleep(2000);
sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
@@ -136,7 +136,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Error(Localization.Core.Error_testing_unit_was_ready_0,
AaruLogging.Error(Localization.Core.Error_testing_unit_was_ready_0,
Sense.PrettifySense(senseBuf));
return;
@@ -145,7 +145,7 @@ public sealed class ScsiInfo
break;
}
default:
AaruConsole.Error(Localization.Core.Error_testing_unit_was_ready_0,
AaruLogging.Error(Localization.Core.Error_testing_unit_was_ready_0,
Sense.PrettifySense(senseBuf));
return;
@@ -153,7 +153,7 @@ public sealed class ScsiInfo
}
else
{
AaruConsole.Error(Localization.Core.Unknown_sense_testing_unit_was_ready);
AaruLogging.Error(Localization.Core.Unknown_sense_testing_unit_was_ready);
return;
}
@@ -210,8 +210,8 @@ public sealed class ScsiInfo
{
if(dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
{
AaruConsole.Error(Localization.Core.Unable_to_get_media_capacity);
AaruConsole.Error("{0}", Sense.PrettifySense(senseBuf));
AaruLogging.Error(Localization.Core.Unable_to_get_media_capacity);
AaruLogging.Error("{0}", Sense.PrettifySense(senseBuf));
}
}
@@ -262,7 +262,7 @@ public sealed class ScsiInfo
/*
sense = dev.ReadAttribute(out seqBuf, out senseBuf, ScsiAttributeAction.List, 0, dev.Timeout, out _);
if (sense)
AaruConsole.ErrorWriteLine("SCSI READ ATTRIBUTE:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.ErrorWriteLine("SCSI READ ATTRIBUTE:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
{
DataFile.WriteTo(MODULE_NAME, outputPrefix, "_scsi_readattribute.bin", "SCSI READ ATTRIBUTE", seqBuf);
@@ -296,7 +296,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME, "READ GET CONFIGURATION:\n{0}", Sense.PrettifySense(senseBuf));
AaruLogging.Debug(MODULE_NAME, "READ GET CONFIGURATION:\n{0}", Sense.PrettifySense(senseBuf));
if(dev.IsUsb && scsiMediumType is 0x40 or 0x41 or 0x42) MediaType = MediaType.FlashDrive;
}
@@ -305,7 +305,7 @@ public sealed class ScsiInfo
MmcConfiguration = cmdBuf;
Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.GET_CONFIGURATION_current_profile_is_0,
ftr.CurrentProfile);
@@ -369,7 +369,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Recognized_Format_Layers_0,
Sense.PrettifySense(senseBuf));
}
@@ -388,7 +388,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Write_Protection_Status_0,
Sense.PrettifySense(senseBuf));
}
@@ -399,7 +399,7 @@ 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(MODULE_NAME, "READ DISC STRUCTURE: Capability List\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: Capability List\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_capabilitylist.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
*/
@@ -436,7 +436,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_PFI_0,
Sense.PrettifySense(senseBuf));
}
@@ -488,7 +488,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DMI_0,
Sense.PrettifySense(senseBuf));
}
@@ -527,7 +527,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_CMI_0,
Sense.PrettifySense(senseBuf));
}
@@ -556,7 +556,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_BCA_0,
Sense.PrettifySense(senseBuf));
}
@@ -575,7 +575,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DVD_AACS_0,
Sense.PrettifySense(senseBuf));
}
@@ -602,7 +602,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DDS_0,
Sense.PrettifySense(senseBuf));
}
@@ -621,7 +621,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Medium_Status_0,
Sense.PrettifySense(senseBuf));
}
@@ -640,7 +640,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_SAI_0,
Sense.PrettifySense(senseBuf));
}
@@ -667,7 +667,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Last_Out_Border_RMD_0,
Sense.PrettifySense(senseBuf));
}
@@ -696,7 +696,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Disc_Key_0,
Sense.PrettifySense(senseBuf));
}
@@ -715,7 +715,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Sector_CMI_0,
Sense.PrettifySense(senseBuf));
}
@@ -728,47 +728,47 @@ 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(MODULE_NAME, "READ DISC STRUCTURE: Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
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(MODULE_NAME, "READ DISC STRUCTURE: MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
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(MODULE_NAME, "READ DISC STRUCTURE: AACS Volume ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS Volume ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
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(MODULE_NAME, "READ DISC STRUCTURE: AACS Media Serial Number\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS Media Serial Number\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
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(MODULE_NAME, "READ DISC STRUCTURE: AACS Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
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(MODULE_NAME, "READ DISC STRUCTURE: AACS MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
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(MODULE_NAME, "READ DISC STRUCTURE: AACS LBA Extents\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS LBA Extents\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
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(MODULE_NAME, "READ DISC STRUCTURE: AACS CPRM MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS CPRM MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
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(MODULE_NAME, "READ DISC STRUCTURE: AACS Data Keys\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
AaruLogging.DebugWriteLine(MODULE_NAME, "READ DISC STRUCTURE: AACS Data Keys\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
DataFile.WriteTo(MODULE_NAME, outputPrefix, "_readdiscstructure_aacsdatakeys.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
*/
@@ -791,7 +791,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Pre_Recorded_Info_0,
Sense.PrettifySense(senseBuf));
}
@@ -826,7 +826,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DVD_R_Media_ID_0,
Sense.PrettifySense(senseBuf));
}
@@ -845,7 +845,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DVD_R_PFI_0,
Sense.PrettifySense(senseBuf));
}
@@ -878,7 +878,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_ADIP_0,
Sense.PrettifySense(senseBuf));
}
@@ -897,7 +897,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DCB_0,
Sense.PrettifySense(senseBuf));
}
@@ -923,7 +923,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_HD_DVD_CMI_0,
Sense.PrettifySense(senseBuf));
}
@@ -953,7 +953,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_HD_DVD_R_Medium_Status,
Sense.PrettifySense(senseBuf));
}
@@ -972,7 +972,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Last_RMD_0,
Sense.PrettifySense(senseBuf));
}
@@ -1000,7 +1000,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Layer_Capacity_0,
Sense.PrettifySense(senseBuf));
}
@@ -1030,7 +1030,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Middle_Zone_Start_0,
Sense.PrettifySense(senseBuf));
}
@@ -1049,7 +1049,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Jump_Interval_Size_0,
Sense.PrettifySense(senseBuf));
}
@@ -1068,7 +1068,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Manual_Layer_Jump_Start_LBA_0,
Sense.PrettifySense(senseBuf));
}
@@ -1087,7 +1087,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Remap_Anchor_Point_0,
Sense.PrettifySense(senseBuf));
}
@@ -1118,7 +1118,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DI_0,
Sense.PrettifySense(senseBuf));
}
@@ -1137,7 +1137,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_PAC_0,
Sense.PrettifySense(senseBuf));
}
@@ -1167,7 +1167,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_BCA_0,
Sense.PrettifySense(senseBuf));
}
@@ -1196,7 +1196,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DDS_0,
Sense.PrettifySense(senseBuf));
}
@@ -1215,7 +1215,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Cartridge_Status_0,
Sense.PrettifySense(senseBuf));
}
@@ -1234,7 +1234,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"READ DISC STRUCTURE: Spare Area Information\n{0}",
Sense.PrettifySense(senseBuf));
}
@@ -1253,7 +1253,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_Raw_DFL_0,
Sense.PrettifySense(senseBuf));
}
@@ -1268,7 +1268,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_001b_0,
Sense.PrettifySense(senseBuf));
}
@@ -1283,7 +1283,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_010b_0,
Sense.PrettifySense(senseBuf));
}
@@ -1307,7 +1307,7 @@ public sealed class ScsiInfo
if(tocSense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_TOC_PMA_ATIP_TOC_0,
Sense.PrettifySense(senseBuf));
}
@@ -1325,7 +1325,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_TOC_PMA_ATIP_ATIP_0,
Sense.PrettifySense(senseBuf));
}
@@ -1349,7 +1349,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_TOC_PMA_ATIP_Session_Info_0,
Sense.PrettifySense(senseBuf));
}
@@ -1369,7 +1369,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_TOC_PMA_ATIP_Raw_TOC_0,
Sense.PrettifySense(senseBuf));
}
@@ -1384,7 +1384,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_TOC_PMA_ATIP_PMA_0,
Sense.PrettifySense(senseBuf));
}
@@ -1394,7 +1394,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_TOC_PMA_ATIP_CD_TEXT_0,
Sense.PrettifySense(senseBuf));
}
@@ -1441,7 +1441,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_PFI_0,
Sense.PrettifySense(senseBuf));
}
@@ -1452,7 +1452,7 @@ public sealed class ScsiInfo
if(nintendoPfi != null)
{
AaruConsole.WriteLine("PFI:\n{0}", PFI.Prettify(cmdBuf, MediaType));
AaruLogging.WriteLine("PFI:\n{0}", PFI.Prettify(cmdBuf, MediaType));
if(nintendoPfi is { DiskCategory: DiskCategory.Nintendo, PartVersion: 15 })
{
@@ -1478,7 +1478,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_STRUCTURE_DMI_0,
Sense.PrettifySense(senseBuf));
}
@@ -1493,7 +1493,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_MEDIA_SERIAL_NUMBER_0,
Sense.PrettifySense(senseBuf));
}
@@ -1522,7 +1522,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.KREON_EXTRACT_SS_0,
Sense.PrettifySense(senseBuf));
}
@@ -1532,13 +1532,13 @@ public sealed class ScsiInfo
DecodedXboxSecuritySector = SS.Decode(cmdBuf);
// Get video partition size
AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_video_partition_size);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Getting_video_partition_size);
sense = dev.KreonLock(out senseBuf, dev.Timeout, out _);
if(sense)
{
AaruConsole.Error(Localization.Core.Cannot_lock_drive_not_continuing);
AaruLogging.Error(Localization.Core.Cannot_lock_drive_not_continuing);
break;
}
@@ -1547,7 +1547,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Error(Localization.Core.Cannot_get_disc_capacity);
AaruLogging.Error(Localization.Core.Cannot_get_disc_capacity);
break;
}
@@ -1567,12 +1567,12 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Error(Localization.Core.Cannot_get_PFI);
AaruLogging.Error(Localization.Core.Cannot_get_PFI);
break;
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Video_partition_total_size_0_sectors,
totalSize);
@@ -1583,12 +1583,12 @@ public sealed class ScsiInfo
ulong l1Video = totalSize - l0Video + 1;
// Get game partition size
AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_game_partition_size);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Getting_game_partition_size);
sense = dev.KreonUnlockXtreme(out senseBuf, dev.Timeout, out _);
if(sense)
{
AaruConsole.Error(Localization.Core.Cannot_unlock_drive_not_continuing);
AaruLogging.Error(Localization.Core.Cannot_unlock_drive_not_continuing);
break;
}
@@ -1597,7 +1597,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Error(Localization.Core.Cannot_get_disc_capacity);
AaruLogging.Error(Localization.Core.Cannot_get_disc_capacity);
return;
}
@@ -1607,17 +1607,17 @@ public sealed class ScsiInfo
0xFFFFFFFF) +
1;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Game_partition_total_size_0_sectors,
gameSize);
// Get middle zone size
AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_middle_zone_size);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Getting_middle_zone_size);
sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out _);
if(sense)
{
AaruConsole.Error(Localization.Core.Cannot_unlock_drive_not_continuing);
AaruLogging.Error(Localization.Core.Cannot_unlock_drive_not_continuing);
break;
}
@@ -1626,7 +1626,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Error(Localization.Core.Cannot_get_disc_capacity);
AaruLogging.Error(Localization.Core.Cannot_get_disc_capacity);
break;
}
@@ -1646,12 +1646,12 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Error(Localization.Core.Cannot_get_PFI);
AaruLogging.Error(Localization.Core.Cannot_get_PFI);
break;
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Unlocked_total_size_0_sectors,
totalSize);
@@ -1711,7 +1711,7 @@ public sealed class ScsiInfo
if(sense)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.READ_DISC_INFORMATION_000b_0,
Sense.PrettifySense(senseBuf));
}

16
Aaru.Core/Partitions.cs
View File

@@ -70,7 +70,7 @@ public static class Partitions
foundPartitions.AddRange(partitions);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_0_at_1,
plugin.Name,
tapeFile.FirstBlock);
@@ -93,7 +93,7 @@ public static class Partitions
foundPartitions.AddRange(partitions);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_0_at_1,
plugin.Name,
imagePartition.Start);
@@ -113,7 +113,7 @@ public static class Partitions
if(!plugin.GetInformation(image, out List<Partition> partitions, 0)) continue;
foundPartitions.AddRange(partitions);
AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_0_at_zero, plugin.Name);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Found_0_at_zero, plugin.Name);
}
checkedLocations.Add(0);
@@ -135,14 +135,14 @@ public static class Partitions
{
if(plugin is null) continue;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Trying_0_at_1,
plugin.Name,
foundPartitions[0].Start);
if(!plugin.GetInformation(image, out List<Partition> partitions, foundPartitions[0].Start)) continue;
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Core.Found_0_at_1,
plugin.Name,
foundPartitions[0].Start);
@@ -152,7 +152,7 @@ public static class Partitions
checkedLocations.Add(foundPartitions[0].Start);
AaruConsole.Debug(MODULE_NAME, Localization.Core.Got_0_children, children.Count);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Got_0_children, children.Count);
if(children.Count > 0)
{
@@ -172,8 +172,8 @@ public static class Partitions
foundPartitions.RemoveAt(0);
}
AaruConsole.Debug(MODULE_NAME, Localization.Core.Got_0_parents, foundPartitions.Count);
AaruConsole.Debug(MODULE_NAME, Localization.Core.Got_0_partitions, childPartitions.Count);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Got_0_parents, foundPartitions.Count);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Got_0_partitions, childPartitions.Count);
}
// Be sure that device partitions are not excluded if not mapped by any scheme...

84
Aaru.Core/PrintScsiModePages.cs
View File

@@ -46,30 +46,30 @@ public static class PrintScsiModePages
/// <param name="vendorId">SCSI vendor identification</param>
public static void Print(Modes.DecodedMode decMode, PeripheralDeviceTypes devType, byte[] vendorId)
{
AaruConsole.WriteLine(Modes.PrettifyModeHeader(decMode.Header, devType));
AaruLogging.WriteLine(Modes.PrettifyModeHeader(decMode.Header, devType));
if(decMode.Pages == null) return;
foreach(Modes.ModePage page in decMode.Pages)
//AaruConsole.WriteLine("Page {0:X2}h subpage {1:X2}h is {2} bytes long", page.Page, page.Subpage, page.PageResponse.Length);
//AaruLogging.WriteLine("Page {0:X2}h subpage {1:X2}h is {2} bytes long", page.Page, page.Subpage, page.PageResponse.Length);
{
switch(page.Page)
{
case 0x00:
{
if(devType == PeripheralDeviceTypes.MultiMediaDevice && page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_00_SFF(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_00_SFF(page.PageResponse));
else
{
if(page.Subpage != 0)
{
AaruConsole.WriteLine(Localization.Core.Found_unknown_vendor_mode_page_0_subpage_1,
AaruLogging.WriteLine(Localization.Core.Found_unknown_vendor_mode_page_0_subpage_1,
page.Page,
page.Subpage);
}
else
AaruConsole.WriteLine(Localization.Core.Found_unknown_vendor_mode_page_0, page.Page);
AaruLogging.WriteLine(Localization.Core.Found_unknown_vendor_mode_page_0, page.Page);
}
break;
@@ -78,7 +78,7 @@ public static class PrintScsiModePages
{
if(page.Subpage == 0)
{
AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
AaruLogging.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
? Modes.PrettifyModePage_01_MMC(page.PageResponse)
: Modes.PrettifyModePage_01(page.PageResponse));
}
@@ -90,7 +90,7 @@ public static class PrintScsiModePages
case 0x02:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_02(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_02(page.PageResponse));
else
goto default;
@@ -99,7 +99,7 @@ public static class PrintScsiModePages
case 0x03:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_03(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_03(page.PageResponse));
else
goto default;
@@ -108,7 +108,7 @@ public static class PrintScsiModePages
case 0x04:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_04(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_04(page.PageResponse));
else
goto default;
@@ -117,7 +117,7 @@ public static class PrintScsiModePages
case 0x05:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_05(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_05(page.PageResponse));
else
goto default;
@@ -126,7 +126,7 @@ public static class PrintScsiModePages
case 0x06:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_06(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_06(page.PageResponse));
else
goto default;
@@ -136,7 +136,7 @@ public static class PrintScsiModePages
{
if(page.Subpage == 0)
{
AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
AaruLogging.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
? Modes.PrettifyModePage_07_MMC(page.PageResponse)
: Modes.PrettifyModePage_07(page.PageResponse));
}
@@ -148,7 +148,7 @@ public static class PrintScsiModePages
case 0x08:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_08(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_08(page.PageResponse));
else
goto default;
@@ -157,9 +157,9 @@ public static class PrintScsiModePages
case 0x0A:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_0A(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_0A(page.PageResponse));
else if(page.Subpage == 1)
AaruConsole.WriteLine(Modes.PrettifyModePage_0A_S01(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_0A_S01(page.PageResponse));
else
goto default;
@@ -168,7 +168,7 @@ public static class PrintScsiModePages
case 0x0B:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_0B(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_0B(page.PageResponse));
else
goto default;
@@ -177,7 +177,7 @@ public static class PrintScsiModePages
case 0x0D:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_0D(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_0D(page.PageResponse));
else
goto default;
@@ -186,7 +186,7 @@ public static class PrintScsiModePages
case 0x0E:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_0E(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_0E(page.PageResponse));
else
goto default;
@@ -195,7 +195,7 @@ public static class PrintScsiModePages
case 0x0F:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_0F(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_0F(page.PageResponse));
else
goto default;
@@ -205,7 +205,7 @@ public static class PrintScsiModePages
{
if(page.Subpage == 0)
{
AaruConsole.WriteLine(devType == PeripheralDeviceTypes.SequentialAccess
AaruLogging.WriteLine(devType == PeripheralDeviceTypes.SequentialAccess
? Modes.PrettifyModePage_10_SSC(page.PageResponse)
: Modes.PrettifyModePage_10(page.PageResponse));
}
@@ -217,7 +217,7 @@ public static class PrintScsiModePages
case 0x11:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_11(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_11(page.PageResponse));
else
goto default;
@@ -228,7 +228,7 @@ public static class PrintScsiModePages
case 0x14:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_12_13_14(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_12_13_14(page.PageResponse));
else
goto default;
@@ -237,9 +237,9 @@ public static class PrintScsiModePages
case 0x1A:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_1A(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_1A(page.PageResponse));
else if(page.Subpage == 1)
AaruConsole.WriteLine(Modes.PrettifyModePage_1A_S01(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_1A_S01(page.PageResponse));
else
goto default;
@@ -248,7 +248,7 @@ public static class PrintScsiModePages
case 0x1B:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_1B(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_1B(page.PageResponse));
else
goto default;
@@ -258,12 +258,12 @@ public static class PrintScsiModePages
{
if(page.Subpage == 0)
{
AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
AaruLogging.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
: Modes.PrettifyModePage_1C(page.PageResponse));
}
else if(page.Subpage == 1)
AaruConsole.WriteLine(Modes.PrettifyModePage_1C_S01(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_1C_S01(page.PageResponse));
else
goto default;
@@ -272,7 +272,7 @@ public static class PrintScsiModePages
case 0x1D:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_1D(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_1D(page.PageResponse));
else
goto default;
@@ -281,7 +281,7 @@ public static class PrintScsiModePages
case 0x21:
{
if(StringHandlers.CToString(vendorId).Trim() == "CERTANCE")
AaruConsole.WriteLine(Modes.PrettifyCertanceModePage_21(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyCertanceModePage_21(page.PageResponse));
else
goto default;
@@ -290,7 +290,7 @@ public static class PrintScsiModePages
case 0x22:
{
if(StringHandlers.CToString(vendorId).Trim() == "CERTANCE")
AaruConsole.WriteLine(Modes.PrettifyCertanceModePage_22(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyCertanceModePage_22(page.PageResponse));
else
goto default;
@@ -299,7 +299,7 @@ public static class PrintScsiModePages
case 0x24:
{
if(StringHandlers.CToString(vendorId).Trim() == "IBM")
AaruConsole.WriteLine(Modes.PrettifyIBMModePage_24(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyIBMModePage_24(page.PageResponse));
else
goto default;
@@ -308,7 +308,7 @@ public static class PrintScsiModePages
case 0x2A:
{
if(page.Subpage == 0)
AaruConsole.WriteLine(Modes.PrettifyModePage_2A(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyModePage_2A(page.PageResponse));
else
goto default;
@@ -317,7 +317,7 @@ public static class PrintScsiModePages
case 0x2F:
{
if(StringHandlers.CToString(vendorId).Trim() == "IBM")
AaruConsole.WriteLine(Modes.PrettifyIBMModePage_2F(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyIBMModePage_2F(page.PageResponse));
else
goto default;
@@ -326,7 +326,7 @@ public static class PrintScsiModePages
case 0x30:
{
if(Modes.IsAppleModePage_30(page.PageResponse))
AaruConsole.WriteLine(Localization.Core.Drive_identifies_as_Apple_OEM_drive);
AaruLogging.WriteLine(Localization.Core.Drive_identifies_as_Apple_OEM_drive);
else
goto default;
@@ -335,7 +335,7 @@ public static class PrintScsiModePages
case 0x3B:
{
if(StringHandlers.CToString(vendorId).Trim() == "HP")
AaruConsole.WriteLine(Modes.PrettifyHPModePage_3B(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyHPModePage_3B(page.PageResponse));
else
goto default;
@@ -344,7 +344,7 @@ public static class PrintScsiModePages
case 0x3C:
{
if(StringHandlers.CToString(vendorId).Trim() == "HP")
AaruConsole.WriteLine(Modes.PrettifyHPModePage_3C(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyHPModePage_3C(page.PageResponse));
else
goto default;
@@ -353,9 +353,9 @@ public static class PrintScsiModePages
case 0x3D:
{
if(StringHandlers.CToString(vendorId).Trim() == "IBM")
AaruConsole.WriteLine(Modes.PrettifyIBMModePage_3D(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyIBMModePage_3D(page.PageResponse));
else if(StringHandlers.CToString(vendorId).Trim() == "HP")
AaruConsole.WriteLine(Modes.PrettifyHPModePage_3D(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyHPModePage_3D(page.PageResponse));
else
goto default;
@@ -364,9 +364,9 @@ public static class PrintScsiModePages
case 0x3E:
{
if(StringHandlers.CToString(vendorId).Trim() == "FUJITSU")
AaruConsole.WriteLine(Modes.PrettifyFujitsuModePage_3E(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyFujitsuModePage_3E(page.PageResponse));
else if(StringHandlers.CToString(vendorId).Trim() == "HP")
AaruConsole.WriteLine(Modes.PrettifyHPModePage_3E(page.PageResponse));
AaruLogging.WriteLine(Modes.PrettifyHPModePage_3E(page.PageResponse));
else
goto default;
@@ -376,12 +376,12 @@ public static class PrintScsiModePages
{
if(page.Subpage != 0)
{
AaruConsole.WriteLine(Localization.Core.Found_unknown_mode_page_0_subpage_1,
AaruLogging.WriteLine(Localization.Core.Found_unknown_mode_page_0_subpage_1,
page.Page,
page.Subpage);
}
else
AaruConsole.WriteLine(Localization.Core.Found_unknown_mode_page_0, page.Page);
AaruLogging.WriteLine(Localization.Core.Found_unknown_mode_page_0, page.Page);
break;
}

42
Aaru.Core/Remote.cs
View File

@@ -161,12 +161,12 @@ public static class Remote
if(lastUpdate == 0)
{
create = true;
AaruConsole.WriteLine(Localization.Core.Creating_main_database);
AaruLogging.WriteLine(Localization.Core.Creating_main_database);
}
else
{
AaruConsole.WriteLine(Localization.Core.Updating_main_database);
AaruConsole.WriteLine(Localization.Core.Last_update_0, latest);
AaruLogging.WriteLine(Localization.Core.Updating_main_database);
AaruLogging.WriteLine(Localization.Core.Last_update_0, latest);
}
DateTime updateStart = DateTime.UtcNow;
@@ -179,7 +179,7 @@ public static class Remote
if(!response.IsSuccessStatusCode)
{
AaruConsole.Error(Localization.Core.Error_0_when_trying_to_get_updated_entities,
AaruLogging.Error(Localization.Core.Error_0_when_trying_to_get_updated_entities,
response.StatusCode);
return;
@@ -209,7 +209,7 @@ public static class Remote
return Task.CompletedTask;
});
AaruConsole.WriteLine(Localization.Core.Added_0_usb_vendors, sync.UsbVendors.Count);
AaruLogging.WriteLine(Localization.Core.Added_0_usb_vendors, sync.UsbVendors.Count);
await AnsiConsole.Progress()
.AutoClear(true)
@@ -232,7 +232,7 @@ public static class Remote
return Task.CompletedTask;
});
AaruConsole.WriteLine(Localization.Core.Added_0_usb_products, sync.UsbProducts.Count);
AaruLogging.WriteLine(Localization.Core.Added_0_usb_products, sync.UsbProducts.Count);
await AnsiConsole.Progress()
.AutoClear(true)
@@ -258,7 +258,7 @@ public static class Remote
return Task.CompletedTask;
});
AaruConsole.WriteLine(Localization.Core.Added_0_CompactDisc_read_offsets, sync.Offsets.Count);
AaruLogging.WriteLine(Localization.Core.Added_0_CompactDisc_read_offsets, sync.Offsets.Count);
await AnsiConsole.Progress()
.AutoClear(true)
@@ -283,7 +283,7 @@ public static class Remote
return Task.CompletedTask;
});
AaruConsole.WriteLine(Localization.Core.Added_0_known_devices, sync.Devices.Count);
AaruLogging.WriteLine(Localization.Core.Added_0_known_devices, sync.Devices.Count);
await AnsiConsole.Progress()
.AutoClear(true)
@@ -323,7 +323,7 @@ public static class Remote
return Task.CompletedTask;
});
AaruConsole.WriteLine(Localization.Core.Added_0_known_iNES_NES_2_0_headers,
AaruLogging.WriteLine(Localization.Core.Added_0_known_iNES_NES_2_0_headers,
sync.NesHeaders?.Count ?? 0);
}
else
@@ -370,8 +370,8 @@ public static class Remote
}
});
AaruConsole.WriteLine(Localization.Core.Added_0_usb_vendors, addedVendors);
AaruConsole.WriteLine(Localization.Core.Modified_0_USB_vendors, modifiedVendors);
AaruLogging.WriteLine(Localization.Core.Added_0_usb_vendors, addedVendors);
AaruLogging.WriteLine(Localization.Core.Modified_0_USB_vendors, modifiedVendors);
await AnsiConsole.Progress()
.AutoClear(true)
@@ -409,8 +409,8 @@ public static class Remote
}
});
AaruConsole.WriteLine(Localization.Core.Added_0_usb_products, addedProducts);
AaruConsole.WriteLine(Localization.Core.Modified_0_USB_products, modifiedProducts);
AaruLogging.WriteLine(Localization.Core.Added_0_usb_products, addedProducts);
AaruLogging.WriteLine(Localization.Core.Modified_0_USB_products, modifiedProducts);
await AnsiConsole.Progress()
.AutoClear(true)
@@ -453,8 +453,8 @@ public static class Remote
}
});
AaruConsole.WriteLine(Localization.Core.Added_0_CompactDisc_read_offsets, addedOffsets);
AaruConsole.WriteLine(Localization.Core.Modified_0_CompactDisc_read_offsets, modifiedOffsets);
AaruLogging.WriteLine(Localization.Core.Added_0_CompactDisc_read_offsets, addedOffsets);
AaruLogging.WriteLine(Localization.Core.Modified_0_CompactDisc_read_offsets, modifiedOffsets);
await AnsiConsole.Progress()
.AutoClear(true)
@@ -501,8 +501,8 @@ public static class Remote
}
});
AaruConsole.WriteLine(Localization.Core.Added_0_known_devices, addedDevices);
AaruConsole.WriteLine(Localization.Core.Modified_0_known_devices, modifiedDevices);
AaruLogging.WriteLine(Localization.Core.Added_0_known_devices, addedDevices);
AaruLogging.WriteLine(Localization.Core.Modified_0_known_devices, modifiedDevices);
await AnsiConsole.Progress()
.AutoClear(true)
@@ -578,14 +578,14 @@ public static class Remote
}
});
AaruConsole.WriteLine(Localization.Core.Added_0_known_iNES_NES_2_0_headers, addedNesHeaders);
AaruConsole.WriteLine(Localization.Core.Modified_0_known_iNES_NES_2_0_headers, modifiedNesHeaders);
AaruLogging.WriteLine(Localization.Core.Added_0_known_iNES_NES_2_0_headers, addedNesHeaders);
AaruLogging.WriteLine(Localization.Core.Modified_0_known_iNES_NES_2_0_headers, modifiedNesHeaders);
}
}
catch(Exception ex)
{
AaruConsole.Error(Localization.Core.Exception_0_when_updating_database, ex);
AaruConsole.Exception(ex);
AaruLogging.Error(Localization.Core.Exception_0_when_updating_database, ex);
AaruLogging.Exception(ex);
}
finally
{

24
Aaru.Core/Sidecar/BlockMedia.cs
View File

@@ -505,7 +505,7 @@ public sealed partial class Sidecar
if(errno != ErrorNumber.NoError)
{
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruLogging.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
tapePartition.FirstBlock + doneSectors));
@@ -525,7 +525,7 @@ public sealed partial class Sidecar
if(errno != ErrorNumber.NoError)
{
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruLogging.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
tapePartition.FirstBlock + doneSectors));
@@ -605,7 +605,7 @@ public sealed partial class Sidecar
if(errno != ErrorNumber.NoError)
{
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruLogging.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
tapeFile.FirstBlock + doneSectors));
@@ -628,7 +628,7 @@ public sealed partial class Sidecar
if(errno != ErrorNumber.NoError)
{
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruLogging.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
tapeFile.FirstBlock + doneSectors));
@@ -731,7 +731,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(MODULE_NAME, "Plugin {0} crashed", _plugin.Name);
//AaruLogging.DebugWriteLine(MODULE_NAME, "Plugin {0} crashed", _plugin.Name);
}
}
@@ -793,7 +793,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(MODULE_NAME, "Plugin {0} crashed", _plugin.Name);
//AaruLogging.DebugWriteLine(MODULE_NAME, "Plugin {0} crashed", _plugin.Name);
}
}
@@ -1046,7 +1046,7 @@ public sealed partial class Sidecar
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.SCP_image_do_not_same_number_tracks_0_disk_image_1_ignoring,
scpImage.Header.end + 1,
image.Info.Cylinders);
@@ -1054,7 +1054,7 @@ public sealed partial class Sidecar
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.SCP_image_do_not_same_number_heads_0_disk_image_1_ignoring,
2,
image.Info.Heads);
@@ -1157,7 +1157,7 @@ public sealed partial class Sidecar
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.KryoFlux_image_do_not_same_number_tracks_0_disk_image_1_ignoring,
kfImage.Info.Cylinders,
image.Info.Cylinders);
@@ -1165,7 +1165,7 @@ public sealed partial class Sidecar
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.KryoFlux_image_do_not_same_number_heads_0_disk_image_1_ignoring,
kfImage.Info.Heads,
image.Info.Heads);
@@ -1249,7 +1249,7 @@ public sealed partial class Sidecar
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.DiscFerret_image_do_not_same_number_tracks_0_disk_image_1_ignoring,
dfiImage.Info.Cylinders,
image.Info.Cylinders);
@@ -1257,7 +1257,7 @@ public sealed partial class Sidecar
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.DiscFerret_image_do_not_same_number_heads_0_disk_image_1_ignoring,
dfiImage.Info.Heads,
image.Info.Heads);

4
Aaru.Core/Sidecar/Files.cs
View File

@@ -62,7 +62,7 @@ public sealed partial class Sidecar
if(ret != ErrorNumber.NoError)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent);
continue;
}
@@ -118,7 +118,7 @@ public sealed partial class Sidecar
if(ret != ErrorNumber.NoError)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent);
continue;
}

4
Aaru.Core/Sidecar/OpticalDisc.cs
View File

@@ -572,7 +572,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(MODULE_NAME, "Plugin {0} crashed", _plugin.Name);
//AaruLogging.DebugWriteLine(MODULE_NAME, "Plugin {0} crashed", _plugin.Name);
}
}
@@ -650,7 +650,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(MODULE_NAME, "Plugin {0} crashed", _plugin.Name);
//AaruLogging.DebugWriteLine(MODULE_NAME, "Plugin {0} crashed", _plugin.Name);
}
}

12
Aaru.Core/Sidecar/Sidecar.cs
View File

@@ -147,10 +147,10 @@ public sealed partial class Sidecar
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.The_specified_image_says_it_contains_an_optical_media_but_at_the_same_time_says_it_does_not_support_them);
AaruConsole.Error(Localization.Core.Please_open_an_issue_at_Github);
AaruLogging.Error(Localization.Core.Please_open_an_issue_at_Github);
}
break;
@@ -159,10 +159,10 @@ public sealed partial class Sidecar
BlockMedia(blockImage, _filterId, _imagePath, _fi, _plugins, imgChecksums, ref _sidecar, _encoding);
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.The_specified_image_says_it_contains_a_block_addressable_media_but_at_the_same_time_says_it_does_not_support_them);
AaruConsole.Error(Localization.Core.Please_open_an_issue_at_Github);
AaruLogging.Error(Localization.Core.Please_open_an_issue_at_Github);
}
break;
@@ -180,10 +180,10 @@ public sealed partial class Sidecar
}
else
{
AaruConsole.Error(Localization.Core
AaruLogging.Error(Localization.Core
.The_specified_image_says_it_contains_a_byte_addressable_media_but_at_the_same_time_says_it_does_not_support_them);
AaruConsole.Error(Localization.Core.Please_open_an_issue_at_Github);
AaruLogging.Error(Localization.Core.Please_open_an_issue_at_Github);
}
break;

42
Aaru.Core/Statistics.cs
View File

@@ -88,8 +88,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
@@ -104,8 +104,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
if(Settings.Settings.Current.Stats is { ShareStats: true }) await SubmitStatsAsync();
@@ -213,7 +213,7 @@ public static class Statistics
#if DEBUG
Console.WriteLine(Localization.Core.Uploading_statistics);
#else
Aaru.Logging.AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Uploading_statistics);
Aaru.Logging.AaruLogging.DebugWriteLine(MODULE_NAME, Localization.Core.Uploading_statistics);
#endif
using StringContent jsonContent =
new(JsonSerializer.Serialize(dto, typeof(StatsDto), StatsDtoContext.Default),
@@ -431,8 +431,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
@@ -459,8 +459,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
@@ -487,8 +487,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
@@ -515,8 +515,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
@@ -543,8 +543,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
@@ -586,8 +586,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
@@ -614,8 +614,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
@@ -656,8 +656,8 @@ public static class Statistics
}
catch(SqliteException ex)
{
AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruConsole.Exception(ex);
AaruLogging.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
AaruLogging.Exception(ex);
}
}
}

2
Aaru.Decoders/Bluray/BCA.cs
View File

@@ -87,7 +87,7 @@ public static class BCA
if(BCAResponse.Length != 68)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Found_incorrect_Blu_ray_BCA_size_0_bytes,
BCAResponse.Length);

2
Aaru.Decoders/Bluray/Cartridge.cs
View File

@@ -102,7 +102,7 @@ public static class Cartridge
if(CSResponse.Length != 8)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Found_incorrect_Blu_ray_Cartridge_Status_size_0_bytes,
CSResponse.Length);

2
Aaru.Decoders/Bluray/DDS.cs
View File

@@ -143,7 +143,7 @@ public static class DDS
if(decoded.Signature != DDSIdentifier)
{
AaruConsole.Debug(MODULE_NAME, Localization.Found_incorrect_DDS_signature_0, decoded.Signature);
AaruLogging.Debug(MODULE_NAME, Localization.Found_incorrect_DDS_signature_0, decoded.Signature);
return null;
}

4
Aaru.Decoders/Bluray/DI.cs
View File

@@ -119,7 +119,7 @@ public static class DI
if(DIResponse.Length != 4100)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Found_incorrect_Blu_ray_Disc_Information_size_0_bytes,
DIResponse.Length);
@@ -214,7 +214,7 @@ public static class DI
default:
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Found_unknown_disc_type_identifier_0,
Encoding.ASCII.GetString(unit.DiscTypeIdentifier));

2
Aaru.Decoders/Bluray/Spare.cs
View File

@@ -90,7 +90,7 @@ public static class Spare
if(SAIResponse.Length != 16)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.Spare_Decode_Found_incorrect_Blu_ray_Spare_Area_Information_size_0_bytes,
SAIResponse.Length);

2
Aaru.Decoders/CD/ATIP.cs
View File

@@ -67,7 +67,7 @@ public static class ATIP
if(CDATIPResponse.Length != 32 && CDATIPResponse.Length != 28)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.Expected_CD_ATIP_size_32_bytes_is_not_received_size_0_bytes_not_decoding,
CDATIPResponse.Length);

2
Aaru.Decoders/CD/CDTextOnLeadIn.cs
View File

@@ -118,7 +118,7 @@ public static class CDTextOnLeadIn
if(decoded.DataLength + 2 != CDTextResponse.Length)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.Expected_CD_TEXT_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
decoded.DataLength + 2,

2
Aaru.Decoders/CD/FullTOC.cs
View File

@@ -78,7 +78,7 @@ public static class FullTOC
if(decoded.DataLength + 2 != CDFullTOCResponse.Length)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.Expected_CDFullTOC_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
decoded.DataLength + 2,

2
Aaru.Decoders/CD/PMA.cs
View File

@@ -75,7 +75,7 @@ public static class PMA
if(decoded.DataLength + 2 != CDPMAResponse.Length)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.Expected_CD_PMA_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
decoded.DataLength + 2,

2
Aaru.Decoders/CD/Session.cs
View File

@@ -71,7 +71,7 @@ public static class Session
if(decoded.DataLength + 2 != CDSessionInfoResponse.Length)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.Expected_CDSessionInfo_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
decoded.DataLength + 2,

2
Aaru.Decoders/CD/TOC.cs
View File

@@ -74,7 +74,7 @@ public static class TOC
if(decoded.DataLength + 2 != CDTOCResponse.Length)
{
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization
.Expected_CD_TOC_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
decoded.DataLength + 2,

24
Aaru.Decoders/Floppy/Apple2.cs
View File

@@ -265,7 +265,7 @@ public static class Apple2
// Prologue found
if(data[position] == 0xD5 && data[position + 1] == 0xAA)
{
AaruConsole.Debug(MODULE_NAME, Localization.Prologue_found_at_0, position);
AaruLogging.Debug(MODULE_NAME, Localization.Prologue_found_at_0, position);
// Epilogue not in correct position
if(data[position + 11] != 0xDE || data[position + 12] != 0xAA) return null;
@@ -283,31 +283,31 @@ public static class Apple2
}
};
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Volume_0,
((sector.addressField.volume[0] & 0x55) << 1 |
sector.addressField.volume[1] & 0x55) &
0xFF);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Core.Track_0,
((sector.addressField.track[0] & 0x55) << 1 |
sector.addressField.track[1] & 0x55) &
0xFF);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Sector_0,
((sector.addressField.sector[0] & 0x55) << 1 |
sector.addressField.sector[1] & 0x55) &
0xFF);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Checksum_0,
((sector.addressField.checksum[0] & 0x55) << 1 |
sector.addressField.checksum[1] & 0x55) &
0xFF);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Epilogue_0_1_2,
sector.addressField.epilogue[0],
sector.addressField.epilogue[1],
@@ -335,9 +335,9 @@ public static class Apple2
sector.innerGap = gaps.ToArray();
sector.dataField = new RawDataField();
AaruConsole.Debug(MODULE_NAME, Localization.Inner_gap_has_0_bytes, sector.innerGap.Length);
AaruLogging.Debug(MODULE_NAME, Localization.Inner_gap_has_0_bytes, sector.innerGap.Length);
AaruConsole.Debug(MODULE_NAME, Localization.Prologue_found_at_0, position);
AaruLogging.Debug(MODULE_NAME, Localization.Prologue_found_at_0, position);
sector.dataField.prologue = new byte[3];
sector.dataField.prologue[0] = data[position];
sector.dataField.prologue[1] = data[position + 1];
@@ -358,7 +358,7 @@ public static class Apple2
sector.dataField.data = gaps.ToArray();
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Data_has_0_bytes,
sector.dataField.data.Length);
@@ -390,9 +390,9 @@ public static class Apple2
// Return current position to be able to read separate sectors
endOffset = position;
AaruConsole.Debug(MODULE_NAME, Localization.Got_0_bytes_of_gap, sector.gap.Length);
AaruLogging.Debug(MODULE_NAME, Localization.Got_0_bytes_of_gap, sector.gap.Length);
AaruConsole.Debug(MODULE_NAME, Localization.Finished_sector_at_0, position);
AaruLogging.Debug(MODULE_NAME, Localization.Finished_sector_at_0, position);
return sector;
}
@@ -495,7 +495,7 @@ public static class Apple2
break;
}
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.Adding_sector_0_of_track_1,
((sector.addressField.sector[0] & 0x55) << 1 |
sector.addressField.sector[1] & 0x55) &

42
Aaru.Decoders/Sega/CD.cs
View File

@@ -60,63 +60,63 @@ public static class CD
IPBin ipbin = Marshal.ByteArrayToStructureLittleEndian<IPBin>(ipbin_sector);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.volume_name = \"{0}\"",
Encoding.ASCII.GetString(ipbin.volume_name));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.system_name = \"{0}\"",
Encoding.ASCII.GetString(ipbin.system_name));
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.volume_version = \"{0:X}\"", ipbin.volume_version);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.volume_version = \"{0:X}\"", ipbin.volume_version);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.volume_type = 0x{0:X8}", ipbin.volume_type);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.volume_type = 0x{0:X8}", ipbin.volume_type);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.system_version = 0x{0:X8}", ipbin.system_version);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.system_version = 0x{0:X8}", ipbin.system_version);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.ip_address = 0x{0:X8}", ipbin.ip_address);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.ip_loadsize = {0}", ipbin.ip_loadsize);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.ip_address = 0x{0:X8}", ipbin.ip_address);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.ip_loadsize = {0}", ipbin.ip_loadsize);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.ip_entry_address = 0x{0:X8}", ipbin.ip_entry_address);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.ip_entry_address = 0x{0:X8}", ipbin.ip_entry_address);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.ip_work_ram_size = {0}", ipbin.ip_work_ram_size);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.ip_work_ram_size = {0}", ipbin.ip_work_ram_size);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.sp_address = 0x{0:X8}", ipbin.sp_address);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.sp_loadsize = {0}", ipbin.sp_loadsize);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.sp_address = 0x{0:X8}", ipbin.sp_address);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.sp_loadsize = {0}", ipbin.sp_loadsize);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.sp_entry_address = 0x{0:X8}", ipbin.sp_entry_address);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.sp_entry_address = 0x{0:X8}", ipbin.sp_entry_address);
AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.sp_work_ram_size = {0}", ipbin.sp_work_ram_size);
AaruLogging.Debug(MODULE_NAME, "segacd_ipbin.sp_work_ram_size = {0}", ipbin.sp_work_ram_size);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.release_date = \"{0}\"",
Encoding.ASCII.GetString(ipbin.release_date));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.release_date2 = \"{0}\"",
Encoding.ASCII.GetString(ipbin.release_date2));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.developer_code = \"{0}\"",
Encoding.ASCII.GetString(ipbin.developer_code));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.domestic_title = \"{0}\"",
Encoding.ASCII.GetString(ipbin.domestic_title));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.overseas_title = \"{0}\"",
Encoding.ASCII.GetString(ipbin.overseas_title));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.product_code = \"{0}\"",
Encoding.ASCII.GetString(ipbin.product_code));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.peripherals = \"{0}\"",
Encoding.ASCII.GetString(ipbin.peripherals));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"segacd_ipbin.region_codes = \"{0}\"",
Encoding.ASCII.GetString(ipbin.region_codes));

32
Aaru.Decoders/Sega/Dreamcast.cs
View File

@@ -59,59 +59,59 @@ public static class Dreamcast
IPBin ipbin = Marshal.ByteArrayToStructureLittleEndian<IPBin>(ipbin_sector);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.maker_id = \"{0}\"",
Encoding.ASCII.GetString(ipbin.maker_id));
AaruConsole.Debug(MODULE_NAME, "dreamcast_ipbin.spare_space1 = \"{0}\"", (char)ipbin.spare_space1);
AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.spare_space1 = \"{0}\"", (char)ipbin.spare_space1);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.dreamcast_media = \"{0}\"",
Encoding.ASCII.GetString(ipbin.dreamcast_media));
AaruConsole.Debug(MODULE_NAME, "dreamcast_ipbin.disc_no = {0}", (char)ipbin.disc_no);
AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.disc_no = {0}", (char)ipbin.disc_no);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.disc_no_separator = \"{0}\"",
(char)ipbin.disc_no_separator);
AaruConsole.Debug(MODULE_NAME, "dreamcast_ipbin.disc_total_nos = \"{0}\"", (char)ipbin.disc_total_nos);
AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.disc_total_nos = \"{0}\"", (char)ipbin.disc_total_nos);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.spare_space2 = \"{0}\"",
Encoding.ASCII.GetString(ipbin.spare_space2));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.region_codes = \"{0}\"",
Encoding.ASCII.GetString(ipbin.region_codes));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.peripherals = \"{0}\"",
Encoding.ASCII.GetString(ipbin.peripherals));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.product_no = \"{0}\"",
Encoding.ASCII.GetString(ipbin.product_no));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.product_version = \"{0}\"",
Encoding.ASCII.GetString(ipbin.product_version));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.release_date = \"{0}\"",
Encoding.ASCII.GetString(ipbin.release_date));
AaruConsole.Debug(MODULE_NAME, "dreamcast_ipbin.spare_space3 = \"{0}\"", (char)ipbin.spare_space3);
AaruLogging.Debug(MODULE_NAME, "dreamcast_ipbin.spare_space3 = \"{0}\"", (char)ipbin.spare_space3);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.boot_filename = \"{0}\"",
Encoding.ASCII.GetString(ipbin.boot_filename));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.producer = \"{0}\"",
Encoding.ASCII.GetString(ipbin.producer));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"dreamcast_ipbin.product_name = \"{0}\"",
Encoding.ASCII.GetString(ipbin.product_name));

26
Aaru.Decoders/Sega/Saturn.cs
View File

@@ -59,51 +59,51 @@ public static class Saturn
IPBin ipbin = Marshal.ByteArrayToStructureLittleEndian<IPBin>(ipbin_sector);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.maker_id = \"{0}\"",
Encoding.ASCII.GetString(ipbin.maker_id));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.product_no = \"{0}\"",
Encoding.ASCII.GetString(ipbin.product_no));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.product_version = \"{0}\"",
Encoding.ASCII.GetString(ipbin.product_version));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.release_date = \"{0}\"",
Encoding.ASCII.GetString(ipbin.release_date));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.saturn_media = \"{0}\"",
Encoding.ASCII.GetString(ipbin.saturn_media));
AaruConsole.Debug(MODULE_NAME, "saturn_ipbin.disc_no = {0}", (char)ipbin.disc_no);
AaruLogging.Debug(MODULE_NAME, "saturn_ipbin.disc_no = {0}", (char)ipbin.disc_no);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.disc_no_separator = \"{0}\"",
(char)ipbin.disc_no_separator);
AaruConsole.Debug(MODULE_NAME, "saturn_ipbin.disc_total_nos = {0}", (char)ipbin.disc_total_nos);
AaruLogging.Debug(MODULE_NAME, "saturn_ipbin.disc_total_nos = {0}", (char)ipbin.disc_total_nos);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.release_date = \"{0}\"",
Encoding.ASCII.GetString(ipbin.release_date));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.spare_space1 = \"{0}\"",
Encoding.ASCII.GetString(ipbin.spare_space1));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.region_codes = \"{0}\"",
Encoding.ASCII.GetString(ipbin.region_codes));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.peripherals = \"{0}\"",
Encoding.ASCII.GetString(ipbin.peripherals));
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"saturn_ipbin.product_name = \"{0}\"",
Encoding.ASCII.GetString(ipbin.product_name));

18
Aaru.Decryption/DVD/Dump.cs
View File

@@ -73,7 +73,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.REPORT_ASF_AGID_1_Sense_2_Last_Error_3_took_0_ms,
duration,
Agid,
@@ -105,7 +105,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.REPORT_ASF_AGID_1_Sense_2_Last_Error_3_took_0_ms,
duration,
Agid,
@@ -137,7 +137,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.INVALIDATE_AGID_AGID_1_Sense_2_Last_Error_3_took_0_ms,
duration,
Agid,
@@ -169,7 +169,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.REPORT_AGID_CSS_CPPM_AGID_1_Sense_2_Last_Error_3_took_0_ms,
duration,
Agid,
@@ -201,7 +201,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.REPORT_KEY1_AGID_1_Sense_2_Last_Error_3_took_0_ms,
duration,
Agid,
@@ -233,7 +233,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.REPORT_CHALLENGE_AGID_1_Sense_2_Last_Error_3_took_0_ms,
duration,
Agid,
@@ -278,7 +278,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SEND_CHALLENGE_AGID_1_Challenge_2_Sense_3_Last_Error_4_took_0_ms,
duration,
Agid,
@@ -319,7 +319,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.SEND_CHALLENGE_AGID_1_KEY2_2_Sense_3_Last_Error_4_took_0_ms,
duration,
Agid,
@@ -493,7 +493,7 @@ public sealed class Dump(Device dev)
dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
Localization.GET_TITLE_KEY_AGID_1_LBA_2_Sense_3_took_0_ms,
duration,
Agid,

16
Aaru.Devices/Device/AtaCommands/Ata28.cs
View File

@@ -67,7 +67,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_BUFFER_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_BUFFER_took_0_ms, duration);
return sense;
}
@@ -100,7 +100,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_BUFFER_DMA_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_BUFFER_DMA_took_0_ms, duration);
return sense;
}
@@ -155,7 +155,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration);
return sense;
}
@@ -200,7 +200,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration);
return sense;
}
@@ -245,7 +245,7 @@ public partial class Device
lba += statusRegisters.LbaLow;
}
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_took_0_ms, duration);
return sense;
}
@@ -300,7 +300,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration);
return sense;
}
@@ -355,7 +355,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration);
return sense;
}
@@ -393,7 +393,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration);
return sense;
}

14
Aaru.Devices/Device/AtaCommands/Ata48.cs
View File

@@ -80,7 +80,7 @@ public partial class Device
statusRegisters.LbaLowPrevious);
}
AaruConsole.Debug(ATA_MODULE_NAME, Localization.GET_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.GET_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration);
return sense;
}
@@ -124,7 +124,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_DMA_EXT_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_DMA_EXT_took_0_ms, duration);
return sense;
}
@@ -164,7 +164,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_LOG_EXT_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_LOG_EXT_took_0_ms, duration);
return sense;
}
@@ -204,7 +204,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_LOG_DMA_EXT_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_LOG_DMA_EXT_took_0_ms, duration);
return sense;
}
@@ -251,7 +251,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_EXT_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_EXT_took_0_ms, duration);
return sense;
}
@@ -300,7 +300,7 @@ public partial class Device
statusRegisters.LbaLowPrevious);
}
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration);
return sense;
}
@@ -344,7 +344,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_EXT_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_EXT_took_0_ms, duration);
return sense;
}

20
Aaru.Devices/Device/AtaCommands/AtaCHS.cs
View File

@@ -94,7 +94,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, "IDENTIFY DEVICE took {0} ms.", duration);
AaruLogging.Debug(ATA_MODULE_NAME, "IDENTIFY DEVICE took {0} ms.", duration);
return sense;
}
@@ -151,7 +151,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration);
return sense;
}
@@ -196,7 +196,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration);
return sense;
}
@@ -253,7 +253,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration);
return sense;
}
@@ -310,7 +310,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration);
return sense;
}
@@ -349,7 +349,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration);
return sense;
}
@@ -402,7 +402,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SET_FEATURES_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SET_FEATURES_took_0_ms, duration);
return sense;
}
@@ -433,7 +433,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.DOOR_LOCK_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.DOOR_LOCK_took_0_ms, duration);
return sense;
}
@@ -464,7 +464,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.DOOR_UNLOCK_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.DOOR_UNLOCK_took_0_ms, duration);
return sense;
}
@@ -495,7 +495,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.MEDIA_EJECT_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.MEDIA_EJECT_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/AtaCommands/Atapi.cs
View File

@@ -89,7 +89,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.IDENTIFY_PACKET_DEVICE_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.IDENTIFY_PACKET_DEVICE_took_0_ms, duration);
return sense;
}

6
Aaru.Devices/Device/AtaCommands/Cfa.cs
View File

@@ -72,7 +72,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration);
return sense;
}
@@ -112,7 +112,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration);
return sense;
}
@@ -147,7 +147,7 @@ public partial class Device
errorCode = statusRegisters.Error;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.CFA_REQUEST_EXTENDED_ERROR_CODE_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.CFA_REQUEST_EXTENDED_ERROR_CODE_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/AtaCommands/MCPT.cs
View File

@@ -90,7 +90,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.CHECK_MEDIA_CARD_TYPE_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.CHECK_MEDIA_CARD_TYPE_took_0_ms, duration);
return sense;
}

16
Aaru.Devices/Device/AtaCommands/Smart.cs
View File

@@ -66,7 +66,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_DISABLE_OPERATIONS_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SMART_DISABLE_OPERATIONS_took_0_ms, duration);
return sense;
}
@@ -102,7 +102,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_ENABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SMART_ENABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration);
return sense;
}
@@ -137,7 +137,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_DISABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SMART_DISABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration);
return sense;
}
@@ -171,7 +171,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_ENABLE_OPERATIONS_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SMART_ENABLE_OPERATIONS_took_0_ms, duration);
return sense;
}
@@ -208,7 +208,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_EXECUTE_OFF_LINE_IMMEDIATE_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SMART_EXECUTE_OFF_LINE_IMMEDIATE_took_0_ms, duration);
return sense;
}
@@ -244,7 +244,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_READ_DATA_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SMART_READ_DATA_took_0_ms, duration);
return sense;
}
@@ -282,7 +282,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_READ_LOG_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SMART_READ_LOG_took_0_ms, duration);
return sense;
}
@@ -316,7 +316,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_RETURN_STATUS_took_0_ms, duration);
AaruLogging.Debug(ATA_MODULE_NAME, Localization.SMART_RETURN_STATUS_took_0_ms, duration);
return sense;
}

4
Aaru.Devices/Device/List.cs
View File

@@ -116,7 +116,7 @@ public partial class Device
if(aaruUri.Scheme != "aaru" && aaruUri.Scheme != "dic")
{
AaruConsole.Error(Localization.Invalid_remote_URI);
AaruLogging.Error(Localization.Invalid_remote_URI);
return [];
}
@@ -134,7 +134,7 @@ public partial class Device
}
catch(Exception)
{
AaruConsole.Error(Localization.Error_connecting_to_host);
AaruLogging.Error(Localization.Error_connecting_to_host);
return [];
}

20
Aaru.Devices/Device/MmcCommands/MMC.cs
View File

@@ -68,7 +68,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_CSD_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.SEND_CSD_took_0_ms, duration);
return sense;
}
@@ -98,7 +98,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_CID_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.SEND_CID_took_0_ms, duration);
return sense;
}
@@ -128,7 +128,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_OP_COND_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.SEND_OP_COND_took_0_ms, duration);
return sense;
}
@@ -158,7 +158,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_EXT_CSD_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.SEND_EXT_CSD_took_0_ms, duration);
return sense;
}
@@ -188,7 +188,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME, Localization.SET_BLOCKLEN_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.SET_BLOCKLEN_took_0_ms, duration);
return sense;
}
@@ -277,7 +277,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME, Localization.READ_SINGLE_BLOCK_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.READ_SINGLE_BLOCK_took_0_ms, duration);
return sense;
}
@@ -319,7 +319,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME,
AaruLogging.Debug(MMC_MODULE_NAME,
transferLength > 1
? Localization.READ_MULTIPLE_BLOCK_took_0_ms
: Localization.READ_SINGLE_BLOCK_took_0_ms,
@@ -378,7 +378,7 @@ public partial class Device
Array.Copy(blockBuffer, 0, buffer, i * blockSize, blockSize);
}
AaruConsole.Debug(MMC_MODULE_NAME, Localization.Multiple_READ_SINGLE_BLOCKs_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.Multiple_READ_SINGLE_BLOCKs_took_0_ms, duration);
return sense;
}
@@ -408,7 +408,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_STATUS_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.SEND_STATUS_took_0_ms, duration);
return sense;
}
@@ -473,7 +473,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(MMC_MODULE_NAME, Localization.READ_MULTIPLE_BLOCK_took_0_ms, duration);
AaruLogging.Debug(MMC_MODULE_NAME, Localization.READ_MULTIPLE_BLOCK_took_0_ms, duration);
buffer = commands[1].buffer;
response = commands[1].response;

6
Aaru.Devices/Device/MmcCommands/SecureDigital.cs
View File

@@ -61,7 +61,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SD_MODULE_NAME, Localization.SD_STATUS_took_0_ms, duration);
AaruLogging.Debug(SD_MODULE_NAME, Localization.SD_STATUS_took_0_ms, duration);
return sense;
}
@@ -91,7 +91,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SD_MODULE_NAME, Localization.SD_SEND_OP_COND_took_0_ms, duration);
AaruLogging.Debug(SD_MODULE_NAME, Localization.SD_SEND_OP_COND_took_0_ms, duration);
return sense;
}
@@ -121,7 +121,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SD_MODULE_NAME, Localization.SEND_SCR_took_0_ms, duration);
AaruLogging.Debug(SD_MODULE_NAME, Localization.SEND_SCR_took_0_ms, duration);
return sense;
}

10
Aaru.Devices/Device/ScsiCommands/Adaptec.cs
View File

@@ -81,7 +81,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_TRANSLATE_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_TRANSLATE_took_0_ms, duration);
return sense;
}
@@ -126,7 +126,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_SET_ERROR_THRESHOLD_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_SET_ERROR_THRESHOLD_took_0_ms, duration);
return sense;
}
@@ -168,7 +168,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_RESET_USAGE_COUNTER_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_RESET_USAGE_COUNTER_took_0_ms, duration);
return sense;
}
@@ -198,7 +198,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_WRITE_DATA_BUFFER_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_WRITE_DATA_BUFFER_took_0_ms, duration);
return sense;
}
@@ -226,7 +226,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_DATA_BUFFER_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_DATA_BUFFER_took_0_ms, duration);
return sense;
}

4
Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
View File

@@ -67,7 +67,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.ARCHIVE_CORP_REQUEST_BLOCK_ADDRESS_took_0_ms,
duration);
@@ -112,7 +112,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ARCHIVE_CORP_SEEK_BLOCK_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.ARCHIVE_CORP_SEEK_BLOCK_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/ScsiCommands/Certance.cs
View File

@@ -77,7 +77,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.CERTANCE_PARK_UNPARK_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.CERTANCE_PARK_UNPARK_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
View File

@@ -107,7 +107,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.FUJITSU_DISPLAY_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.FUJITSU_DISPLAY_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
View File

@@ -87,7 +87,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.HL_DT_ST_READ_DVD_RAW_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.HL_DT_ST_READ_DVD_RAW_took_0_ms, duration);
if(!CheckSectorNumber(buffer, lba, transferLength, layerbreak, otp)) return true;

2
Aaru.Devices/Device/ScsiCommands/HP.cs
View File

@@ -100,7 +100,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.HP_READ_LONG_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.HP_READ_LONG_took_0_ms, duration);
return sense;
}

8
Aaru.Devices/Device/ScsiCommands/Kreon.cs
View File

@@ -63,7 +63,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.KREON_DEPRECATED_UNLOCK_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.KREON_DEPRECATED_UNLOCK_took_0_ms, duration);
return sense;
}
@@ -120,7 +120,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.KREON_SET_LOCK_STATE_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.KREON_SET_LOCK_STATE_took_0_ms, duration);
return sense || Error;
}
@@ -154,7 +154,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.KREON_GET_FEATURE_LIST_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.KREON_GET_FEATURE_LIST_took_0_ms, duration);
if(sense) return true;
@@ -251,7 +251,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.KREON_EXTRACT_SS_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.KREON_EXTRACT_SS_took_0_ms, duration);
return sense || Error;
}

2
Aaru.Devices/Device/ScsiCommands/LiteOn.cs
View File

@@ -91,7 +91,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.LiteOn_READ_DVD_RAW_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.LiteOn_READ_DVD_RAW_took_0_ms, duration);
return sense;
}

26
Aaru.Devices/Device/ScsiCommands/MMC.cs
View File

@@ -118,7 +118,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.GET_CONFIGURATION_Starting_Feature_Number_1_Return_Type_2_Sense_3_Last_Error_4_took_0_ms,
duration,
@@ -205,7 +205,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.READ_DISC_STRUCTURE_Media_Type_1_Address_2_Layer_Number_3_Format_4_AGID_5_Sense_6_Last_Error_7_took_0_ms,
duration,
@@ -343,7 +343,7 @@ public partial class Device
{
Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.READ_TOC_PMA_ATIP_took_MSF_1_Format_2_Track_Session_Number_3_Sense_4_LastError_5_0_ms,
duration,
@@ -370,7 +370,7 @@ public partial class Device
duration += tmpDuration;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.READ_TOC_PMA_ATIP_took_MSF_1_Format_2_Track_Session_Number_3_Sense_4_LastError_5_0_ms,
duration,
@@ -432,7 +432,7 @@ public partial class Device
buffer = new byte[strctLength];
Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.READ_DISC_INFORMATION_Data_Type_1_Sense_2_Last_Error_3_took_0_ms,
duration,
dataType,
@@ -505,7 +505,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.READ_CD_LBA_1_Block_Size_2_Transfer_Length_3_Expected_Sector_Type_4_DAP_5_Relative_Address_6_Sync_7_Headers_8_User_Data_9_ECC_EDC_10_C2_11_Subchannel_12_Sense_13_Last_Error_14_took_0_ms,
duration,
@@ -588,7 +588,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.READ_CD_MSF_Start_MSF_1_End_MSF_2_Block_Size_3_Expected_Sector_Type_4_DAP_5_Sync_6_Headers_7_User_Data_8_ECC_EDC_9_C2_10_Subchannel_11_Sense_12_LastError_13_took_0_ms,
duration,
@@ -655,7 +655,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.PREVENT_ALLOW_MEDIUM_REMOVAL_Persistent_1_Prevent_2_Sense_3_LastError_4_took_0_ms,
duration,
@@ -745,7 +745,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.START_STOP_UNIT_Immediate_1_FormatLayer_2_Power_Conditions_3_Change_Format_Layer_4_Load_Eject_5_Start_6_Sense_7_Last_Error_8_took_0_ms,
duration,
@@ -794,7 +794,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.READ_READ_SUB_CHANNEL_MCN_Sense_1_Last_Error_2_took_0_ms,
duration,
sense,
@@ -841,7 +841,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.READ_READ_SUB_CHANNEL_ISRC_Track_Number_1_Sense_2_Last_Error_3_took_0_ms,
duration,
@@ -886,7 +886,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.SET_CD_SPEED_Rotational_Control_1_Read_Speed_2_Write_Speed_3_Sense_4_Last_Error_5_took_0_ms,
duration,
@@ -936,7 +936,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.READ_TRACK_INFORMATION_Data_Type_1_Sense_2_Last_Error_3_took_0_ms,
duration,
type,

2
Aaru.Devices/Device/ScsiCommands/MediaTek.cs
View File

@@ -72,7 +72,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MediaTek_READ_DRAM_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MediaTek_READ_DRAM_took_0_ms, duration);
return sense;
}

12
Aaru.Devices/Device/ScsiCommands/MiniDisc.cs
View File

@@ -69,7 +69,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_DTOC_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_DTOC_took_0_ms, duration);
return sense;
}
@@ -109,7 +109,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_UTOC_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_UTOC_took_0_ms, duration);
return sense;
}
@@ -143,7 +143,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_command_D5h_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_command_D5h_took_0_ms, duration);
return sense;
}
@@ -173,7 +173,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_STOP_PLAY_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_STOP_PLAY_took_0_ms, duration);
return sense;
}
@@ -207,7 +207,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_POSITION_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_POSITION_took_0_ms, duration);
return sense;
}
@@ -241,7 +241,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_GET_TYPE_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_GET_TYPE_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/ScsiCommands/NEC.cs
View File

@@ -70,7 +70,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.NEC_READ_CD_DA_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.NEC_READ_CD_DA_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/ScsiCommands/Optical.cs
View File

@@ -108,7 +108,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MEDIUM_SCAN_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MEDIUM_SCAN_took_0_ms, duration);
if(Error) return sense;

6
Aaru.Devices/Device/ScsiCommands/Pioneer.cs
View File

@@ -74,7 +74,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_took_0_ms, duration);
return sense;
}
@@ -117,7 +117,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_MSF_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_MSF_took_0_ms, duration);
return sense;
}
@@ -176,7 +176,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_XA_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_XA_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/ScsiCommands/Plasmon.cs
View File

@@ -114,7 +114,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLASMON_READ_SECTOR_LOCATION_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLASMON_READ_SECTOR_LOCATION_took_0_ms, duration);
return sense;
}

30
Aaru.Devices/Device/ScsiCommands/Plextor.cs
View File

@@ -76,7 +76,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization
.Plextor_READ_CD_DA_LBA_1_Block_Size_2_Transfer_Length_3_Subchannel_4_Sense_5_Last_Error_6_took_0_ms,
duration,
@@ -124,7 +124,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Plextor_READ_DVD_RAW_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.Plextor_READ_DVD_RAW_took_0_ms, duration);
return sense;
}
@@ -154,7 +154,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
return sense;
}
@@ -184,7 +184,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
return sense;
}
@@ -220,7 +220,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
return sense;
}
@@ -257,7 +257,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration);
if(sense || Error) return sense;
@@ -299,7 +299,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration);
if(sense || Error) return sense;
@@ -337,7 +337,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SILENT_MODE_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SILENT_MODE_took_0_ms, duration);
return sense;
}
@@ -369,7 +369,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_GIGAREC_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_GIGAREC_took_0_ms, duration);
return sense;
}
@@ -408,7 +408,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_VARIREC_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_VARIREC_took_0_ms, duration);
return sense;
}
@@ -439,7 +439,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SECUREC_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SECUREC_took_0_ms, duration);
return sense;
}
@@ -471,7 +471,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SPEEDREAD_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SPEEDREAD_took_0_ms, duration);
return sense;
}
@@ -503,7 +503,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME,
AaruLogging.Debug(SCSI_MODULE_NAME,
Localization.PLEXTOR_GET_SINGLE_SESSION_HIDE_CD_R_took_0_ms,
duration);
@@ -544,7 +544,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_BOOK_BITSETTING_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_BOOK_BITSETTING_took_0_ms, duration);
return sense;
}
@@ -576,7 +576,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_TEST_WRITE_DVD_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_TEST_WRITE_DVD_took_0_ms, duration);
return sense;
}

16
Aaru.Devices/Device/ScsiCommands/SBC.cs
View File

@@ -82,7 +82,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration);
return sense;
}
@@ -146,7 +146,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_10_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_10_took_0_ms, duration);
return sense;
}
@@ -215,7 +215,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_12_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_12_took_0_ms, duration);
return sense;
}
@@ -286,7 +286,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration);
return sense;
}
@@ -335,7 +335,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_LONG_10_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_LONG_10_took_0_ms, duration);
return sense;
}
@@ -386,7 +386,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_LONG_16_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_LONG_16_took_0_ms, duration);
return sense;
}
@@ -417,7 +417,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SEEK_6_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.SEEK_6_took_0_ms, duration);
return sense;
}
@@ -449,7 +449,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SEEK_10_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.SEEK_10_took_0_ms, duration);
return sense;
}

2
Aaru.Devices/Device/ScsiCommands/SMC.cs
View File

@@ -102,7 +102,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_ATTRIBUTE_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_ATTRIBUTE_took_0_ms, duration);
return sense;
}

24
Aaru.Devices/Device/ScsiCommands/SPC.cs
View File

@@ -108,7 +108,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration);
return sense;
}
@@ -191,7 +191,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration);
return sense;
}
@@ -219,7 +219,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.TEST_UNIT_READY_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.TEST_UNIT_READY_took_0_ms, duration);
return sense;
}
@@ -302,7 +302,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MODE_SENSE_6_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MODE_SENSE_6_took_0_ms, duration);
return sense;
}
@@ -396,7 +396,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MODE_SENSE_10_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MODE_SENSE_10_took_0_ms, duration);
return sense;
}
@@ -454,7 +454,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PREVENT_ALLOW_MEDIUM_REMOVAL_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.PREVENT_ALLOW_MEDIUM_REMOVAL_took_0_ms, duration);
return sense;
}
@@ -508,7 +508,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_CAPACITY_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_CAPACITY_took_0_ms, duration);
return sense;
}
@@ -569,7 +569,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_CAPACITY_16_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_CAPACITY_16_took_0_ms, duration);
return sense;
}
@@ -623,7 +623,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_MEDIA_SERIAL_NUMBER_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_MEDIA_SERIAL_NUMBER_took_0_ms, duration);
return sense;
}
@@ -795,7 +795,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MODE_SELECT_6_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MODE_SELECT_6_took_0_ms, duration);
return sense;
}
@@ -853,7 +853,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MODE_SELECT_10_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.MODE_SELECT_10_took_0_ms, duration);
return sense;
}
@@ -890,7 +890,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.REQUEST_SENSE_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.REQUEST_SENSE_took_0_ms, duration);
return sense;
}

28
Aaru.Devices/Device/ScsiCommands/SSC.cs
View File

@@ -99,7 +99,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.LOAD_UNLOAD_6_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.LOAD_UNLOAD_6_took_0_ms, duration);
return sense;
}
@@ -187,7 +187,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.LOCATE_10_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.LOCATE_10_took_0_ms, duration);
return sense;
}
@@ -292,7 +292,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.LOCATE_16_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.LOCATE_16_took_0_ms, duration);
return sense;
}
@@ -371,7 +371,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration);
return sense;
}
@@ -490,7 +490,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration);
return sense;
}
@@ -518,7 +518,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_BLOCK_LIMITS_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_BLOCK_LIMITS_took_0_ms, duration);
return sense;
}
@@ -606,7 +606,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_POSITION_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_POSITION_took_0_ms, duration);
return sense;
}
@@ -686,7 +686,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_REVERSE_6_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_REVERSE_6_took_0_ms, duration);
return sense;
}
@@ -841,7 +841,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_REVERSE_16_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.READ_REVERSE_16_took_0_ms, duration);
return sense;
}
@@ -911,7 +911,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.RECOVER_BUFFERED_DATA_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.RECOVER_BUFFERED_DATA_took_0_ms, duration);
return sense;
}
@@ -985,7 +985,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.REPORT_DENSITY_SUPPORT_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.REPORT_DENSITY_SUPPORT_took_0_ms, duration);
return sense;
}
@@ -1022,7 +1022,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.REWIND_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.REWIND_took_0_ms, duration);
return sense;
}
@@ -1052,7 +1052,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.TRACK_SELECT_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.TRACK_SELECT_took_0_ms, duration);
return sense;
}
@@ -1087,7 +1087,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SPACE_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.SPACE_took_0_ms, duration);
return sense;
}

4
Aaru.Devices/Device/ScsiCommands/SyQuest.cs
View File

@@ -130,7 +130,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SYQUEST_READ_6_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.SYQUEST_READ_6_took_0_ms, duration);
return sense;
}
@@ -218,7 +218,7 @@ public partial class Device
Error = LastError != 0;
AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SYQUEST_READ_10_took_0_ms, duration);
AaruLogging.Debug(SCSI_MODULE_NAME, Localization.SYQUEST_READ_10_took_0_ms, duration);
return sense;
}

200
Aaru.Devices/Remote/Remote.cs
View File

@@ -76,7 +76,7 @@ public class Remote : IDisposable
if(ipAddress is null)
{
AaruConsole.Error(Localization.Host_not_found);
AaruLogging.Error(Localization.Host_not_found);
throw new SocketException(11001);
}
@@ -86,7 +86,7 @@ public class Remote : IDisposable
_socket.Connect(ipEndPoint);
AaruConsole.WriteLine(Localization.Connected_to_0, uri.Host);
AaruLogging.WriteLine(Localization.Connected_to_0, uri.Host);
byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
@@ -94,7 +94,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
throw new IOException();
}
@@ -103,7 +103,7 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
throw new ArgumentException();
}
@@ -114,7 +114,7 @@ public class Remote : IDisposable
{
if(hdr.packetType != AaruPacketType.Nop)
{
AaruConsole.Error(Localization.Expected_Hello_Packet_got_packet_type_0, hdr.packetType);
AaruLogging.Error(Localization.Expected_Hello_Packet_got_packet_type_0, hdr.packetType);
throw new ArgumentException();
}
@@ -124,21 +124,21 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
throw new IOException();
}
AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
AaruConsole.Error($"{nop.reason}");
AaruLogging.Error($"{nop.reason}");
throw new ArgumentException();
}
if(hdr.version != Consts.PACKET_VERSION)
{
AaruConsole.Error(Localization.Unrecognized_packet_version);
AaruLogging.Error(Localization.Unrecognized_packet_version);
throw new ArgumentException();
}
@@ -148,7 +148,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
throw new IOException();
}
@@ -186,7 +186,7 @@ public class Remote : IDisposable
if(len >= buf.Length) return;
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
throw new IOException();
}
@@ -232,7 +232,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return false;
}
@@ -243,7 +243,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -252,14 +252,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return false;
}
if(hdr.packetType != AaruPacketType.ResponseAmIRoot)
{
AaruConsole.Error(Localization
AaruLogging.Error(Localization
.Remote_IsRoot_Expected_Am_I_Root_Response_Packet_got_packet_type_0,
hdr.packetType);
@@ -271,7 +271,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -325,7 +325,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return [];
}
@@ -336,7 +336,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return [];
}
@@ -345,7 +345,7 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return [];
}
@@ -354,7 +354,7 @@ public class Remote : IDisposable
{
if(hdr.packetType != AaruPacketType.Nop)
{
AaruConsole.Error(Localization
AaruLogging.Error(Localization
.Remote_ListDevices_Expected_List_Devices_Response_Packet_got_packet_type_0,
hdr.packetType);
@@ -366,21 +366,21 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return [];
}
AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
AaruConsole.Error($"{nop.reason}");
AaruLogging.Error($"{nop.reason}");
return [];
}
if(hdr.version != Consts.PACKET_VERSION)
{
AaruConsole.Error(Localization.Unrecognized_packet_version);
AaruLogging.Error(Localization.Unrecognized_packet_version);
return [];
}
@@ -390,7 +390,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return [];
}
@@ -444,7 +444,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
lastError = -1;
return false;
@@ -456,7 +456,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
lastError = -1;
return false;
@@ -466,7 +466,7 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
lastError = -1;
return false;
@@ -474,7 +474,7 @@ public class Remote : IDisposable
if(hdr.packetType != AaruPacketType.Nop)
{
AaruConsole.Error(Localization
AaruLogging.Error(Localization
.Remote_ListDevices_Expected_List_Devices_Response_Packet_got_packet_type_0,
hdr.packetType);
@@ -488,7 +488,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
lastError = -1;
return false;
@@ -504,7 +504,7 @@ public class Remote : IDisposable
throw new NotImplementedException($"{nop.reason}");
}
AaruConsole.Error($"{nop.reason}");
AaruLogging.Error($"{nop.reason}");
lastError = nop.errno;
return false;
@@ -562,7 +562,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return -1;
}
@@ -573,7 +573,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -582,14 +582,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return -1;
}
if(hdr.packetType != AaruPacketType.ResponseScsi)
{
AaruConsole.Error(Localization.Expected_SCSI_Response_Packet_got_packet_type_0, hdr.packetType);
AaruLogging.Error(Localization.Expected_SCSI_Response_Packet_got_packet_type_0, hdr.packetType);
return -1;
}
@@ -599,7 +599,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -669,7 +669,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return -1;
}
@@ -680,7 +680,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -689,14 +689,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return -1;
}
if(hdr.packetType != AaruPacketType.ResponseAtaChs)
{
AaruConsole.Error(Localization.Expected_ATA_CHS_Response_Packet_got_packet_type_0, hdr.packetType);
AaruLogging.Error(Localization.Expected_ATA_CHS_Response_Packet_got_packet_type_0, hdr.packetType);
return -1;
}
@@ -706,7 +706,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -775,7 +775,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return -1;
}
@@ -786,7 +786,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -795,14 +795,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return -1;
}
if(hdr.packetType != AaruPacketType.ResponseAtaLba28)
{
AaruConsole.Error(Localization.Expected_ATA_LBA28_Response_Packet_got_packet_type_0,
AaruLogging.Error(Localization.Expected_ATA_LBA28_Response_Packet_got_packet_type_0,
hdr.packetType);
return -1;
@@ -813,7 +813,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -882,7 +882,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return -1;
}
@@ -893,7 +893,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -902,14 +902,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return -1;
}
if(hdr.packetType != AaruPacketType.ResponseAtaLba48)
{
AaruConsole.Error(Localization.Expected_ATA_LBA48_Response_Packet_got_packet_type_0,
AaruLogging.Error(Localization.Expected_ATA_LBA48_Response_Packet_got_packet_type_0,
hdr.packetType);
return -1;
@@ -920,7 +920,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -995,7 +995,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return -1;
}
@@ -1006,7 +1006,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -1015,14 +1015,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return -1;
}
if(hdr.packetType != AaruPacketType.ResponseSdhci)
{
AaruConsole.Error(Localization.Expected_SDHCI_Response_Packet_got_packet_type_0, hdr.packetType);
AaruLogging.Error(Localization.Expected_SDHCI_Response_Packet_got_packet_type_0, hdr.packetType);
return -1;
}
@@ -1032,7 +1032,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -1076,7 +1076,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return DeviceType.Unknown;
}
@@ -1087,7 +1087,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return DeviceType.Unknown;
}
@@ -1096,14 +1096,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return DeviceType.Unknown;
}
if(hdr.packetType != AaruPacketType.ResponseGetType)
{
AaruConsole.Error(Localization.Expected_Device_Type_Response_Packet_got_packet_type_0,
AaruLogging.Error(Localization.Expected_Device_Type_Response_Packet_got_packet_type_0,
hdr.packetType);
return DeviceType.Unknown;
@@ -1114,7 +1114,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return DeviceType.Unknown;
}
@@ -1155,7 +1155,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return false;
}
@@ -1166,7 +1166,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1175,14 +1175,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return false;
}
if(hdr.packetType != AaruPacketType.ResponseGetSdhciRegisters)
{
AaruConsole.Error(Localization.Expected_Device_Type_Response_Packet_got_packet_type_0,
AaruLogging.Error(Localization.Expected_Device_Type_Response_Packet_got_packet_type_0,
hdr.packetType);
return false;
@@ -1193,7 +1193,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1281,7 +1281,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return false;
}
@@ -1292,7 +1292,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1301,14 +1301,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return false;
}
if(hdr.packetType != AaruPacketType.ResponseGetUsbData)
{
AaruConsole.Error(Localization.Expected_USB_Data_Response_Packet_got_packet_type_0,
AaruLogging.Error(Localization.Expected_USB_Data_Response_Packet_got_packet_type_0,
hdr.packetType);
return false;
@@ -1319,7 +1319,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1373,7 +1373,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return false;
}
@@ -1384,7 +1384,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1393,14 +1393,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return false;
}
if(hdr.packetType != AaruPacketType.ResponseGetFireWireData)
{
AaruConsole.Error(Localization.Expected_FireWire_Data_Response_Packet_got_packet_type_0,
AaruLogging.Error(Localization.Expected_FireWire_Data_Response_Packet_got_packet_type_0,
hdr.packetType);
return false;
@@ -1411,7 +1411,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1454,7 +1454,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return false;
}
@@ -1465,7 +1465,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1474,14 +1474,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return false;
}
if(hdr.packetType != AaruPacketType.ResponseGetPcmciaData)
{
AaruConsole.Error(Localization.Expected_PCMCIA_Data_Response_Packet_got_packet_type_0,
AaruLogging.Error(Localization.Expected_PCMCIA_Data_Response_Packet_got_packet_type_0,
hdr.packetType);
return false;
@@ -1492,7 +1492,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1629,7 +1629,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return -1;
}
@@ -1640,7 +1640,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -1649,14 +1649,14 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return -1;
}
if(hdr.packetType != AaruPacketType.ResponseMultiSdhci)
{
AaruConsole.Error(Localization.Expected_multi_MMC_SD_command_Response_Packet_got_packet_type_0,
AaruLogging.Error(Localization.Expected_multi_MMC_SD_command_Response_Packet_got_packet_type_0,
hdr.packetType);
return -1;
@@ -1667,7 +1667,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return -1;
}
@@ -1676,7 +1676,7 @@ public class Remote : IDisposable
if(res.cmd_count != (ulong)commands.Length)
{
AaruConsole.Error(Localization.Expected_the_response_to_0_SD_MMC_commands_but_got_1_responses,
AaruLogging.Error(Localization.Expected_the_response_to_0_SD_MMC_commands_but_got_1_responses,
commands.Length,
res.cmd_count);
@@ -1776,7 +1776,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return false;
}
@@ -1787,7 +1787,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1796,21 +1796,21 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return false;
}
if(hdr.packetType != AaruPacketType.Nop)
{
AaruConsole.Error(Localization.Expected_NOP_Packet_got_packet_type_0, hdr.packetType);
AaruLogging.Error(Localization.Expected_NOP_Packet_got_packet_type_0, hdr.packetType);
return false;
}
if(hdr.version != Consts.PACKET_VERSION)
{
AaruConsole.Error(Localization.Unrecognized_packet_version);
AaruLogging.Error(Localization.Unrecognized_packet_version);
return false;
}
@@ -1820,7 +1820,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1833,11 +1833,11 @@ public class Remote : IDisposable
return true;
case AaruNopReason.CloseError:
case AaruNopReason.OpenError:
AaruConsole.Error(Localization.ReOpen_error_closing_device);
AaruLogging.Error(Localization.ReOpen_error_closing_device);
break;
default:
AaruConsole.Error(Localization.ReOpen_error_0_with_reason_1, nop.errno, nop.reason);
AaruLogging.Error(Localization.ReOpen_error_0_with_reason_1, nop.errno, nop.reason);
break;
}
@@ -1878,7 +1878,7 @@ public class Remote : IDisposable
if(len != buf.Length)
{
AaruConsole.Error(Localization.Could_not_write_to_the_network);
AaruLogging.Error(Localization.Could_not_write_to_the_network);
return false;
}
@@ -1889,7 +1889,7 @@ public class Remote : IDisposable
if(len < hdrBuf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1898,21 +1898,21 @@ public class Remote : IDisposable
if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
{
AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
AaruLogging.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
return false;
}
if(hdr.packetType != AaruPacketType.ResponseOsRead)
{
AaruConsole.Error(Localization.Expected_OS_Read_Response_Packet_got_packet_type_0, hdr.packetType);
AaruLogging.Error(Localization.Expected_OS_Read_Response_Packet_got_packet_type_0, hdr.packetType);
return false;
}
if(hdr.version != Consts.PACKET_VERSION)
{
AaruConsole.Error(Localization.Unrecognized_packet_version);
AaruLogging.Error(Localization.Unrecognized_packet_version);
return false;
}
@@ -1922,7 +1922,7 @@ public class Remote : IDisposable
if(len < buf.Length)
{
AaruConsole.Error(Localization.Could_not_read_from_the_network);
AaruLogging.Error(Localization.Could_not_read_from_the_network);
return false;
}
@@ -1933,7 +1933,7 @@ public class Remote : IDisposable
if(osRead.errno != 0)
{
AaruConsole.Error(Localization.Remote_error_0_in_OS_Read, osRead.errno);
AaruLogging.Error(Localization.Remote_error_0_in_OS_Read, osRead.errno);
return false;
}

92
Aaru.Filesystems/Acorn/Info.cs
View File

@@ -74,8 +74,8 @@ public sealed partial class AcornADFS
byte oldChk1 = AcornMapChecksum(sector, 255);
OldMapSector1 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(sector);
AaruConsole.Debug(MODULE_NAME, "oldMap0.checksum = {0}", oldMap0.checksum);
AaruConsole.Debug(MODULE_NAME, "oldChk0 = {0}", oldChk0);
AaruLogging.Debug(MODULE_NAME, "oldMap0.checksum = {0}", oldMap0.checksum);
AaruLogging.Debug(MODULE_NAME, "oldChk0 = {0}", oldChk0);
// According to documentation map1 MUST start on sector 1. On ADFS-D it starts at 0x100, not on sector 1 (0x400)
if(oldMap0.checksum == oldChk0 && oldMap1.checksum != oldChk1 && sector.Length >= 512)
@@ -90,8 +90,8 @@ public sealed partial class AcornADFS
oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(tmp);
}
AaruConsole.Debug(MODULE_NAME, "oldMap1.checksum = {0}", oldMap1.checksum);
AaruConsole.Debug(MODULE_NAME, "oldChk1 = {0}", oldChk1);
AaruLogging.Debug(MODULE_NAME, "oldMap1.checksum = {0}", oldMap1.checksum);
AaruLogging.Debug(MODULE_NAME, "oldChk1 = {0}", oldChk1);
if(oldMap0.checksum == oldChk0 &&
oldMap1.checksum == oldChk1 &&
@@ -118,15 +118,15 @@ public sealed partial class AcornADFS
OldDirectory oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
byte dirChk = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
AaruConsole.Debug(MODULE_NAME, "oldRoot.header.magic at 0x200 = {0}", oldRoot.header.magic);
AaruLogging.Debug(MODULE_NAME, "oldRoot.header.magic at 0x200 = {0}", oldRoot.header.magic);
AaruConsole.Debug(MODULE_NAME, "oldRoot.tail.magic at 0x200 = {0}", oldRoot.tail.magic);
AaruLogging.Debug(MODULE_NAME, "oldRoot.tail.magic at 0x200 = {0}", oldRoot.tail.magic);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"oldRoot.tail.checkByte at 0x200 = {0}",
oldRoot.tail.checkByte);
AaruConsole.Debug(MODULE_NAME, "dirChk at 0x200 = {0}", dirChk);
AaruLogging.Debug(MODULE_NAME, "dirChk at 0x200 = {0}", dirChk);
if(oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC ||
oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC)
@@ -153,15 +153,15 @@ public sealed partial class AcornADFS
oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
dirChk = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
AaruConsole.Debug(MODULE_NAME, "oldRoot.header.magic at 0x400 = {0}", oldRoot.header.magic);
AaruLogging.Debug(MODULE_NAME, "oldRoot.header.magic at 0x400 = {0}", oldRoot.header.magic);
AaruConsole.Debug(MODULE_NAME, "oldRoot.tail.magic at 0x400 = {0}", oldRoot.tail.magic);
AaruLogging.Debug(MODULE_NAME, "oldRoot.tail.magic at 0x400 = {0}", oldRoot.tail.magic);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"oldRoot.tail.checkByte at 0x400 = {0}",
oldRoot.tail.checkByte);
AaruConsole.Debug(MODULE_NAME, "dirChk at 0x400 = {0}", dirChk);
AaruLogging.Debug(MODULE_NAME, "dirChk at 0x400 = {0}", dirChk);
if(oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC ||
oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC)
@@ -177,8 +177,8 @@ public sealed partial class AcornADFS
if(errno != ErrorNumber.NoError) return false;
byte newChk = NewMapChecksum(sector);
AaruConsole.Debug(MODULE_NAME, "newChk = {0}", newChk);
AaruConsole.Debug(MODULE_NAME, "map.zoneChecksum = {0}", sector[0]);
AaruLogging.Debug(MODULE_NAME, "newChk = {0}", newChk);
AaruLogging.Debug(MODULE_NAME, "map.zoneChecksum = {0}", sector[0]);
sbSector = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
sectorsToRead = BOOT_BLOCK_SIZE / imagePlugin.Info.SectorSize;
@@ -197,8 +197,8 @@ public sealed partial class AcornADFS
for(int i = 0; i < 0x1FF; i++) bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
AaruConsole.Debug(MODULE_NAME, "bootChk = {0}", bootChk);
AaruConsole.Debug(MODULE_NAME, "bBlock.checksum = {0}", bootSector[0x1FF]);
AaruLogging.Debug(MODULE_NAME, "bootChk = {0}", bootChk);
AaruLogging.Debug(MODULE_NAME, "bBlock.checksum = {0}", bootSector[0x1FF]);
if(newChk == sector[0] && newChk != 0)
{
@@ -213,12 +213,12 @@ public sealed partial class AcornADFS
else
return false;
AaruConsole.Debug(MODULE_NAME, "drSb.log2secsize = {0}", drSb.log2secsize);
AaruConsole.Debug(MODULE_NAME, "drSb.idlen = {0}", drSb.idlen);
AaruConsole.Debug(MODULE_NAME, "drSb.disc_size_high = {0}", drSb.disc_size_high);
AaruConsole.Debug(MODULE_NAME, "drSb.disc_size = {0}", drSb.disc_size);
AaruLogging.Debug(MODULE_NAME, "drSb.log2secsize = {0}", drSb.log2secsize);
AaruLogging.Debug(MODULE_NAME, "drSb.idlen = {0}", drSb.idlen);
AaruLogging.Debug(MODULE_NAME, "drSb.disc_size_high = {0}", drSb.disc_size_high);
AaruLogging.Debug(MODULE_NAME, "drSb.disc_size = {0}", drSb.disc_size);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"IsNullOrEmpty(drSb.reserved) = {0}",
ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved));
@@ -411,8 +411,8 @@ public sealed partial class AcornADFS
if(errno != ErrorNumber.NoError) return;
byte newChk = NewMapChecksum(sector);
AaruConsole.Debug(MODULE_NAME, "newChk = {0}", newChk);
AaruConsole.Debug(MODULE_NAME, "map.zoneChecksum = {0}", sector[0]);
AaruLogging.Debug(MODULE_NAME, "newChk = {0}", newChk);
AaruLogging.Debug(MODULE_NAME, "map.zoneChecksum = {0}", sector[0]);
sbSector = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
sectorsToRead = BOOT_BLOCK_SIZE / imagePlugin.Info.SectorSize;
@@ -427,8 +427,8 @@ public sealed partial class AcornADFS
for(int i = 0; i < 0x1FF; i++) bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
AaruConsole.Debug(MODULE_NAME, "bootChk = {0}", bootChk);
AaruConsole.Debug(MODULE_NAME, "bBlock.checksum = {0}", bootSector[0x1FF]);
AaruLogging.Debug(MODULE_NAME, "bootChk = {0}", bootChk);
AaruLogging.Debug(MODULE_NAME, "bBlock.checksum = {0}", bootSector[0x1FF]);
if(newChk == sector[0] && newChk != 0)
{
@@ -443,31 +443,31 @@ public sealed partial class AcornADFS
else
return;
AaruConsole.Debug(MODULE_NAME, "drSb.log2secsize = {0}", drSb.log2secsize);
AaruConsole.Debug(MODULE_NAME, "drSb.spt = {0}", drSb.spt);
AaruConsole.Debug(MODULE_NAME, "drSb.heads = {0}", drSb.heads);
AaruConsole.Debug(MODULE_NAME, "drSb.density = {0}", drSb.density);
AaruConsole.Debug(MODULE_NAME, "drSb.idlen = {0}", drSb.idlen);
AaruConsole.Debug(MODULE_NAME, "drSb.log2bpmb = {0}", drSb.log2bpmb);
AaruConsole.Debug(MODULE_NAME, "drSb.skew = {0}", drSb.skew);
AaruConsole.Debug(MODULE_NAME, "drSb.bootoption = {0}", drSb.bootoption);
AaruConsole.Debug(MODULE_NAME, "drSb.lowsector = {0}", drSb.lowsector);
AaruConsole.Debug(MODULE_NAME, "drSb.nzones = {0}", drSb.nzones);
AaruConsole.Debug(MODULE_NAME, "drSb.zone_spare = {0}", drSb.zone_spare);
AaruConsole.Debug(MODULE_NAME, "drSb.root = {0}", drSb.root);
AaruConsole.Debug(MODULE_NAME, "drSb.disc_size = {0}", drSb.disc_size);
AaruConsole.Debug(MODULE_NAME, "drSb.disc_id = {0}", drSb.disc_id);
AaruLogging.Debug(MODULE_NAME, "drSb.log2secsize = {0}", drSb.log2secsize);
AaruLogging.Debug(MODULE_NAME, "drSb.spt = {0}", drSb.spt);
AaruLogging.Debug(MODULE_NAME, "drSb.heads = {0}", drSb.heads);
AaruLogging.Debug(MODULE_NAME, "drSb.density = {0}", drSb.density);
AaruLogging.Debug(MODULE_NAME, "drSb.idlen = {0}", drSb.idlen);
AaruLogging.Debug(MODULE_NAME, "drSb.log2bpmb = {0}", drSb.log2bpmb);
AaruLogging.Debug(MODULE_NAME, "drSb.skew = {0}", drSb.skew);
AaruLogging.Debug(MODULE_NAME, "drSb.bootoption = {0}", drSb.bootoption);
AaruLogging.Debug(MODULE_NAME, "drSb.lowsector = {0}", drSb.lowsector);
AaruLogging.Debug(MODULE_NAME, "drSb.nzones = {0}", drSb.nzones);
AaruLogging.Debug(MODULE_NAME, "drSb.zone_spare = {0}", drSb.zone_spare);
AaruLogging.Debug(MODULE_NAME, "drSb.root = {0}", drSb.root);
AaruLogging.Debug(MODULE_NAME, "drSb.disc_size = {0}", drSb.disc_size);
AaruLogging.Debug(MODULE_NAME, "drSb.disc_id = {0}", drSb.disc_id);
AaruConsole.Debug(MODULE_NAME,
AaruLogging.Debug(MODULE_NAME,
"drSb.disc_name = {0}",
StringHandlers.CToString(drSb.disc_name, encoding));
AaruConsole.Debug(MODULE_NAME, "drSb.disc_type = {0}", drSb.disc_type);
AaruConsole.Debug(MODULE_NAME, "drSb.disc_size_high = {0}", drSb.disc_size_high);
AaruConsole.Debug(MODULE_NAME, "drSb.flags = {0}", drSb.flags);
AaruConsole.Debug(MODULE_NAME, "drSb.nzones_high = {0}", drSb.nzones_high);
AaruConsole.Debug(MODULE_NAME, "drSb.format_version = {0}", drSb.format_version);
AaruConsole.Debug(MODULE_NAME, "drSb.root_size = {0}", drSb.root_size);
AaruLogging.Debug(MODULE_NAME, "drSb.disc_type = {0}", drSb.disc_type);
AaruLogging.Debug(MODULE_NAME, "drSb.disc_size_high = {0}", drSb.disc_size_high);
AaruLogging.Debug(MODULE_NAME, "drSb.flags = {0}", drSb.flags);
AaruLogging.Debug(MODULE_NAME, "drSb.nzones_high = {0}", drSb.nzones_high);
AaruLogging.Debug(MODULE_NAME, "drSb.format_version = {0}", drSb.format_version);
AaruLogging.Debug(MODULE_NAME, "drSb.root_size = {0}", drSb.root_size);
if(drSb.log2secsize is < 8 or > 10) return;

40
Aaru.Filesystems/AmigaDOS/Info.cs
View File

@@ -83,8 +83,8 @@ public sealed partial class AmigaDOSPlugin
sector[4] = sector[5] = sector[6] = sector[7] = 0;
uint bsum = AmigaBootChecksum(sector);
AaruConsole.Debug(MODULE_NAME, "bblk.checksum = 0x{0:X8}", bblk.checksum);
AaruConsole.Debug(MODULE_NAME, "bsum = 0x{0:X8}", bsum);
AaruLogging.Debug(MODULE_NAME, "bblk.checksum = 0x{0:X8}", bblk.checksum);
AaruLogging.Debug(MODULE_NAME, "bsum = 0x{0:X8}", bsum);
ulong bRootPtr = 0;
@@ -92,7 +92,7 @@ public sealed partial class AmigaDOSPlugin
if(bsum == bblk.checksum)
{
bRootPtr = bblk.root_ptr + partition.Start;
AaruConsole.Debug(MODULE_NAME, Localization.Bootblock_points_to_0_as_Rootblock, bRootPtr);
AaruLogging.Debug(MODULE_NAME, Localization.Bootblock_points_to_0_as_Rootblock, bRootPtr);
}
ulong[] rootPtrs =
@@ -108,26 +108,26 @@ public sealed partial class AmigaDOSPlugin
// So to handle even number of sectors
foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
{
AaruConsole.Debug(MODULE_NAME, Localization.Searching_for_Rootblock_in_sector_0, rootPtr);
AaruLogging.Debug(MODULE_NAME, Localization.Searching_for_Rootblock_in_sector_0, rootPtr);
errno = imagePlugin.ReadSector(rootPtr, out sector);
if(errno != ErrorNumber.NoError) continue;
rblk.type = BigEndianBitConverter.ToUInt32(sector, 0x00);
AaruConsole.Debug(MODULE_NAME, "rblk.type = {0}", rblk.type);
AaruLogging.Debug(MODULE_NAME, "rblk.type = {0}", rblk.type);
if(rblk.type != TYPE_HEADER) continue;
rblk.hashTableSize = BigEndianBitConverter.ToUInt32(sector, 0x0C);
AaruConsole.Debug(MODULE_NAME, "rblk.hashTableSize = {0}", rblk.hashTableSize);
AaruLogging.Debug(MODULE_NAME, "rblk.hashTableSize = {0}", rblk.hashTableSize);
uint blockSize = (rblk.hashTableSize + 56) * 4;
uint sectorsPerBlock = (uint)(blockSize / sector.Length);
AaruConsole.Debug(MODULE_NAME, "blockSize = {0}", blockSize);
AaruConsole.Debug(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
AaruLogging.Debug(MODULE_NAME, "blockSize = {0}", blockSize);
AaruLogging.Debug(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
if(blockSize % sector.Length > 0) sectorsPerBlock++;
@@ -142,11 +142,11 @@ public sealed partial class AmigaDOSPlugin
sector[20] = sector[21] = sector[22] = sector[23] = 0;
uint rsum = AmigaChecksum(sector);
AaruConsole.Debug(MODULE_NAME, "rblk.checksum = 0x{0:X8}", rblk.checksum);
AaruConsole.Debug(MODULE_NAME, "rsum = 0x{0:X8}", rsum);
AaruLogging.Debug(MODULE_NAME, "rblk.checksum = 0x{0:X8}", rblk.checksum);
AaruLogging.Debug(MODULE_NAME, "rsum = 0x{0:X8}", rsum);
rblk.sec_type = BigEndianBitConverter.ToUInt32(sector, sector.Length - 4);
AaruConsole.Debug(MODULE_NAME, "rblk.sec_type = {0}", rblk.sec_type);
AaruLogging.Debug(MODULE_NAME, "rblk.sec_type = {0}", rblk.sec_type);
if(rblk.sec_type == SUBTYPE_ROOT && rblk.checksum == rsum) return true;
}
@@ -178,7 +178,7 @@ public sealed partial class AmigaDOSPlugin
if(bsum == bootBlk.checksum)
{
bRootPtr = bootBlk.root_ptr + partition.Start;
AaruConsole.Debug(MODULE_NAME, Localization.Bootblock_points_to_0_as_Rootblock, bRootPtr);
AaruLogging.Debug(MODULE_NAME, Localization.Bootblock_points_to_0_as_Rootblock, bRootPtr);
}
ulong[] rootPtrs =
@@ -198,26 +198,26 @@ public sealed partial class AmigaDOSPlugin
// So to handle even number of sectors
foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
{
AaruConsole.Debug(MODULE_NAME, Localization.Searching_for_Rootblock_in_sector_0, rootPtr);
AaruLogging.Debug(MODULE_NAME, Localization.Searching_for_Rootblock_in_sector_0, rootPtr);
errno = imagePlugin.ReadSector(rootPtr, out rootBlockSector);
if(errno != ErrorNumber.NoError) continue;
rootBlk.type = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x00);
AaruConsole.Debug(MODULE_NAME, "rootBlk.type = {0}", rootBlk.type);
AaruLogging.Debug(MODULE_NAME, "rootBlk.type = {0}", rootBlk.type);
if(rootBlk.type != TYPE_HEADER) continue;
rootBlk.hashTableSize = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x0C);
AaruConsole.Debug(MODULE_NAME, "rootBlk.hashTableSize = {0}", rootBlk.hashTableSize);
AaruLogging.Debug(MODULE_NAME, "rootBlk.hashTableSize = {0}", rootBlk.hashTableSize);
blockSize = (rootBlk.hashTableSize + 56) * 4;
uint sectorsPerBlock = (uint)(blockSize / rootBlockSector.Length);
AaruConsole.Debug(MODULE_NAME, "blockSize = {0}", blockSize);
AaruConsole.Debug(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
AaruLogging.Debug(MODULE_NAME, "blockSize = {0}", blockSize);
AaruLogging.Debug(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
if(blockSize % rootBlockSector.Length > 0) sectorsPerBlock++;
@@ -232,11 +232,11 @@ public sealed partial class AmigaDOSPlugin
rootBlockSector[20] = rootBlockSector[21] = rootBlockSector[22] = rootBlockSector[23] = 0;
uint rsum = AmigaChecksum(rootBlockSector);
AaruConsole.Debug(MODULE_NAME, "rootBlk.checksum = 0x{0:X8}", rootBlk.checksum);
AaruConsole.Debug(MODULE_NAME, "rsum = 0x{0:X8}", rsum);
AaruLogging.Debug(MODULE_NAME, "rootBlk.checksum = 0x{0:X8}", rootBlk.checksum);
AaruLogging.Debug(MODULE_NAME, "rsum = 0x{0:X8}", rsum);
rootBlk.sec_type = BigEndianBitConverter.ToUInt32(rootBlockSector, rootBlockSector.Length - 4);
AaruConsole.Debug(MODULE_NAME, "rootBlk.sec_type = {0}", rootBlk.sec_type);
AaruLogging.Debug(MODULE_NAME, "rootBlk.sec_type = {0}", rootBlk.sec_type);
if(rootBlk.sec_type != SUBTYPE_ROOT || rootBlk.checksum != rsum) continue;

Some files were not shown because too many files have changed in this diff Show More