diff --git a/RombaSharp/Program.cs b/RombaSharp/Program.cs index abb9b6d4..973263fb 100644 --- a/RombaSharp/Program.cs +++ b/RombaSharp/Program.cs @@ -38,7 +38,7 @@ namespace RombaSharp if (!Console.IsOutputRedirected && scriptLocation == -1) { Console.Clear(); - SabreTools.Library.Data.Build.PrepareConsole("RombaSharp"); + Prepare.SetConsoleHeader("RombaSharp"); } // Now we remove the script tag because it messes things up diff --git a/SabreTools.Library/Data/Build.cs b/SabreTools.Library/Data/Prepare.cs similarity index 85% rename from SabreTools.Library/Data/Build.cs rename to SabreTools.Library/Data/Prepare.cs index 0336aba6..06920768 100644 --- a/SabreTools.Library/Data/Build.cs +++ b/SabreTools.Library/Data/Prepare.cs @@ -5,33 +5,18 @@ namespace SabreTools.Library.Data /// /// Generic console preparation for program output /// - public static class Build + public static class Prepare { - /// - /// Returns true if running in a Mono or .NET Core environment - /// - public static bool MonoOrCoreEnvironment - { - get - { -#if NET_FRAMEWORK - return Type.GetType("Mono.Runtime") != null; -#else - return true; -#endif - } - } - /// /// Readies the console and outputs the header /// - /// The name to be displayed as the program - public static void PrepareConsole(string name) + /// The name to be displayed as the program + public static void SetConsoleHeader(string program) { // Dynamically create the header string, adapted from http://stackoverflow.com/questions/8200661/how-to-align-string-in-fixed-length-string int width = Console.WindowWidth - 3; string border = $"+{new string('-', width)}+"; - string mid = $"{name} {Constants.Version}"; + string mid = $"{program} {Constants.Version}"; mid = $"|{mid.PadLeft(((width - mid.Length) / 2) + mid.Length).PadRight(width)}|"; // If we're outputting to console, do fancy things @@ -49,7 +34,7 @@ namespace SabreTools.Library.Data Console.BackgroundColor = ConsoleColor.Blue; } - Console.Title = $"{name} {Constants.Version}"; + Console.Title = $"{program} {Constants.Version}"; // Output the header Console.WriteLine(border); @@ -65,5 +50,20 @@ namespace SabreTools.Library.Data } } } + + /// + /// Returns true if running in a Mono or .NET Core environment + /// + private static bool MonoOrCoreEnvironment + { + get + { +#if NET_FRAMEWORK + return Type.GetType("Mono.Runtime") != null; +#else + return true; +#endif + } + } } } diff --git a/SabreTools/Program.cs b/SabreTools/Program.cs index c4a14a73..ca24eca3 100644 --- a/SabreTools/Program.cs +++ b/SabreTools/Program.cs @@ -32,7 +32,7 @@ namespace SabreTools if (!Console.IsOutputRedirected && scriptLocation == -1) { Console.Clear(); - Build.PrepareConsole("SabreTools"); + Prepare.SetConsoleHeader("SabreTools"); } // Now we remove the script tag because it messes things up