From c8480b3c83119628b6f67a30568e42134bd5e4dc Mon Sep 17 00:00:00 2001 From: Andrei Tudor Date: Sun, 17 Dec 2023 17:14:48 +0200 Subject: [PATCH] Added Channel to DBCommandExecutingArguments.cs --- DiscordBot/Bot/Actions/Plugin.cs | 4 +- PluginManager/Online/PluginsManager.cs | 52 +++++++++---------- .../Others/DBCommandExecutingArguments.cs | 1 + 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/DiscordBot/Bot/Actions/Plugin.cs b/DiscordBot/Bot/Actions/Plugin.cs index 957ed83..564a239 100644 --- a/DiscordBot/Bot/Actions/Plugin.cs +++ b/DiscordBot/Bot/Actions/Plugin.cs @@ -36,10 +36,10 @@ public class Plugin: ICommandAction PluginsManager manager = #if !DEBUG - new PluginsManager(); + new PluginsManager("releases"); #else // new PluginsManager("tests"); - new PluginsManager(); + new PluginsManager("releases"); #endif switch (args[0]) diff --git a/PluginManager/Online/PluginsManager.cs b/PluginManager/Online/PluginsManager.cs index 74b763b..8417b69 100644 --- a/PluginManager/Online/PluginsManager.cs +++ b/PluginManager/Online/PluginsManager.cs @@ -10,26 +10,11 @@ namespace PluginManager.Online; public class PluginsManager { - - #if DEBUG - /// - /// The Plugin Manager constructor - /// - /// The link to the file where all plugins are stored - /// The link to the file where all plugin versions are stored - public PluginsManager(string plink, string vlink) - { - PluginsLink = plink; - VersionsLink = vlink; - } - - #endif - /// /// The Plugin Manager constructor. It uses the default links and the default branch. /// /// The main branch from where the plugin manager gets its info - public PluginsManager(string? branch = "releases") + public PluginsManager(string? branch) { PluginsLink = $"https://raw.githubusercontent.com/andreitdr/SethPlugins/{branch}/PluginsList"; VersionsLink = $"https://raw.githubusercontent.com/andreitdr/SethPlugins/{branch}/Versions"; @@ -101,7 +86,7 @@ public class PluginsManager return null; } - public async Task GetVersionOfPackageFromWeb(string pakName) + private async Task GetVersionOfPackageFromWeb(string pakName) { var data = await ServerCom.ReadTextFromURL(VersionsLink); foreach (var item in data) @@ -135,28 +120,41 @@ public class PluginsManager for (var i = 0; i < len; i++) { var contents = lines[i].Split(','); - if (Functions.GetOperatingSystem() == OperatingSystem.WINDOWS && contents[4].Contains("Windows")) + if (contents[0].ToLowerInvariant() == name.ToLowerInvariant()) { - if (contents[0].ToLowerInvariant() == name.ToLowerInvariant()) + if (Functions.GetOperatingSystem() == OperatingSystem.WINDOWS && contents[4].Contains("Windows")) { if (contents.Length == 6) - return new[] { contents[2], contents[3], contents[5] }; + return new[] + { + contents[2], contents[3], contents[5] + }; if (contents.Length == 5) - return new[] { contents[2], contents[3], string.Empty }; + return new[] + { + contents[2], contents[3], string.Empty + }; throw new Exception("Failed to download plugin. Invalid Argument Length"); + } - } - else if (Functions.GetOperatingSystem() == OperatingSystem.LINUX && contents[4].Contains("Linux")) - { - if (contents[0].ToLowerInvariant() == name.ToLowerInvariant()) + + if (Functions.GetOperatingSystem() == OperatingSystem.LINUX && contents[4].Contains("Linux")) { if (contents.Length == 6) - return new[] { contents[2], contents[3], contents[5] }; + return new[] + { + contents[2], contents[3], contents[5] + }; if (contents.Length == 5) - return new[] { contents[2], contents[3], string.Empty }; + return new[] + { + contents[2], contents[3], string.Empty + }; throw new Exception("Failed to download plugin. Invalid Argument Length"); + } } + } } catch (Exception exception) diff --git a/PluginManager/Others/DBCommandExecutingArguments.cs b/PluginManager/Others/DBCommandExecutingArguments.cs index bd8b5e6..ee7da81 100644 --- a/PluginManager/Others/DBCommandExecutingArguments.cs +++ b/PluginManager/Others/DBCommandExecutingArguments.cs @@ -44,4 +44,5 @@ public class DBCommandExecutingArguments public string cleanContent { get; init; } public string commandUsed { get; init; } public string[]? arguments { get; init; } + public ISocketMessageChannel Channel => context.Channel; }