aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify naming of AaruConsole methods.

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-17 06:02:59 +01:00
parent 02ec8a05d8
commit 7b0ccf4876
306 changed files with 5049 additions and 5073 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
Aaru.Images/CloneCD/Read.cs
View File

@@ -130,7 +130,7 @@ public sealed partial class CloneCd
{
if(inDisk || inSession || inEntry || inTrack || inCdText)
{
AaruConsole.ErrorWriteLine(string.Format(Localization.Found_CloneCD_out_of_order_in_line_0,
AaruConsole.Error(string.Format(Localization.Found_CloneCD_out_of_order_in_line_0,
lineNumber));
return ErrorNumber.InvalidArgument;
@@ -172,13 +172,13 @@ public sealed partial class CloneCd
if(!ccdVerMatch.Success) continue;
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Version_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_Version_at_line_0, lineNumber);
_imageInfo.Version = ccdVerMatch.Groups["value"].Value;
if(_imageInfo.Version != "2" && _imageInfo.Version != "3")
{
AaruConsole.ErrorWriteLine(Localization
AaruConsole.Error(Localization
.CloneCD_plugin_Warning_Unknown_CCD_image_version_0_may_not_work,
_imageInfo.Version);
}
@@ -193,15 +193,15 @@ public sealed partial class CloneCd
if(discEntMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Found_TocEntries_at_line_0,
lineNumber);
}
else if(discSessMatch.Success)
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Sessions_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_Sessions_at_line_0, lineNumber);
else if(discScrMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Found_DataTracksScrambled_at_line_0,
lineNumber);
@@ -209,13 +209,13 @@ public sealed partial class CloneCd
}
else if(cdtLenMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Found_CDTextLength_at_line_0,
lineNumber);
}
else if(discCatMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Found_Catalog_at_line_0_smallcase,
lineNumber);
@@ -231,13 +231,13 @@ public sealed partial class CloneCd
if(cdtEntsMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Found_CD_Text_Entries_at_line_0,
lineNumber);
}
else if(cdtEntMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Found_CD_Text_Entry_at_line_0,
lineNumber);
@@ -260,13 +260,13 @@ public sealed partial class CloneCd
if(sessPregMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Found_PreGapMode_at_line_0,
lineNumber);
}
else if(sessSubcMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Found_PreGapSubC_at_line_0,
lineNumber);
}
@@ -290,7 +290,7 @@ public sealed partial class CloneCd
if(entSessMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Session_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_Session_at_line_0, lineNumber);
currentEntry.SessionNumber = Convert.ToByte(entSessMatch.Groups["value"].Value, 10);
@@ -300,70 +300,70 @@ public sealed partial class CloneCd
}
else if(entPointMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Point_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_Point_at_line_0, lineNumber);
currentEntry.POINT = Convert.ToByte(entPointMatch.Groups["value"].Value, 16);
}
else if(entAdrMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_ADR_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_ADR_at_line_0, lineNumber);
currentEntry.ADR = Convert.ToByte(entAdrMatch.Groups["value"].Value, 16);
}
else if(entCtrlMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Control_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_Control_at_line_0, lineNumber);
currentEntry.CONTROL = Convert.ToByte(entCtrlMatch.Groups["value"].Value, 16);
}
else if(entTnoMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_TrackNo_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_TrackNo_at_line_0, lineNumber);
currentEntry.TNO = Convert.ToByte(entTnoMatch.Groups["value"].Value, 10);
}
else if(entAMinMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_AMin_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_AMin_at_line_0, lineNumber);
currentEntry.Min = Convert.ToByte(entAMinMatch.Groups["value"].Value, 10);
}
else if(entASecMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_ASec_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_ASec_at_line_0, lineNumber);
currentEntry.Sec = Convert.ToByte(entASecMatch.Groups["value"].Value, 10);
}
else if(entAFrameMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_AFrame_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_AFrame_at_line_0, lineNumber);
currentEntry.Frame = Convert.ToByte(entAFrameMatch.Groups["value"].Value, 10);
}
else if(entAlbaMatch.Success)
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_ALBA_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_ALBA_at_line_0, lineNumber);
else if(entZeroMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Zero_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_Zero_at_line_0, lineNumber);
currentEntry.Zero = Convert.ToByte(entZeroMatch.Groups["value"].Value, 10);
currentEntry.HOUR = (byte)((currentEntry.Zero & 0xF0) >> 4);
currentEntry.PHOUR = (byte)(currentEntry.Zero & 0x0F);
}
else if(entPMinMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PMin_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_PMin_at_line_0, lineNumber);
currentEntry.PMIN = Convert.ToByte(entPMinMatch.Groups["value"].Value, 10);
}
else if(entPSecMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PSec_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_PSec_at_line_0, lineNumber);
currentEntry.PSEC = Convert.ToByte(entPSecMatch.Groups["value"].Value, 10);
}
else if(entPFrameMatch.Success)
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PFrame_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_PFrame_at_line_0, lineNumber);
currentEntry.PFRAME = Convert.ToByte(entPFrameMatch.Groups["value"].Value, 10);
}
else if(entPlbaMatch.Success)
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PLBA_at_line_0, lineNumber);
AaruConsole.Debug(MODULE_NAME, Localization.Found_PLBA_at_line_0, lineNumber);
}
else if(inTrack)
{
@@ -390,7 +390,7 @@ public sealed partial class CloneCd
if(entries.Count == 0)
{
AaruConsole.ErrorWriteLine(Localization.Did_not_find_any_track);
AaruConsole.Error(Localization.Did_not_find_any_track);
return ErrorNumber.InvalidArgument;
}
@@ -429,7 +429,7 @@ public sealed partial class CloneCd
if(_dataFilter == null)
{
AaruConsole.ErrorWriteLine(Localization.Cannot_open_data_file);
AaruConsole.Error(Localization.Cannot_open_data_file);
return ErrorNumber.NoSuchFile;
}
@@ -471,7 +471,7 @@ public sealed partial class CloneCd
{
case 0xA0:
byte discType = descriptor.PSEC;
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_Type_0, discType);
AaruConsole.Debug(MODULE_NAME, Localization.Disc_Type_0, discType);
break;
case 0xA2:
@@ -566,7 +566,7 @@ public sealed partial class CloneCd
if(_imageInfo.MediaManufacturer != "")
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Disc_manufactured_by_0,
_imageInfo.MediaManufacturer);
}
@@ -579,7 +579,7 @@ public sealed partial class CloneCd
case 6:
{
uint id = (uint)((descriptor.Min << 16) + (descriptor.Sec << 8) + descriptor.Frame);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_ID_0_X6, id & 0x00FFFFFF);
AaruConsole.Debug(MODULE_NAME, Localization.Disc_ID_0_X6, id & 0x00FFFFFF);
_imageInfo.MediaSerialNumber = $"{id & 0x00FFFFFF:X6}";
break;
@@ -896,8 +896,8 @@ public sealed partial class CloneCd
}
catch(Exception ex)
{
AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, imageFilter.Filename);
AaruConsole.WriteException(ex);
AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, imageFilter.Filename);
AaruConsole.Exception(ex);
return ErrorNumber.UnexpectedException;
}