update(plugins-refresh): Reimplementing

Author: skuzzis

plugin_files/plugins/disabled/.gitignore

@@ -0,0 +1 @@
+test_plugin/

src/components/BasicComponent/src/BasicComponent.cpp

@@ -8,6 +8,8 @@
 #include "../../Plugins/inc/Plugin.h"
 #include "../../../files/Files.h"
 #include "../../../http/HTTPManager.h"
+#include "../../Plugins/inc/plugins/CPPPlugin.h"
+#include "../../Plugins/inc/plugins/LuaPlugin.h"
 
 typedef const char *(*GetPlugin)();
 
@@ -272,47 +274,73 @@ void SwiftlyPluginManagerReload(CPlayerSlot *slot, CCommandContext context, std:
     PrintToClientOrConsole(slot, "Plugin Reload", "Plugin '%s' has been reloaded.\n", plugin_name.c_str());
 }
 
+void LoadPlugin(std::string plugin_name)
+{
+    Plugin *plugin = nullptr;
+
+    std::vector<std::string> files = Files::FetchFileNames("addons/swiftly/plugins/" + plugin_name);
+
+    for (const std::string &file : files)
+    {
+        if (ends_with(file, WIN_LINUX(".dll", ".so")))
+        {
+            plugin = new CPPPlugin(file, plugin_name, PluginType_t::PLUGIN_CPP);
+            break;
+        }
+        else if (ends_with(file, ".lua"))
+        {
+            plugin = new LuaPlugin(std::string(std::filesystem::current_path().string() + "/addons/swiftly/plugins/" + plugin_name), plugin_name, PluginType_t::PLUGIN_LUA);
+            break;
+        }
+    }
+
+    if (plugin)
+        AddPluginInMap(plugin);
+}
+
 void SwiftlyPluginManagerRefresh(CPlayerSlot *slot, CCommandContext context)
 {
     if (slot->Get() != -1)
         return;
 
-    PrintToClientOrConsole(slot, "Plugin Refresh", "This feature has been temporarely removed until support for multi language scripting is finished.\n");
-
-    // std::vector<std::string> pluginNames;
-
-    // std::vector<std::string> files = Files::FetchFileNames("addons/swiftly/plugins");
-    // for (const std::string &file : files)
-    // {
-    //     if (!ends_with(file, WIN_LINUX(".dll", ".so")))
-    //         continue;
-    //     if (starts_with(file, WIN_LINUX("disabled\\", "disabled/")))
-    //         continue;
-
-    //     pluginNames.push_back(file);
-    // }
-
-    // uint32 newPlugins = 0;
-
-    // for (const std::string plugin_name : pluginNames)
-    // {
-    //     if (!ExistsPluginInMap(plugin_name))
-    //     {
-    //         std::vector<std::string> exploded = explode(plugin_name, WIN_LINUX("\\", "/"));
-    //         std::string name = exploded[exploded.size() - 2];
-    //         if (name == "plugins")
-    //         {
-    //             PrintToClientOrConsole(slot, "Plugin Refresh", "Skipped '%s' because it needs to be in it's own folder.\n", plugin_name);
-    //             continue;
-    //         }
-
-    //         Plugin *plugin = new Plugin(plugin_name, name);
-    //         AddPluginInMap(plugin);
-    //         ++newPlugins;
-    //     }
-    // }
-
-    // PrintToClientOrConsole(slot, "Plugin Refresh", "%02d plugins have been added.\n", newPlugins);
+    std::vector<std::string> pluginNames;
+
+    std::vector<std::string> directories = Files::FetchDirectories("addons/swiftly/plugins");
+    for (std::string directory : directories)
+    {
+        if (directory.find("disabled") != std::string::npos)
+            continue;
+
+        directory = replace(directory, "addons/swiftly/plugins", "");
+        directory = replace(directory, WIN_LINUX("\\", "/"), "");
+
+        pluginNames.push_back(directory);
+    }
+
+    uint32 newPlugins = 0;
+
+    for (const std::string plugin_name : pluginNames)
+    {
+        if (!ExistsPluginInMap(plugin_name))
+        {
+            // std::vector<std::string> exploded = explode(plugin_name, WIN_LINUX("\\", "/"));
+            // std::string name = exploded[exploded.size() - 2];
+            // if (name == "plugins")
+            // {
+            //     PrintToClientOrConsole(slot, "Plugin Refresh", "Skipped '%s' because it needs to be in it's own folder.\n", plugin_name);
+            //     continue;
+            // }
+
+            // Plugin *plugin = new Plugin(plugin_name, name);
+
+            // AddPluginInMap(new LuaPlugin(plugin_name, "", PluginType_t::PLUGIN_LUA));
+
+            LoadPlugin(plugin_name);
+            ++newPlugins;
+        }
+    }
+
+    PrintToClientOrConsole(slot, "Plugin Refresh", "%02d plugins have been added.\n", newPlugins);
 }
 
 void SwiftlyPluginManager(CPlayerSlot *slot, CCommandContext context, const char *subcmd, const char *plugin_name)

