diff --git a/BUILDS/net6.0/PluginManager.dll b/BUILDS/net6.0/PluginManager.dll index b790e5f..97cc813 100644 Binary files a/BUILDS/net6.0/PluginManager.dll and b/BUILDS/net6.0/PluginManager.dll differ diff --git a/DiscordBot/Program.cs b/DiscordBot/Program.cs index 92902d4..dad195a 100644 --- a/DiscordBot/Program.cs +++ b/DiscordBot/Program.cs @@ -9,11 +9,10 @@ using PluginManager.Others; using PluginManager.Loaders; using PluginManager.LanguageSystem; using PluginManager.Online; + using System.Diagnostics; using System.Collections.Generic; using System.Linq; -using System.Threading; - namespace DiscordBot { public class Program @@ -37,7 +36,7 @@ namespace DiscordBot Directory.CreateDirectory("./Data/Languages"); Directory.CreateDirectory("./Data/Plugins/Commands"); Directory.CreateDirectory("./Data/Plugins/Events"); - if (!File.Exists("./Data/Resources/DiscordBotCore.data") || Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '=')!.Length != 59) + if (!File.Exists("./Data/Resources/DiscordBotCore.data") || (Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '=').Length != 59 && Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '=').Length != 70)) { File.WriteAllText("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN=token\nBOT_PREFIX=!\n"); while (true) @@ -45,7 +44,7 @@ namespace DiscordBot Console.WriteLine("Please insert your token: "); Console.Write("TOKEN: "); string botToken = Console.ReadLine(); - if (botToken.Length == 59) + if (botToken.Length == 59 || botToken.Length == 70) { string prefix = Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_PREFIX", '='); if (prefix == string.Empty || prefix == null) @@ -96,7 +95,9 @@ namespace DiscordBot Console_Utilities.WriteColorText("&mConsole > &c", false); string[] data = Console.ReadLine().Split(' '); - if (data[0].Length < 2) continue; + if (data[0].Length < 2) + continue; // The input command is less then 2 characters long + switch (data[0]) { case "shutdown": diff --git a/PluginManager/Loaders/PluginLoader.cs b/PluginManager/Loaders/PluginLoader.cs index 3f6ed97..36a192a 100644 --- a/PluginManager/Loaders/PluginLoader.cs +++ b/PluginManager/Loaders/PluginLoader.cs @@ -61,7 +61,11 @@ namespace PluginManager.Loaders Functions.WriteLogFile("Starting plugin loader..."); if (LanguageSystem.Language.ActiveLanguage != null) - Console_Utilities.WriteColorText(LanguageSystem.Language.ActiveLanguage.FormatText(LanguageSystem.Language.ActiveLanguage.LanguageWords["PLUGIN_LOADING_START"])); + Console_Utilities.WriteColorText( + LanguageSystem.Language.ActiveLanguage.FormatText( + LanguageSystem.Language.ActiveLanguage.LanguageWords["PLUGIN_LOADING_START"] + ) + ); //Load commands CommandsLoader CMDLoader = new CommandsLoader(pluginCMDFolder, pluginCMDExtension); diff --git a/PluginManager/Online/LanguageManager.cs b/PluginManager/Online/LanguageManager.cs index 71eacdd..408315c 100644 --- a/PluginManager/Online/LanguageManager.cs +++ b/PluginManager/Online/LanguageManager.cs @@ -27,11 +27,6 @@ namespace PluginManager.Online try { - /*#pragma warning disable SYSLIB0014 - WebClient client = new WebClient(); - #pragma warning restore SYSLIB0014 - Stream data = await client.OpenReadTaskAsync(link); - string[] lines = (await new StreamReader(data).ReadToEndAsync()).Split('\n');*/ List list = await ServerCom.ReadTextFromFile(link); string[] lines = list.ToArray(); diff --git a/PluginManager/Online/PluginsManager.cs b/PluginManager/Online/PluginsManager.cs index 1de837e..344d3fd 100644 --- a/PluginManager/Online/PluginsManager.cs +++ b/PluginManager/Online/PluginsManager.cs @@ -63,7 +63,7 @@ namespace PluginManager.Online continue; } } - else if (op == PluginManager.Others.OperatingSystem.LINUX) + else if (op == Others.OperatingSystem.LINUX) { if (content[4].Contains("Linux")) { diff --git a/PluginManager/Online/ServerCom.cs b/PluginManager/Online/ServerCom.cs index d53e833..edd7e58 100644 --- a/PluginManager/Online/ServerCom.cs +++ b/PluginManager/Online/ServerCom.cs @@ -57,11 +57,8 @@ namespace PluginManager.Online bool isDownloading = true; int c_progress = 0; - long secondsPast = 0; - long m_dwBytes = 0; - double c_downloadSpeed = 0f; - string c_downloadUnit = "MB"; - + //long m_dwBytes = 0; + Others.Console_Utilities.ProgressBar pbar = new Others.Console_Utilities.ProgressBar(100, ""); IProgress progress = new Progress(percent => @@ -71,39 +68,20 @@ namespace PluginManager.Online IProgress progress_downloaded = new Progress(downloadedBytes => { - m_dwBytes = downloadedBytes; + //m_dwBytes = downloadedBytes; }); Task updateProgressBarTask = new Task(async () => { while (isDownloading) { - //pbar.Update(c_progress, c_downloadSpeed, c_downloadUnit); pbar.Update(c_progress); if (c_progress == 100) break; System.Threading.Thread.Sleep(500); } }); - - Task calculateDownloadSpeed = new Task(async () => - { - - while (isDownloading) - { - secondsPast++; - c_downloadSpeed = m_dwBytes / secondsPast; - - c_downloadSpeed /= 1024; // in KB - c_downloadSpeed /= 1024; // in MB - - c_downloadSpeed = Math.Round(c_downloadSpeed, 2, MidpointRounding.AwayFromZero); - - System.Threading.Thread.Sleep(1000); - } - }); - - // new System.Threading.Thread(calculateDownloadSpeed.Start).Start(); + new System.Threading.Thread(updateProgressBarTask.Start).Start(); await DownloadFileAsync(URL, location, progress, progress_downloaded); diff --git a/PluginManager/Others/Console Utilities.cs b/PluginManager/Others/Console Utilities.cs index 8c0f230..80e3330 100644 --- a/PluginManager/Others/Console Utilities.cs +++ b/PluginManager/Others/Console Utilities.cs @@ -96,7 +96,6 @@ namespace PluginManager.Others foreach (string[] row in data) { - //Console.Write("\t"); if (row[0][0] == tableLine) Console.Write(tableCross); else Console.Write(tableWall); for (int l = 0; l < row.Length; l++) @@ -135,7 +134,6 @@ namespace PluginManager.Others /// /// Write the text using color options( &g-green; &b-blue; &r-red; &c-clear; ) - /// /// /// The text public static void WriteColorText(string text, bool appendNewLine = true)