andreitdr/SethDiscordBot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs and added version checking system.

Browse Source
This commit is contained in:
Wizzy69
2022-07-06 13:38:44 +03:00
parent 3abb4cdda7
commit 1292e0f585
5 changed files with 122 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
PluginManager/Config.cs
View File

@@ -5,6 +5,7 @@ using System.Text.Json;
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Threading;
using Newtonsoft.Json.Linq;
namespace PluginManager
{
@@ -16,7 +17,7 @@ namespace PluginManager
public static class Config
{
public static class Plugins
public static class PluginConfig
{
public static List<Tuple<string, PluginType>> InstalledPlugins = new();
@@ -81,11 +82,33 @@ namespace PluginManager
if (appConfig!.ApplicationVariables!.ContainsKey(key)) return false;
if (value == null) return false;
appConfig.ApplicationVariables.Add(key, value);
if (isProtected) appConfig.ProtectedKeyWords!.Add(key);
if (isProtected && key != "Version") appConfig.ProtectedKeyWords!.Add(key);
SaveConfig();
return true;
}
public static void GetAndAddValueToVariable(string key, string value, bool isReadOnly)
{
if (Config.ContainsKey(key)) return;
if (int.TryParse(value, out var intValue))
Config.AddValueToVariables(key, intValue, isReadOnly);
else if (bool.TryParse(value, out var boolValue))
Config.AddValueToVariables(key, boolValue, isReadOnly);
else if (float.TryParse(value, out var floatValue))
Config.AddValueToVariables(key, floatValue, isReadOnly);
else if (double.TryParse(value, out var doubleValue))
Config.AddValueToVariables(key, doubleValue, isReadOnly);
else if (uint.TryParse(value, out var uintValue))
Config.AddValueToVariables(key, uintValue, isReadOnly);
else if (long.TryParse(value, out var longValue))
Config.AddValueToVariables(key, longValue, isReadOnly);
else if (byte.TryParse(value, out var byteValue))
Config.AddValueToVariables(key, byteValue, isReadOnly);
else
Config.AddValueToVariables(key, value, isReadOnly);
}
public static T? GetValue<T>(string key)
{
if (!appConfig!.ApplicationVariables!.ContainsKey(key)) return default;

57
PluginManager/Items/ConsoleCommandsHandler.cs
View File

@@ -32,32 +32,24 @@ public class ConsoleCommandsHandler
AddCommand("help", "Show help", "help <command>", args =>
{
if (args[1] == "lip")
{
foreach (var tuple in Config.Plugins.InstalledPlugins)
{
Console.WriteLine(tuple.Item1);
}
return;
}
if (args.Length <= 1)
{
Console.WriteLine("Available commands:");
List<string[]> items = new List<string[]>();
items.Add(new [] {"-", "-", "-"});
items.Add(new [] {"Command", "Description", "Usage"});
items.Add(new[] {" ", " ", "Argument type: <optional> [required]"});
items.Add(new [] {"-", "-", "-"});
items.Add(new[] { "-", "-", "-" });
items.Add(new[] { "Command", "Description", "Usage" });
items.Add(new[] { " ", " ", "Argument type: <optional> [required]" });
items.Add(new[] { "-", "-", "-" });
foreach (var command in commandList)
{
var pa = from p in command.Action.Method.GetParameters()
where p.Name != null select p.ParameterType.FullName;
where p.Name != null
select p.ParameterType.FullName;
items.Add(new[] { command.CommandName, command.Description, command.Usage });
}
items.Add(new [] {"-", "-", "-"});
items.Add(new[] { "-", "-", "-" });
Console_Utilities.FormatAndAlignTable(items);
}
else
@@ -75,6 +67,7 @@ public class ConsoleCommandsHandler
}
);
AddCommand("lp", "Load plugins", () =>
{
if (pluginsLoaded) return;
@@ -141,8 +134,8 @@ public class ConsoleCommandsHandler
await ServerCom.DownloadFileAsync(info[1], path);
if (info[0] == "Command" || info[0] == "Event")
if (info[0] == "Event")
Config.Plugins.InstalledPlugins.Add(new(name, PluginType.Event));
else if (info[0] == "Command") Config.Plugins.InstalledPlugins.Add(new(name, PluginType.Command));
Config.PluginConfig.InstalledPlugins.Add(new(name, PluginType.Event));
else if (info[0] == "Command") Config.PluginConfig.InstalledPlugins.Add(new(name, PluginType.Command));
Console.WriteLine("\n");
@@ -190,16 +183,6 @@ public class ConsoleCommandsHandler
Console.WriteLine("\n");
File.Delete("./" + split[1]);
}
if (name == "DBUI")
{
Console.WriteLine("Reload with GUI ?[y/n]");
if (Console.ReadKey().Key == ConsoleKey.Y)
{
Process.Start("./DiscordBotGUI.exe");
Environment.Exit(0);
}
}
}
Console.WriteLine();
@@ -227,23 +210,7 @@ public class ConsoleCommandsHandler
try
{
if (Config.ContainsKey(key)) return;
if (int.TryParse(value, out var intValue))
Config.AddValueToVariables(key, intValue, isReadOnly);
else if (bool.TryParse(value, out var boolValue))
Config.AddValueToVariables(key, boolValue, isReadOnly);
else if (float.TryParse(value, out var floatValue))
Config.AddValueToVariables(key, floatValue, isReadOnly);
else if (double.TryParse(value, out var doubleValue))
Config.AddValueToVariables(key, doubleValue, isReadOnly);
else if (uint.TryParse(value, out var uintValue))
Config.AddValueToVariables(key, uintValue, isReadOnly);
else if (long.TryParse(value, out var longValue))
Config.AddValueToVariables(key, longValue, isReadOnly);
else if (byte.TryParse(value, out var byteValue))
Config.AddValueToVariables(key, byteValue, isReadOnly);
else
Config.AddValueToVariables(key, value, isReadOnly);
Config.GetAndAddValueToVariable(key, value, isReadOnly);
Console.WriteLine($"Updated config file with the following command: {args[1]} => {value}");
}
catch (Exception ex)

4
PluginManager/Online/PluginsManager.cs
View File

@@ -58,7 +58,7 @@ public class PluginsManager
else
display[3] = "1";
if (Config.Plugins.Contains(content[0]) || Config.Plugins.Contains(content[0]))
if (Config.PluginConfig.Contains(content[0]) || Config.PluginConfig.Contains(content[0]))
display[4] = "✓";
else
display[4] = "X";
@@ -73,7 +73,7 @@ public class PluginsManager
display[1] = content[1];
display[2] = content[2];
if (content.Length == 6 && (content[5] != null || content[5].Length > 2)) display[3] = ((await ServerCom.ReadTextFromFile(content[5])).Count + 1).ToString();
if (Config.Plugins.Contains(content[0]) || Config.Plugins.Contains(content[0]))
if (Config.PluginConfig.Contains(content[0]) || Config.PluginConfig.Contains(content[0]))
display[4] = "✓";
else
display[4] = "X";