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

Remove separate dump log, use central log facility.

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-19 15:17:19 +01:00
parent f57a5635d9
commit 05906c8818
41 changed files with 704 additions and 1846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -979,7 +979,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
warning = true;
AaruLogging.Error(UI.Error_0_setting_geometry_image_may_be_incorrect_continuing,
outputFormat.ErrorMessage);
outputFormat.ErrorMessage);
}
await Dispatcher.UIThread.InvokeAsync(() =>
@@ -1106,8 +1106,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
warning = true;
AaruLogging.Error(UI.Error_0_writing_sector_1_continuing,
outputFormat.ErrorMessage,
doneSectors);
outputFormat.ErrorMessage,
doneSectors);
}
else
{
@@ -1123,8 +1123,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
.ShowWindowDialogAsync(_view));
AaruLogging.Error(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.ErrorMessage,
doneSectors);
outputFormat.ErrorMessage,
doneSectors);
return;
}
@@ -1266,7 +1266,6 @@ public sealed class ImageConvertViewModel : ViewModelBase
false,
false,
null,
null,
smallestPregapLbaPerTrack,
false,
out _);
@@ -1300,9 +1299,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruLogging.Error(UI.Error_0_reading_sector_1_not_continuing,
errno,
doneSectors);
AaruLogging.Error(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
return;
}
@@ -1335,7 +1332,6 @@ public sealed class ImageConvertViewModel : ViewModelBase
false,
false,
null,
null,
smallestPregapLbaPerTrack,
false,
out _);
@@ -1369,9 +1365,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
icon: Icon.Error)
.ShowWindowDialogAsync(_view));
AaruLogging.Error(UI.Error_0_reading_sector_1_not_continuing,
errno,
doneSectors);
AaruLogging.Error(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
return;
}
@@ -1385,8 +1379,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
warning = true;
AaruLogging.Error(UI.Error_0_writing_sector_1_continuing,
outputFormat.ErrorMessage,
doneSectors);
outputFormat.ErrorMessage,
doneSectors);
}
else
{
@@ -1402,8 +1396,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
.ShowWindowDialogAsync(_view));
AaruLogging.Error(UI.Error_0_writing_sector_1_not_continuing,
outputFormat.ErrorMessage,
doneSectors);
outputFormat.ErrorMessage,
doneSectors);
return;
}
@@ -1573,8 +1567,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
warning = true;
AaruLogging.Error(UI.Error_0_writing_sector_1_continuing,
outputFormat.ErrorMessage,
doneSectors);
outputFormat.ErrorMessage,
doneSectors);
}
else
{
@@ -1683,8 +1677,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruLogging.Error(UI.Error_0_writing_tag_continuing,
outputFormat.ErrorMessage);
AaruLogging.Error(UI.Error_0_writing_tag_continuing, outputFormat.ErrorMessage);
}
else
{
@@ -1755,9 +1748,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
{
warning = true;
AaruLogging.Error(UI.Error_0_reading_tag_for_sector_1_continuing,
errno,
doneSectors);
AaruLogging.Error(UI.Error_0_reading_tag_for_sector_1_continuing, errno, doneSectors);
}
else
{
@@ -1782,8 +1773,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
warning = true;
AaruLogging.Error(UI.Error_0_writing_tag_for_sector_1_continuing,
outputFormat.ErrorMessage,
doneSectors);
outputFormat.ErrorMessage,
doneSectors);
}
else
{

12
Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
View File

@@ -54,6 +54,7 @@ using Aaru.Core.Media.Info;
using Aaru.Devices;
using Aaru.Gui.Models;
using Aaru.Localization;
using Aaru.Logging;
using Avalonia.Controls;
using Avalonia.Platform.Storage;
using Avalonia.Threading;
@@ -499,7 +500,7 @@ public sealed class MediaDumpViewModel : ViewModelBase
{
this.RaiseAndSetIfChanged(ref _existingMetadata, value);
if(value == false)
if(!value)
{
_sidecar = null;
@@ -857,9 +858,9 @@ public sealed class MediaDumpViewModel : ViewModelBase
}
*/
var dumpLog = new DumpLog(_outputPrefix + ".log", _dev, false);
DumpLog.StartLog(_dev, false);
dumpLog.WriteLine(UI.Output_image_format_0, SelectedPlugin.Name);
AaruLogging.WriteLine(UI.Output_image_format_0, SelectedPlugin.Name);
var errorLog = new ErrorLog(_outputPrefix + ".error.log");
@@ -873,15 +874,14 @@ public sealed class MediaDumpViewModel : ViewModelBase
Persistent,
StopOnError,
_resume,
dumpLog,
encoding,
_outputPrefix,
Destination,
parsedOptions,
_sidecar,
(uint)Skipped,
ExistingMetadata == false,
Trim == false,
!ExistingMetadata,
!Trim,
Track1Pregap,
true,
false,