From c674c76bd07f0dbf8af9b948af83a35395b262a9 Mon Sep 17 00:00:00 2001 From: Wizzy69 Date: Wed, 6 Jul 2022 13:56:04 +0300 Subject: [PATCH] Fixed some display bugs --- DiscordBot/Program.cs | 3 ++- PluginManager/Config.cs | 1 + PluginManager/Items/ConsoleCommandsHandler.cs | 19 ++++++++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/DiscordBot/Program.cs b/DiscordBot/Program.cs index a0e3468..c78d07d 100644 --- a/DiscordBot/Program.cs +++ b/DiscordBot/Program.cs @@ -78,7 +78,8 @@ public class Program { Console.ForegroundColor = ConsoleColor.White; var cmd = Console.ReadLine(); - consoleCommandsHandler.HandleCommand(cmd); + if (!consoleCommandsHandler.HandleCommand(cmd)) + Console.WriteLine("Failed to run command " + cmd); } } diff --git a/PluginManager/Config.cs b/PluginManager/Config.cs index 6d326a6..985abc8 100644 --- a/PluginManager/Config.cs +++ b/PluginManager/Config.cs @@ -136,6 +136,7 @@ namespace PluginManager public static bool RemoveKey(string key) { + if (key == "Version" || key == "token" || key == "prefix") return false; appConfig!.ApplicationVariables!.Remove(key); appConfig.ProtectedKeyWords!.Remove(key); SaveConfig(); diff --git a/PluginManager/Items/ConsoleCommandsHandler.cs b/PluginManager/Items/ConsoleCommandsHandler.cs index 7d35389..0e88442 100644 --- a/PluginManager/Items/ConsoleCommandsHandler.cs +++ b/PluginManager/Items/ConsoleCommandsHandler.cs @@ -57,8 +57,8 @@ public class ConsoleCommandsHandler foreach (var command in commandList) if (command.CommandName == args[1]) { - Console.WriteLine(command.Description); - Console.WriteLine(command.Usage); + Console.WriteLine("Command description: " + command.Description); + Console.WriteLine("Command execution format:" + command.Usage); return; } @@ -286,12 +286,25 @@ public class ConsoleCommandsHandler return commandList.FirstOrDefault(t => t.CommandName == command); } - public void HandleCommand(string command) + public bool HandleCommand(string command, bool removeCommandExecution = true) { var args = command.Split(' '); foreach (var item in commandList.ToList()) if (item.CommandName == args[0]) + { + if (removeCommandExecution) + { + Console.SetCursorPosition(0, Console.CursorTop - 1); + for (int i = 0; i < command.Length; i++) Console.Write(" "); + Console.SetCursorPosition(0, Console.CursorTop); + } + + Console.WriteLine(); item.Action(args); + return true; + } + + return false; //Console.WriteLine($"Executing: {args[0]} with the following parameters: {args.MergeStrings(1)}"); } }