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)Long to return error status instead of buffer.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-20 14:22:22 +01:00
parent 88aeda7240
commit a6690aa121
77 changed files with 1048 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Aaru/Commands/Image/Convert.cs
View File

@@ -826,22 +826,36 @@ namespace Aaru.Commands.Image
if(useLong)
{
if(sectorsToDo == 1)
{
sector = inputFormat.ReadSectorLong(doneSectors + track.StartSector);
errno = sectorsToDo == 1
? inputFormat.ReadSectorLong(doneSectors + track.StartSector,
out sector)
: inputFormat.ReadSectorsLong(doneSectors + track.StartSector,
sectorsToDo, out sector);
result =
outputFormat.WriteSectorLong(sector,
doneSectors + track.StartSector);
}
if(errno == ErrorNumber.NoError)
result = sectorsToDo == 1
? outputFormat.WriteSectorLong(sector,
doneSectors + track.StartSector)
: outputFormat.WriteSectorsLong(sector,
doneSectors + track.StartSector, sectorsToDo);
else
{
sector = inputFormat.ReadSectorsLong(doneSectors + track.StartSector,
sectorsToDo);
result = true;
result =
outputFormat.WriteSectorsLong(sector,
doneSectors + track.StartSector, sectorsToDo);
if(force)
AaruConsole.
ErrorWriteLine("Error {0} reading sector {1}, continuing...",
errno, doneSectors + track.StartSector);
else
{
AaruConsole.
ErrorWriteLine("Error {0} reading sector {1}, not continuing...",
errno, doneSectors + track.StartSector);
errno = ErrorNumber.WriteError;
return;
}
}
if(!result &&
@@ -1256,16 +1270,33 @@ namespace Aaru.Commands.Image
bool result;
if(useLong)
if(sectorsToDo == 1)
{
sector = inputFormat.ReadSectorLong(doneSectors);
result = outputFormat.WriteSectorLong(sector, doneSectors);
}
{
errno = sectorsToDo == 1 ? inputFormat.ReadSectorLong(doneSectors, out sector)
: inputFormat.ReadSectorsLong(doneSectors, sectorsToDo, out sector);
if(errno == ErrorNumber.NoError)
result = sectorsToDo == 1
? outputFormat.WriteSectorLong(sector, doneSectors)
: outputFormat.WriteSectorsLong(sector, doneSectors,
sectorsToDo);
else
{
sector = inputFormat.ReadSectorsLong(doneSectors, sectorsToDo);
result = outputFormat.WriteSectorsLong(sector, doneSectors, sectorsToDo);
result = true;
if(force)
AaruConsole.
ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
doneSectors);
else
{
AaruConsole.
ErrorWriteLine("Error {0} reading sector {1}, not continuing...",
errno, doneSectors);
return;
}
}
}
else
{
errno = sectorsToDo == 1 ? inputFormat.ReadSector(doneSectors, out sector)

6
Aaru/Commands/Image/Print.cs
View File

@@ -209,10 +209,8 @@ namespace Aaru.Commands.Image
{
ctx.AddTask("Reading sector...").IsIndeterminate();
if(longSectors)
sector = inputFormat.ReadSectorLong(start + i);
else
errno = inputFormat.ReadSector(start + i, out sector);
errno = longSectors ? inputFormat.ReadSectorLong(start + i, out sector)
: inputFormat.ReadSector(start + i, out sector);
});
if(errno == ErrorNumber.NoError)