aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛Correct status printing on verify command.

Browse Source
This commit is contained in:
Natalia Portillo
2018-04-10 05:44:57 +01:00
parent bd4986919d
commit 0dd475f520
1 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
DiscImageChef/Commands/Verify.cs
View File

@@ -116,7 +116,6 @@ namespace DiscImageChef.Commands
DateTime endCheck;
List<ulong> failingLbas = new List<ulong>();
List<ulong> unknownLbas = new List<ulong>();
bool? checkStatus = null;
if(formatHasTracks)
{
@@ -136,21 +135,15 @@ namespace DiscImageChef.Commands
List<ulong> tempfailingLbas;
List<ulong> tempunknownLbas;
bool? tempStatus;
if(remainingSectors < 512)
tempStatus = inputFormat.VerifySectors(currentSector, (uint)remainingSectors,
inputFormat.VerifySectors(currentSector, (uint)remainingSectors,
currentTrack.TrackSequence, out tempfailingLbas,
out tempunknownLbas);
else
tempStatus = inputFormat.VerifySectors(currentSector, 512, currentTrack.TrackSequence,
inputFormat.VerifySectors(currentSector, 512, currentTrack.TrackSequence,
out tempfailingLbas, out tempunknownLbas);
if(checkStatus == null || tempStatus == null) checkStatus = null;
else if(checkStatus == false || tempStatus == false) checkStatus = false;
else if(checkStatus == true && tempStatus == true) checkStatus = true;
else checkStatus = null;
failingLbas.AddRange(tempfailingLbas);
unknownLbas.AddRange(tempunknownLbas);
@@ -184,19 +177,12 @@ namespace DiscImageChef.Commands
List<ulong> tempfailingLbas;
List<ulong> tempunknownLbas;
bool? tempStatus;
if(remainingSectors < 512)
tempStatus = inputFormat.VerifySectors(currentSector, (uint)remainingSectors,
inputFormat.VerifySectors(currentSector, (uint)remainingSectors,
out tempfailingLbas, out tempunknownLbas);
else
tempStatus =
inputFormat.VerifySectors(currentSector, 512, out tempfailingLbas, out tempunknownLbas);
if(checkStatus == null || tempStatus == null) checkStatus = null;
else if(checkStatus == false || tempStatus == false) checkStatus = false;
else if(checkStatus == true && tempStatus == true) checkStatus = true;
else checkStatus = null;
inputFormat.VerifySectors(currentSector, 512, out tempfailingLbas, out tempunknownLbas);
failingLbas.AddRange(tempfailingLbas);
@@ -219,21 +205,15 @@ namespace DiscImageChef.Commands
TimeSpan checkTime = endCheck - startCheck;
DicConsole.Write("\r");
switch(checkStatus)
{
case true:
DicConsole.WriteLine("All sector checksums are correct");
break;
case false:
DicConsole.WriteLine("There is at least one sector with incorrect checksum or errors");
break;
case null:
DicConsole.WriteLine("There is at least one sector that does not contain a checksum");
break;
}
DicConsole.Write("\r" + new string(' ', System.Console.WindowWidth-1) + "\r");
if(unknownSectors > 0)
DicConsole.WriteLine("There is at least one sector that does not contain a checksum");
if(errorSectors > 0)
DicConsole.WriteLine("There is at least one sector with incorrect checksum or errors");
if(unknownSectors == 0 && errorSectors == 0)
DicConsole.WriteLine("All sector checksums are correct");
DicConsole.VerboseWriteLine("Checking sector checksums took {0} seconds", checkTime.TotalSeconds);
if(options.Verbose)