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

78
Aaru.Core/Sidecar/BlockMedia.cs
View File

@@ -413,13 +413,31 @@ namespace Aaru.Core
if(sectors - doneSectors >= sectorsToRead)
{
sector = image.ReadSectors(doneSectors, sectorsToRead);
errno = image.ReadSectors(doneSectors, sectorsToRead, out sector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
EndProgress2();
return;
}
UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors, (long)sectors);
doneSectors += sectorsToRead;
}
else
{
sector = image.ReadSectors(doneSectors, (uint)(sectors - doneSectors));
errno = image.ReadSectors(doneSectors, (uint)(sectors - doneSectors), out sector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
EndProgress2();
return;
}
UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors, (long)sectors);
doneSectors += sectors - doneSectors;
}
@@ -497,14 +515,36 @@ namespace Aaru.Core
if(sectors - doneSectors >= sectorsToRead)
{
sector = image.ReadSectors(tapePartition.FirstBlock + doneSectors, sectorsToRead);
errno = image.ReadSectors(tapePartition.FirstBlock + doneSectors, sectorsToRead,
out sector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.
ErrorWriteLine($"Error {errno} reading sector {tapePartition.FirstBlock + doneSectors}");
EndProgress2();
return;
}
UpdateProgress2("Hashing blocks {0} of {1}", (long)doneSectors, (long)sectors);
doneSectors += sectorsToRead;
}
else
{
sector = image.ReadSectors(tapePartition.FirstBlock + doneSectors,
(uint)(sectors - doneSectors));
errno = image.ReadSectors(tapePartition.FirstBlock + doneSectors,
(uint)(sectors - doneSectors), out sector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.
ErrorWriteLine($"Error {errno} reading sector {tapePartition.FirstBlock + doneSectors}");
EndProgress2();
return;
}
UpdateProgress2("Hashing blocks {0} of {1}", (long)doneSectors, (long)sectors);
doneSectors += sectors - doneSectors;
@@ -575,14 +615,36 @@ namespace Aaru.Core
if(sectors - doneSectors >= sectorsToRead)
{
sector = image.ReadSectors(tapeFile.FirstBlock + doneSectors, sectorsToRead);
errno = image.ReadSectors(tapeFile.FirstBlock + doneSectors, sectorsToRead,
out sector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.
ErrorWriteLine($"Error {errno} reading sector {tapeFile.FirstBlock + doneSectors}");
EndProgress2();
return;
}
UpdateProgress2("Hashing blocks {0} of {1}", (long)doneSectors, (long)sectors);
doneSectors += sectorsToRead;
}
else
{
sector = image.ReadSectors(tapeFile.FirstBlock + doneSectors,
(uint)(sectors - doneSectors));
errno = image.ReadSectors(tapeFile.FirstBlock + doneSectors,
(uint)(sectors - doneSectors), out sector);
if(errno != ErrorNumber.NoError)
{
AaruConsole.
ErrorWriteLine($"Error {errno} reading sector {tapeFile.FirstBlock + doneSectors}");
EndProgress2();
return;
}
UpdateProgress2("Hashing blocks {0} of {1}", (long)doneSectors, (long)sectors);
doneSectors += sectors - doneSectors;