mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Rename Aaru.Console to Aaru.Logging
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user