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

2
Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
View File

@@ -165,7 +165,7 @@ public sealed class ConsoleViewModel : ViewModelBase
Icon.Error)
.ShowWindowDialogAsync(_view);
AaruConsole.WriteException(exception);
AaruConsole.Exception(exception);
}
}

2
Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
View File

@@ -90,7 +90,7 @@ public sealed class SubdirectoryViewModel
if(errno != ErrorNumber.NoError)
{
AaruConsole
.ErrorWriteLine(string.Format(UI.Error_0_trying_to_get_information_about_filesystem_entry_named_1,
.Error(string.Format(UI.Error_0_trying_to_get_information_about_filesystem_entry_named_1,
errno,
dirent));

2
Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
View File

@@ -148,7 +148,7 @@ public class PcmciaInfoViewModel : ViewModelBase
}
}
else
AaruConsole.DebugWriteLine(MODULE_NAME, UI.PCMCIA_CIS_returned_no_tuples);
AaruConsole.Debug(MODULE_NAME, UI.PCMCIA_CIS_returned_no_tuples);
}
public string CisLabel => UI.Title_CIS;

10
Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
View File

@@ -606,7 +606,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
evpdPageTitle = string.Format(UI.Page_0_h, page.Key);
evpdDecodedPage = UI.Undecoded;
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Core.Found_undecoded_SCSI_VPD_page_0,
page.Key);
@@ -627,9 +627,9 @@ public sealed class ScsiInfoViewModel : ViewModelBase
Features.SeparatedFeatures ftr = Features.Separate(_configuration);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.GET_CONFIGURATION_length_is_0, ftr.DataLength);
AaruConsole.Debug(MODULE_NAME, Localization.Core.GET_CONFIGURATION_length_is_0, ftr.DataLength);
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Core.GET_CONFIGURATION_current_profile_is_0,
ftr.CurrentProfile);
@@ -638,7 +638,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
{
string featureNumber = string.Format(Localization.Core.Feature_0, desc.Code);
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Feature_0, desc.Code);
AaruConsole.Debug(MODULE_NAME, Localization.Core.Feature_0, desc.Code);
string featureDescription = desc.Code switch
{
@@ -712,7 +712,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
}
else
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
Localization.Core.GET_CONFIGURATION_returned_no_feature_descriptors);
}
}

18
Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
View File

@@ -494,7 +494,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
i));
@@ -507,7 +507,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
}
}
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
UI.Track_0_starts_at_sector_1_and_ends_at_sector_2,
currentTrack.Sequence,
currentTrack.StartSector,
@@ -543,7 +543,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
doneSectors));
@@ -573,7 +573,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
doneSectors));
@@ -637,7 +637,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
i));
@@ -666,9 +666,9 @@ public sealed class ImageChecksumViewModel : ViewModelBase
}
catch(Exception ex)
{
AaruConsole.DebugWriteLine(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
AaruConsole.Debug(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
AaruConsole.WriteLine("Unable to get separate tracks, not checksumming them");
AaruConsole.WriteException(ex);
AaruConsole.Exception(ex);
}
}
else
@@ -701,7 +701,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
doneSectors));
@@ -731,7 +731,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
errno,
doneSectors));

56
Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
View File

@@ -808,7 +808,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_creating_output_image, outputFormat.ErrorMessage);
AaruConsole.Error(UI.Error_0_creating_output_image, outputFormat.ErrorMessage);
return;
}
@@ -857,13 +857,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_setting_metadata_not_continuing, outputFormat.ErrorMessage);
AaruConsole.Error(UI.Error_0_setting_metadata_not_continuing, outputFormat.ErrorMessage);
return;
}
warning = true;
AaruConsole.ErrorWriteLine(Localization.Core.Error_0_setting_metadata, outputFormat.ErrorMessage);
AaruConsole.Error(Localization.Core.Error_0_setting_metadata, outputFormat.ErrorMessage);
}
}
@@ -889,7 +889,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_sending_tracks_list_to_output_image, outputFormat.ErrorMessage);
AaruConsole.Error(UI.Error_0_sending_tracks_list_to_output_image, outputFormat.ErrorMessage);
return;
}
@@ -918,9 +918,9 @@ public sealed class ImageConvertViewModel : ViewModelBase
warning = true;
if(errno == ErrorNumber.NoError)
AaruConsole.ErrorWriteLine(UI.Error_0_writing_media_tag, outputFormat.ErrorMessage);
AaruConsole.Error(UI.Error_0_writing_media_tag, outputFormat.ErrorMessage);
else
AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag, errno);
AaruConsole.Error(UI.Error_0_reading_media_tag, errno);
}
else
{
@@ -936,7 +936,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_writing_media_tag_not_continuing, outputFormat.ErrorMessage);
AaruConsole.Error(UI.Error_0_writing_media_tag_not_continuing, outputFormat.ErrorMessage);
}
else
{
@@ -949,7 +949,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag_not_continuing, errno);
AaruConsole.Error(UI.Error_0_reading_media_tag_not_continuing, errno);
}
return;
@@ -978,7 +978,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_setting_geometry_image_may_be_incorrect_continuing,
AaruConsole.Error(UI.Error_0_setting_geometry_image_may_be_incorrect_continuing,
outputFormat.ErrorMessage);
}
@@ -1038,7 +1038,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
}
else
{
@@ -1052,7 +1052,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
return;
}
@@ -1078,7 +1078,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
}
else
{
@@ -1092,7 +1092,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
return;
}
@@ -1105,7 +1105,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
outputFormat.ErrorMessage,
doneSectors);
}
@@ -1122,7 +1122,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
AaruConsole.Error(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.ErrorMessage,
doneSectors);
@@ -1286,7 +1286,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
}
else
{
@@ -1300,7 +1300,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
errno,
doneSectors);
@@ -1355,7 +1355,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
}
else
{
@@ -1369,7 +1369,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
errno,
doneSectors);
@@ -1384,7 +1384,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
outputFormat.ErrorMessage,
doneSectors);
}
@@ -1401,7 +1401,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
AaruConsole.Error(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.ErrorMessage,
doneSectors);
@@ -1505,7 +1505,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
}
else
{
@@ -1547,7 +1547,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
}
else
{
@@ -1572,7 +1572,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
outputFormat.ErrorMessage,
doneSectors);
}
@@ -1658,7 +1658,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag, errno);
AaruConsole.Error(UI.Error_0_reading_media_tag, errno);
}
else
{
@@ -1683,7 +1683,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_writing_tag_continuing,
AaruConsole.Error(UI.Error_0_writing_tag_continuing,
outputFormat.ErrorMessage);
}
else
@@ -1755,7 +1755,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_reading_tag_for_sector_1_continuing,
AaruConsole.Error(UI.Error_0_reading_tag_for_sector_1_continuing,
errno,
doneSectors);
}
@@ -1781,7 +1781,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruConsole.ErrorWriteLine(UI.Error_0_writing_tag_for_sector_1_continuing,
AaruConsole.Error(UI.Error_0_writing_tag_for_sector_1_continuing,
outputFormat.ErrorMessage,
doneSectors);
}

