Updated docker and repo check for no internet connection

DiscordBotCore/Application.cs

@@ -57,7 +57,7 @@ namespace DiscordBotCore
         {
             if (!await OnlineFunctions.IsInternetConnected())
             {
-                Console.WriteLine("No internet connection detected. Exiting ...");
+                Console.WriteLine("The main repository server is not reachable. Please check your internet connection.");
                 Environment.Exit(0);
             }
 
@@ -95,6 +95,24 @@ namespace DiscordBotCore
             CurrentApplication.InternalActionManager = new InternalActionManager();
             await CurrentApplication.InternalActionManager.Initialize();
             
+            if (OperatingSystem.IsWindows())
+            {
+                CurrentApplication.ApplicationEnvironmentVariables.Add("console.terminal", "cmd");
+                CurrentApplication.ApplicationEnvironmentVariables.Add("console.cmd_prefix", "/c ");
+            }
+        
+            if(OperatingSystem.IsLinux())
+            {
+                CurrentApplication.ApplicationEnvironmentVariables.Add("console.terminal", "bash");
+                CurrentApplication.ApplicationEnvironmentVariables.Add("console.cmd_prefix", string.Empty);
+            }
+        
+            if(OperatingSystem.IsMacOS())
+            {
+                CurrentApplication.ApplicationEnvironmentVariables.Add("console.terminal", "sh");
+                CurrentApplication.ApplicationEnvironmentVariables.Add("console.cmd_prefix", string.Empty);
+            }
+            
             IsRunning = true;
         }
 
@@ -146,5 +164,10 @@ namespace DiscordBotCore
             var result = Path.Combine(_PluginsFolder, path);
             return result;
         }
+
+        public static void Log(string message, LogType? logType = LogType.Info)
+        {
+            CurrentApplication.Logger.Log(message, logType);
+        }
     }
 }

DiscordBotCore/Online/Helpers/OnlineFunctions.cs

@@ -114,7 +114,7 @@ internal static class OnlineFunctions
         try
         {
             using var client = new HttpClient();
-            await client.GetStringAsync("https://www.google.com");
+            await client.GetStringAsync("files.wizzy-server.ro");
             result = true;
         }
         catch

DiscordBotCore/Online/PluginManager.cs

@@ -13,8 +13,9 @@ namespace DiscordBotCore.Online;
 
 public sealed class PluginManager
 {
+    private static readonly string _LibrariesBaseFolder = "Libraries";
     private readonly PluginRepository _PluginRepository;
-    internal InstallingPluginInformation InstallingPluginInformation { get; private set; }
+    internal InstallingPluginInformation? InstallingPluginInformation { get; private set; }
     
     public PluginManager(PluginRepository pluginRepository)
     {
@@ -41,8 +42,7 @@ public sealed class PluginManager
         {
             return null;
         }
-
-        // try to get the best matching plugin using the pluginName as a search query
+        
         PluginOnlineInfo? result = plugins.Find(pl => pl.Name.Contains(pluginName, StringComparison.CurrentCultureIgnoreCase));
         if (result is null)
         {
@@ -62,9 +62,20 @@ public sealed class PluginManager
 
     public async Task ExecutePluginInstallScripts(List<OnlineScriptDependencyInfo> listOfDependencies)
     {
-        string consoleType = OperatingSystem.IsWindows() ? "cmd.exe" : "bash";
+        string? console = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("console.terminal");
+        if (string.IsNullOrEmpty(console))
+        {
+            return;
+        }
+        
+        string? cmd_prefix = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("console.cmd_prefix");
+        if (string.IsNullOrEmpty(cmd_prefix))
+        {
+            return;
+        }
+        
         foreach (var script in listOfDependencies)
-            await ServerCom.RunConsoleCommand(consoleType, "/c " + script.ScriptContent);
+            await ServerCom.RunConsoleCommand(console, $"{cmd_prefix}{script.ScriptContent}");
     }
 
     public async Task AppendPluginToDatabase(PluginInfo pluginData)
@@ -147,8 +158,8 @@ public sealed class PluginManager
 
         await RemovePluginFromDatabase(pluginInfo.PluginName);
 
-        if (Directory.Exists($"Libraries/{pluginInfo.PluginName}"))
-            Directory.Delete($"Libraries/{pluginInfo.PluginName}", true);
+        if (Directory.Exists($"{_LibrariesBaseFolder}/{pluginInfo.PluginName}"))
+            Directory.Delete($"{_LibrariesBaseFolder}/{pluginInfo.PluginName}", true);
     }
 
     public async Task<string?> GetDependencyLocation(string dependencyName)
@@ -186,7 +197,7 @@ public sealed class PluginManager
 
     public string GenerateDependencyRelativePath(string pluginName, string dependencyPath)
     {
-        string relative = $"./Libraries/{pluginName}/{dependencyPath}";
+        string relative = $"./{_LibrariesBaseFolder}/{pluginName}/{dependencyPath}";
         return relative;
     }
 
@@ -242,11 +253,19 @@ public sealed class PluginManager
         {
             foreach (var scriptDependency in pluginData.ScriptDependencies)
             {
-                string console = OperatingSystem.IsWindows() ? "start cmd.exe" : "bash";
-                string arguments = OperatingSystem.IsWindows()
-                    ? $"/c {scriptDependency.ScriptContent}"
-                    : scriptDependency.ScriptContent;
+                string? console = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("console.terminal");
+                if (string.IsNullOrEmpty(console))
+                {
+                    return;
+                }
+                
+                string? cmdPrefix = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("console.cmd_prefix");
+                if (string.IsNullOrEmpty(cmdPrefix))
+                {
+                    return;
+                }
 
+                string arguments = $"{cmdPrefix}{scriptDependency.ScriptContent}";
                 await ServerCom.RunConsoleCommand(console, arguments);
             }
         }
@@ -288,14 +307,27 @@ public sealed class PluginManager
             }
 
         if (pluginData.HasScriptDependencies)
+        {
             foreach (var scriptDependency in pluginData.ScriptDependencies)
             {
+                string? console = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("console.terminal");
+                if (string.IsNullOrEmpty(console))
+                {
+                    return;
+                }
+                
+                string? cmdPrefix = Application.CurrentApplication.ApplicationEnvironmentVariables.Get<string>("console.cmd_prefix");
+                if (string.IsNullOrEmpty(cmdPrefix))
+                {
+                    return;
+                }
 
-                string console = OperatingSystem.IsWindows() ? "start cmd.exe" : "bash";
-                string arguments = OperatingSystem.IsWindows() ? $"/c {scriptDependency.ScriptContent}" : scriptDependency.ScriptContent;
+                string arguments = $"{cmdPrefix}{scriptDependency.ScriptContent}";
 
                 await ServerCom.RunConsoleCommand(console, arguments);
             }
+            
+        }
 
         PluginInfo pluginInfo = PluginInfo.FromOnlineInfo(pluginData);
 

DiscordBotCore/Repository/PluginRepository.cs

@@ -6,7 +6,7 @@ namespace DiscordBotCore.Repository;
 
 public sealed class PluginRepository : RepositoryBase
 {
-    public static readonly PluginRepository Default = new PluginRepository("Testing", "https://wizzy-server.ro/SethDiscordBot/PluginsRepo", "PluginsList.json");
+    public static readonly PluginRepository Default = new PluginRepository("Testing", "https://files.wizzy-server.ro/SethDiscordBot/PluginsRepo", "PluginsList.json");
 
     private PluginRepository(string repositoryName, string repositoryUrl, string databaseFile) : base(repositoryName, repositoryUrl, databaseFile)
     {