feat(plugins-list): Show load error in sw plugins list

Author: skuzzis

src/components/BasicComponent/src/BasicComponent.cpp

@@ -165,11 +165,14 @@ void SwiftlyPluginManagerList(CPlayerSlot *slot, CCommandContext context)
 
     PrintToClientOrConsole(slot, "Plugins List", "Showing below %02d plugins loaded:\n", loadedPlugins);
     uint32 showingIdx = 0;
+    std::vector<std::string> errors;
     for (uint32 i = 0; i < plugins.size(); i++)
     {
         Plugin *plugin = plugins[i];
         if (plugin == nullptr)
             continue;
+        if (plugin->err.size() > 0)
+            errors.push_back(string_format("Plugin '%s': %s", plugin->GetName().c_str(), plugin->err.c_str()));
         if (!plugin->IsPluginLoaded())
             continue;
 
@@ -187,6 +190,14 @@ void SwiftlyPluginManagerList(CPlayerSlot *slot, CCommandContext context)
                                plugin->ExecuteFunctionWithReturn<const char *, GetPlugin>("GetPluginAuthor"),
                                website == "" ? "" : string_format(" ( %s )", website.c_str()).c_str());
     }
+    if (errors.size() && slot->Get() == -1)
+    {
+        PrintToClientOrConsole(slot, "Plugins List", "Plugin load errors:\n");
+        for (const std::string err : errors)
+            PrintToClientOrConsole(slot, "Plugins List", "%s\n", err.c_str());
+
+        errors.clear();
+    }
 }
 
 void SwiftlyPluginManagerInfo(CPlayerSlot *slot, CCommandContext context, std::string plugin_name)

src/components/Plugins/inc/Plugin.h

@@ -154,6 +154,7 @@ class Plugin
     virtual bool InternalLoadPlugin() = 0;
 
 public:
+    std::string err;
     std::string m_path;
 
     Plugin(std::string path, std::string name, PluginType_t pluginType) : m_path(path)
@@ -168,6 +169,8 @@ class Plugin
 
     void LoadPlugin()
     {
+        this->err.clear();
+
         if (!this->InternalLoadPlugin())
             return;
 

src/components/Plugins/inc/plugins/CPPPlugin.h

@@ -34,6 +34,7 @@ class CPPPlugin : public Plugin
         if (!this->m_hModule)
         {
             PRINTF("LoadPlugin", "Failed to load module: %s\n", std::string(dlerror()).c_str());
+            this->err = std::string(dlerror()).c_str();
             return false;
         }
 #endif

src/components/Plugins/inc/plugins/LuaPlugin.h

@@ -64,6 +64,7 @@ class LuaPlugin : public Plugin
             if (!this->luaState->DoFile(file.c_str(), &errstr, nullptr))
             {
                 PRINTF("LoadPlugin", "Failed to load plugin file '%s'\nError: %s\n", file.c_str(), errstr.c_str());
+                this->err = errstr;
                 this->StopPlugin();
                 return false;
             }

src/components/Plugins/src/PluginsComponent.cpp

@@ -25,7 +25,7 @@ void PluginsComponent::LoadComponent()
     std::vector<std::string> directories = Files::FetchDirectories("addons/swiftly/plugins");
     for (std::string directory : directories)
     {
-        if (directory == "disabled")
+        if (directory.find("disabled") != std::string::npos)
             continue;
 
         directory = replace(directory, "addons/swiftly/plugins", "");