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

General code refactor.

Browse Source
This commit is contained in:
Natalia Portillo
2021-08-17 21:23:23 +01:00
parent dc0e013d8d
commit 394c96ed82
3 changed files with 620 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1056
.editorconfig
View File

File diff suppressed because it is too large Load Diff

10
Aaru.Console.csproj
View File

@@ -54,10 +54,10 @@
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AaruConsole.cs" /> <Compile Include="AaruConsole.cs"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="..\LICENSE.LGPL"> <EmbeddedResource Include="..\LICENSE.LGPL">
@@ -71,9 +71,9 @@
<MonoDevelop> <MonoDevelop>
<Properties> <Properties>
<Policies> <Policies>
<StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename : ${FileName}&#xA;Author(s) : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA; Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA; This library is free software; you can redistribute it and/or modify&#xA; it under the terms of the GNU Lesser General Public License as&#xA; published by the Free Software Foundation; either version 2.1 of the&#xA; License, or (at your option) any later version.&#xA;&#xA; This library is distributed in the hope that it will be useful, but&#xA; WITHOUT ANY WARRANTY; without even the implied warranty of&#xA; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA; Lesser General Public License for more details.&#xA;&#xA; You should have received a copy of the GNU Lesser General Public&#xA; License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" /> <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename : ${FileName}&#xA;Author(s) : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA; Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA; This library is free software; you can redistribute it and/or modify&#xA; it under the terms of the GNU Lesser General Public License as&#xA; published by the Free Software Foundation; either version 2.1 of the&#xA; License, or (at your option) any later version.&#xA;&#xA; This library is distributed in the hope that it will be useful, but&#xA; WITHOUT ANY WARRANTY; without even the implied warranty of&#xA; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA; Lesser General Public License for more details.&#xA;&#xA; You should have received a copy of the GNU Lesser General Public&#xA; License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/"/>
<TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" /> <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
<CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" /> <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
</Policies> </Policies>
</Properties> </Properties>
</MonoDevelop> </MonoDevelop>

101
AaruConsole.cs
View File

