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

Refactor IMediaImage.ReadSector(s) to return error status instead of buffer.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-19 21:16:47 +01:00
parent fbccfb2ca9
commit f51d414abd
187 changed files with 4036 additions and 2081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ using System;
using System.Collections.ObjectModel;
using System.Reactive;
using System.Threading;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
@@ -439,7 +440,8 @@ namespace Aaru.Gui.ViewModels.Windows
if(Fletcher32Checked)
enabledChecksums |= EnableChecksum.Fletcher32;
Checksum mediaChecksum = null;
Checksum mediaChecksum = null;
ErrorNumber errno;
if(opticalMediaImage?.Tracks != null)
try
@@ -471,7 +473,15 @@ namespace Aaru.Gui.ViewModels.Windows
Progress2Text = $"Hashing track-less sector {sector}";
});
byte[] hiddenSector = opticalMediaImage.ReadSector(i);
errno = opticalMediaImage.ReadSector(i, out byte[] hiddenSector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine($"Error {errno} reading sector {i}");
_cancel = true;
break;
}
mediaChecksum?.Update(hiddenSector);
}
@@ -576,7 +586,16 @@ namespace Aaru.Gui.ViewModels.Windows
Progress2Text = $"Hashing track-less sector {sector}";
});
byte[] hiddenSector = opticalMediaImage.ReadSector(i);
errno = opticalMediaImage.ReadSector(i, out byte[] hiddenSector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine($"Error {errno} reading sector {i}");
_cancel = true;
break;
}
mediaChecksum?.Update(hiddenSector);
}
@@ -627,7 +646,15 @@ namespace Aaru.Gui.ViewModels.Windows
if(_inputFormat.Info.Sectors - doneSectors >= SECTORS_TO_READ)
{
sector = _inputFormat.ReadSectors(doneSectors, SECTORS_TO_READ);
errno = _inputFormat.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
_cancel = true;
continue;
}
ulong doneSectorsToInvoke = doneSectors;
@@ -643,7 +670,17 @@ namespace Aaru.Gui.ViewModels.Windows
}
else
{
sector = _inputFormat.ReadSectors(doneSectors, (uint)(_inputFormat.Info.Sectors - doneSectors));
errno = _inputFormat.ReadSectors(doneSectors, (uint)(_inputFormat.Info.Sectors - doneSectors),
out sector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
_cancel = true;
continue;
}
ulong doneSectorsToInvoke = doneSectors;
await Dispatcher.UIThread.InvokeAsync(() =>