2
Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
View File

@@ -316,7 +316,7 @@ public sealed class ImageEntropyViewModel : ViewModelBase
if(WholeDiscChecked && _inputFormat is IOpticalMediaImage { Sessions.Count: > 1 })
{
AaruConsole.ErrorWriteLine(UI.Calculating_disc_entropy_of_multisession_images_is_not_yet_implemented);
AaruConsole.Error(UI.Calculating_disc_entropy_of_multisession_images_is_not_yet_implemented);
WholeDiscChecked = false;
}

4
Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
View File

@@ -439,7 +439,7 @@ public sealed class ImageVerifyViewModel : ViewModelBase
};
});
AaruConsole.VerboseWriteLine(UI.Checking_disc_image_checksums_took_0,
AaruConsole.Verbose(UI.Checking_disc_image_checksums_took_0,
chkStopwatch.Elapsed.Humanize(minUnit: TimeUnit.Second));
}
}
@@ -611,7 +611,7 @@ public sealed class ImageVerifyViewModel : ViewModelBase
chkStopwatch.Stop();
}
AaruConsole.VerboseWriteLine(UI.Checking_sector_checksums_took_0,
AaruConsole.Verbose(UI.Checking_sector_checksums_took_0,
chkStopwatch.Elapsed.Humanize(minUnit: TimeUnit.Second));
await Dispatcher.UIThread.InvokeAsync(() =>

20
Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
View File

@@ -581,8 +581,8 @@ public sealed class MainWindowViewModel : ViewModelBase
ButtonEnum.Ok,
Icon.Error);
AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
AaruConsole.ErrorWriteLine(UI.No_error_given);
AaruConsole.Error(UI.Unable_to_open_image_format);
AaruConsole.Error(UI.No_error_given);
return;
}
@@ -614,7 +614,7 @@ public sealed class MainWindowViewModel : ViewModelBase
if(partitions.Count == 0)
{
AaruConsole.DebugWriteLine(MODULE_NAME, UI.No_partitions_found);
AaruConsole.Debug(MODULE_NAME, UI.No_partitions_found);
checkRaw = true;
}
@@ -797,9 +797,9 @@ public sealed class MainWindowViewModel : ViewModelBase
ButtonEnum.Ok,
Icon.Error);
AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
AaruConsole.WriteException(ex);
AaruConsole.Error(UI.Unable_to_open_image_format);
AaruConsole.Error(Localization.Core.Error_0, ex.Message);
AaruConsole.Exception(ex);
}
}
catch(Exception ex)
@@ -809,8 +809,8 @@ public sealed class MainWindowViewModel : ViewModelBase
ButtonEnum.Ok,
Icon.Error);
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
AaruConsole.WriteException(ex);
AaruConsole.Error(string.Format(UI.Error_reading_file_0, ex.Message));
AaruConsole.Exception(ex);
}
Statistics.AddCommand("image-info");
@@ -834,7 +834,7 @@ public sealed class MainWindowViewModel : ViewModelBase
.OrderBy(d => d.Vendor)
.ThenBy(d => d.Model))
{
AaruConsole.DebugWriteLine(MODULE_NAME,
AaruConsole.Debug(MODULE_NAME,
UI.Found_supported_device_model_0_by_manufacturer_1_on_bus_2_and_path_3,
device.Model,
device.Vendor,
@@ -890,7 +890,7 @@ public sealed class MainWindowViewModel : ViewModelBase
}
catch(InvalidOperationException ex)
{
AaruConsole.WriteException(ex);
AaruConsole.Exception(ex);
}
}
}

4
Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
View File

@@ -214,9 +214,9 @@ public sealed class SplashWindowViewModel(SplashWindow view) : ViewModelBase
}
catch(Exception)
{
AaruConsole.ErrorWriteLine(UI.Exception_trying_to_remove_old_database_version);
AaruConsole.Error(UI.Exception_trying_to_remove_old_database_version);
AaruConsole.ErrorWriteLine(UI.Please_manually_remove_file_at_0, Settings.Settings.MainDbPath);
AaruConsole.Error(UI.Please_manually_remove_file_at_0, Settings.Settings.MainDbPath);
return;
}