@@ -33,67 +33,76 @@
namespace Aaru.Console namespace Aaru.Console
{ {
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the standard output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the standard output console using the specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void WriteLineHandler(string format, params object[] arg); public delegate void WriteLineHandler(string format, params object[] arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the error output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the error output console using the specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void ErrorWriteLineHandler(string format, params object[] arg); public delegate void ErrorWriteLineHandler(string format, params object[] arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the verbose output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the verbose output console using the specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void VerboseWriteLineHandler(string format, params object[] arg); public delegate void VerboseWriteLineHandler(string format, params object[] arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the debug output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the debug output console using the specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void DebugWriteLineHandler(string format, params object[] arg); public delegate void DebugWriteLineHandler(string format, params object[] arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, to the standard output console using the specified format information. /// Writes the text representation of the specified array of objects, to the standard output console using the
/// specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void WriteHandler(string format, params object[] arg); public delegate void WriteHandler(string format, params object[] arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, to the error output console using the specified format information. /// Writes the text representation of the specified array of objects, to the error output console using the
/// specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void ErrorWriteHandler(string format, params object[] arg); public delegate void ErrorWriteHandler(string format, params object[] arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, to the verbose output console using the specified format information. /// Writes the text representation of the specified array of objects, to the verbose output console using the
/// specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void VerboseWriteHandler(string format, params object[] arg); public delegate void VerboseWriteHandler(string format, params object[] arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, to the debug output console using the specified format information. /// Writes the text representation of the specified array of objects, to the debug output console using the
/// specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void DebugWriteHandler(string format, params object[] arg); public delegate void DebugWriteHandler(string format, params object[] arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the debug output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the debug output console using the specified format information.
/// </summary> /// </summary>
/// <param name="module">Description of the module writing to the debug console</param> /// <param name="module">Description of the module writing to the debug console</param>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public delegate void DebugWithModuleWriteLineHandler(string module, string format, params object[] arg); public delegate void DebugWithModuleWriteLineHandler(string module, string format, params object[] arg);
/// <summary> /// <summary>
@@ -122,34 +131,38 @@ namespace Aaru.Console
public static event DebugWriteHandler DebugWriteEvent; public static event DebugWriteHandler DebugWriteEvent;
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the standard output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the standard output console using the specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public static void WriteLine(string format, params object[] arg) => WriteLineEvent?.Invoke(format, arg); public static void WriteLine(string format, params object[] arg) => WriteLineEvent?.Invoke(format, arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the error output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the error output console using the specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public static void ErrorWriteLine(string format, params object[] arg) => public static void ErrorWriteLine(string format, params object[] arg) =>
ErrorWriteLineEvent?.Invoke(format, arg); ErrorWriteLineEvent?.Invoke(format, arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the verbose output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the verbose output console using the specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public static void VerboseWriteLine(string format, params object[] arg) => public static void VerboseWriteLine(string format, params object[] arg) =>
VerboseWriteLineEvent?.Invoke(format, arg); VerboseWriteLineEvent?.Invoke(format, arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects, followed by the current line terminator, to the debug output console using the specified format information. /// Writes the text representation of the specified array of objects, followed by the current line terminator, to
/// the debug output console using the specified format information.
/// </summary> /// </summary>
/// <param name="module">Description of the module writing to the debug console</param> /// <param name="module">Description of the module writing to the debug console</param>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public static void DebugWriteLine(string module, string format, params object[] arg) public static void DebugWriteLine(string module, string format, params object[] arg)
{ {
DebugWriteLineEvent?.Invoke("DEBUG (" + module + "): " + format, arg); DebugWriteLineEvent?.Invoke("DEBUG (" + module + "): " + format, arg);
@@ -169,56 +182,52 @@ namespace Aaru.Console
public static void DebugWriteLine() => DebugWriteLineEvent?.Invoke("", null); public static void DebugWriteLine() => DebugWriteLineEvent?.Invoke("", null);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects to the standard output console using the specified format information. /// Writes the text representation of the specified array of objects to the standard output console using the
/// specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public static void Write(string format, params object[] arg) => WriteEvent?.Invoke(format, arg); public static void Write(string format, params object[] arg) => WriteEvent?.Invoke(format, arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects to the error output console using the specified format information. /// Writes the text representation of the specified array of objects to the error output console using the
/// specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public static void ErrorWrite(string format, params object[] arg) => ErrorWriteEvent?.Invoke(format, arg); public static void ErrorWrite(string format, params object[] arg) => ErrorWriteEvent?.Invoke(format, arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects to the verbose output console using the specified format information. /// Writes the text representation of the specified array of objects to the verbose output console using the
/// specified format information.
/// </summary> /// </summary>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public static void VerboseWrite(string format, params object[] arg) => VerboseWriteEvent?.Invoke(format, arg); public static void VerboseWrite(string format, params object[] arg) => VerboseWriteEvent?.Invoke(format, arg);
/// <summary> /// <summary>
/// Writes the text representation of the specified array of objects to the debug output console using the specified format information. /// Writes the text representation of the specified array of objects to the debug output console using the
/// specified format information.
/// </summary> /// </summary>
/// <param name="module">Description of the module writing to the debug console</param> /// <param name="module">Description of the module writing to the debug console</param>
/// <param name="format">A composite format string.</param> /// <param name="format">A composite format string.</param>
/// <param name="arg">An array of objects to write using <paramref name="format"/>.</param> /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
public static void DebugWrite(string module, string format, params object[] arg) => public static void DebugWrite(string module, string format, params object[] arg) =>
DebugWriteEvent?.Invoke("DEBUG (" + module + "): " + format, arg); DebugWriteEvent?.Invoke("DEBUG (" + module + "): " + format, arg);
/// <summary> /// <summary>Writes the specified string value, followed by the current line terminator, to the standard output console.</summary>
/// Writes the specified string value, followed by the current line terminator, to the standard output console.
/// </summary>
/// <param name="value">The value to write.</param> /// <param name="value">The value to write.</param>
public static void WriteLine(string value) => WriteLineEvent?.Invoke("{0}", value); public static void WriteLine(string value) => WriteLineEvent?.Invoke("{0}", value);
/// <summary> /// <summary>Writes the specified string value, followed by the current line terminator, to the error output console.</summary>
/// Writes the specified string value, followed by the current line terminator, to the error output console.
/// </summary>
/// <param name="value">The value to write.</param> /// <param name="value">The value to write.</param>
public static void ErrorWriteLine(string value) => ErrorWriteLineEvent?.Invoke("{0}", value); public static void ErrorWriteLine(string value) => ErrorWriteLineEvent?.Invoke("{0}", value);
/// <summary> /// <summary>Writes the specified string value, followed by the current line terminator, to the verbose output console.</summary>
/// Writes the specified string value, followed by the current line terminator, to the verbose output console.
/// </summary>
/// <param name="value">The value to write.</param> /// <param name="value">The value to write.</param>
public static void VerboseWriteLine(string value) => VerboseWriteLineEvent?.Invoke("{0}", value); public static void VerboseWriteLine(string value) => VerboseWriteLineEvent?.Invoke("{0}", value);
/// <summary> /// <summary>Writes the specified string value, followed by the current line terminator, to the debug output console.</summary>
/// Writes the specified string value, followed by the current line terminator, to the debug output console.
/// </summary>
/// <param name="module">Description of the module writing to the debug console</param> /// <param name="module">Description of the module writing to the debug console</param>
/// <param name="value">The value to write.</param> /// <param name="value">The value to write.</param>
public static void DebugWriteLine(string module, string value) => public static void DebugWriteLine(string module, string value) =>