src/components/Plugins/src/language/lua/commands.cpp

@@ -29,6 +29,4 @@ void SetupLuaCommands(luacpp::LuaState *state, Plugin *plugin)
                        } });
 
     state->DoString("commands = Commands()");
-
-    PRINT("Scripting - Lua", "Commands loaded.\n");
 }

src/components/Plugins/src/language/lua/configuration.cpp

@@ -58,6 +58,4 @@ void SetupLuaConfiguration(luacpp::LuaState *state, Plugin *plugin)
                             return state->CreateNil(); });
 
     state->DoString("config = Configuration()");
-
-    PRINT("Scripting - Lua", "Configuration loaded.\n");
 }

src/components/Plugins/src/language/lua/convars.cpp

@@ -49,6 +49,4 @@ void SetupLuaConvars(luacpp::LuaState *state, Plugin *plugin)
                     } });
 
     state->DoString("convar = Convars()");
-
-    PRINT("Scripting - Lua", "Convars loaded.\n");
 }

src/components/Plugins/src/language/lua/core.cpp

@@ -87,8 +87,6 @@ void SetupLuaEnvironment(Plugin *plugin)
                           { return playerTable; },
                           "GetPlayers");
 
-    PRINT("Scripting - Lua", "Core loaded.\n");
-
     SetupLuaCommands(state, plugin);
     SetupLuaConfiguration(state, plugin);
     SetupLuaConvars(state, plugin);

src/components/Plugins/src/language/lua/database.cpp

@@ -92,6 +92,4 @@ void SetupLuaDatabase(luacpp::LuaState *state, Plugin *plugin)
                     return tbl; });
 
     state->DoString("db = nil;");
-
-    PRINT("Scripting - Lua", "Database loaded.\n");
 }

src/components/Plugins/src/language/lua/entities.cpp

@@ -217,6 +217,4 @@ void SetupLuaEntities(luacpp::LuaState *state, Plugin *plugin)
             scripting_Entity_SetColors(base->entityID, colors.GetInteger("r"), colors.GetInteger("g"), colors.GetInteger("b"), colors.GetInteger("a")); });
 
     state->DoString("entities = Entities()");
-
-    PRINT("Scripting - Lua", "Entities loaded.\n");
 }

src/components/Plugins/src/language/lua/gameevents.cpp

@@ -48,6 +48,4 @@ void SetupLuaGameEvents(luacpp::LuaState *state, Plugin *plugin)
     state->DoString("function Internal_RegisterPlayer(slot, fake) players[slot] = Player(slot, fake); end");
     state->DoString("function Internal_UnregisterPlayer(slot) players[slot] = nil; end");
     state->DoString("function Internal_OnProgramLoad(plugin_name, bin) if OnProgramLoad then OnProgramLoad(plugin_name, bin) end end");
-
-    PRINT("Scripting - Lua", "Game Events loaded.\n");
 }

src/components/Plugins/src/language/lua/http.cpp

@@ -81,6 +81,4 @@ void SetupLuaHTTP(luacpp::LuaState *state, Plugin *plugin)
                    { scripting_HTTP_SetFollowRedirect(base->GetRequestID(), follow); });
 
     state->DoString("http = HTTP()");
-
-    PRINT("Scripting - Lua", "HTTP loaded.\n");
 }