General code cleanup and style refactor.

This commit is contained in:
2022-11-15 15:58:43 +00:00
parent f59ecffb59
commit 2f9b7fe0a1
1324 changed files with 36815 additions and 37688 deletions

View File

@@ -26,21 +26,20 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.Tests.Devices.ATA;
using System;
using Aaru.Console;
using Aaru.Decoders.ATA;
using Aaru.Devices;
using Aaru.Helpers;
namespace Aaru.Tests.Devices.ATA;
static class Smart
{
internal static void Menu(string devPath, Device dev)
{
while(true)
{
Console.Clear();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Send a S.M.A.R.T. command to the device:");
AaruConsole.WriteLine("1.- Send DISABLE ATTRIBUTE AUTOSAVE command.");
@@ -54,12 +53,12 @@ static class Smart
AaruConsole.WriteLine("0.- Return to ATA commands menu.");
AaruConsole.Write("Choose: ");
string strDev = Console.ReadLine();
string strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out int item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
System.Console.ReadKey();
continue;
}
@@ -104,7 +103,7 @@ static class Smart
continue;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
System.Console.ReadKey();
continue;
}
@@ -113,14 +112,14 @@ static class Smart
static void DisableAttributeAutosave(string devPath, Device dev)
{
start:
Console.Clear();
start:
System.Console.Clear();
bool sense =
dev.SmartDisableAttributeAutosave(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
out double duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Sending DISABLE ATTRIBUTE AUTOSAVE to the device:");
AaruConsole.WriteLine("Command took {0} ms.", duration);
@@ -133,13 +132,13 @@ static class Smart
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
AaruConsole.Write("Choose: ");
string strDev = Console.ReadLine();
string strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out int item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -153,8 +152,8 @@ static class Smart
case 1: goto start;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -162,11 +161,11 @@ static class Smart
static void DisableOperations(string devPath, Device dev)
{
start:
Console.Clear();
start:
System.Console.Clear();
bool sense = dev.SmartDisable(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Sending DISABLE OPERATIONS to the device:");
AaruConsole.WriteLine("Command took {0} ms.", duration);
@@ -179,13 +178,13 @@ static class Smart
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
AaruConsole.Write("Choose: ");
string strDev = Console.ReadLine();
string strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out int item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -199,8 +198,8 @@ static class Smart
case 1: goto start;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -208,14 +207,14 @@ static class Smart
static void EnableAttributeAutosave(string devPath, Device dev)
{
start:
Console.Clear();
start:
System.Console.Clear();
bool sense =
dev.SmartEnableAttributeAutosave(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
out double duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Sending ENABLE ATTRIBUTE AUTOSAVE to the device:");
AaruConsole.WriteLine("Command took {0} ms.", duration);
@@ -228,13 +227,13 @@ static class Smart
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
AaruConsole.Write("Choose: ");
string strDev = Console.ReadLine();
string strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out int item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -248,8 +247,8 @@ static class Smart
case 1: goto start;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -257,11 +256,11 @@ static class Smart
static void EnableOperations(string devPath, Device dev)
{
start:
Console.Clear();
start:
System.Console.Clear();
bool sense = dev.SmartEnable(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Sending ENABLE OPERATIONS to the device:");
AaruConsole.WriteLine("Command took {0} ms.", duration);
@@ -274,13 +273,13 @@ static class Smart
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
AaruConsole.Write("Choose: ");
string strDev = Console.ReadLine();
string strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out int item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -294,8 +293,8 @@ static class Smart
case 1: goto start;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -307,11 +306,11 @@ static class Smart
string strDev;
int item;
parameters:
parameters:
while(true)
{
Console.Clear();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Parameters for EXECUTE OFF-LINE IMMEDIATE command:");
AaruConsole.WriteLine("Subcommand: {0}", subcommand);
@@ -321,12 +320,12 @@ static class Smart
AaruConsole.WriteLine("2.- Send command with these parameters.");
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
strDev = Console.ReadLine();
strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
System.Console.ReadKey();
continue;
}
@@ -339,13 +338,13 @@ static class Smart
return;
case 1:
AaruConsole.Write("Subcommand?: ");
strDev = Console.ReadLine();
strDev = System.Console.ReadLine();
if(!byte.TryParse(strDev, out subcommand))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
subcommand = 0;
Console.ReadKey();
System.Console.ReadKey();
}
break;
@@ -353,13 +352,13 @@ static class Smart
}
}
start:
Console.Clear();
start:
System.Console.Clear();
bool sense = dev.SmartExecuteOffLineImmediate(out AtaErrorRegistersLba28 errorRegisters, subcommand,
dev.Timeout, out double duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Sending EXECUTE OFF-LINE IMMEDIATE to the device:");
AaruConsole.WriteLine("Command took {0} ms.", duration);
@@ -373,13 +372,13 @@ static class Smart
AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
AaruConsole.Write("Choose: ");
strDev = Console.ReadLine();
strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -394,8 +393,8 @@ static class Smart
case 2: goto parameters;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -403,13 +402,13 @@ static class Smart
static void ReadData(string devPath, Device dev)
{
start:
Console.Clear();
start:
System.Console.Clear();
bool sense = dev.SmartReadData(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
out double duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Sending READ DATA to the device:");
AaruConsole.WriteLine("Command took {0} ms.", duration);
@@ -424,13 +423,13 @@ static class Smart
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
AaruConsole.Write("Choose: ");
string strDev = Console.ReadLine();
string strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out int item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -442,7 +441,7 @@ static class Smart
return;
case 1:
Console.Clear();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("READ DATA response:");
@@ -450,27 +449,27 @@ static class Smart
PrintHex.PrintHexArray(buffer, 64);
AaruConsole.WriteLine("Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 2:
Console.Clear();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("READ DATA status registers:");
AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
AaruConsole.WriteLine("Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 4: goto start;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -482,11 +481,11 @@ static class Smart
string strDev;
int item;
parameters:
parameters:
while(true)
{
Console.Clear();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Parameters for READ LOG command:");
AaruConsole.WriteLine("Log address: {0}", address);
@@ -496,12 +495,12 @@ static class Smart
AaruConsole.WriteLine("2.- Send command with these parameters.");
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
strDev = Console.ReadLine();
strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
System.Console.ReadKey();
continue;
}
@@ -514,13 +513,13 @@ static class Smart
return;
case 1:
AaruConsole.Write("Log address?: ");
strDev = Console.ReadLine();
strDev = System.Console.ReadLine();
if(!byte.TryParse(strDev, out address))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
address = 0;
Console.ReadKey();
System.Console.ReadKey();
}
break;
@@ -528,13 +527,13 @@ static class Smart
}
}
start:
Console.Clear();
start:
System.Console.Clear();
bool sense = dev.SmartReadLog(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, address,
dev.Timeout, out double duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Sending READ LOG to the device:");
AaruConsole.WriteLine("Command took {0} ms.", duration);
@@ -550,13 +549,13 @@ static class Smart
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
AaruConsole.Write("Choose: ");
strDev = Console.ReadLine();
strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -568,7 +567,7 @@ static class Smart
return;
case 1:
Console.Clear();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("READ LOG response:");
@@ -576,19 +575,19 @@ static class Smart
PrintHex.PrintHexArray(buffer, 64);
AaruConsole.WriteLine("Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
goto menu;
case 2:
Console.Clear();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("READ LOG status registers:");
AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
AaruConsole.WriteLine("Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
AaruConsole.WriteLine("Device: {0}", devPath);
goto menu;
@@ -596,8 +595,8 @@ static class Smart
case 4: goto parameters;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -605,12 +604,12 @@ static class Smart
static void ReturnStatus(string devPath, Device dev)
{
start:
Console.Clear();
start:
System.Console.Clear();
bool sense = dev.SmartReturnStatus(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
menu:
menu:
AaruConsole.WriteLine("Device: {0}", devPath);
AaruConsole.WriteLine("Sending RETURN STATUS to the device:");
AaruConsole.WriteLine("Command took {0} ms.", duration);
@@ -623,13 +622,13 @@ static class Smart
AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
AaruConsole.Write("Choose: ");
string strDev = Console.ReadLine();
string strDev = System.Console.ReadLine();
if(!int.TryParse(strDev, out int item))
{
AaruConsole.WriteLine("Not a number. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}
@@ -643,8 +642,8 @@ static class Smart
case 1: goto start;
default:
AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
Console.ReadKey();
Console.Clear();
System.Console.ReadKey();
System.Console.Clear();
goto menu;
}