PluginManager/Loaders/Loader.cs

@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace PluginManager.Loaders;
-
-internal class LoaderArgs : EventArgs
-{
-    internal string? PluginName { get; init; }
-    internal string? TypeName { get; init; }
-    internal bool IsLoaded { get; init; }
-    internal Exception? Exception { get; init; }
-    internal object? Plugin { get; init; }
-}
-
-internal class Loader<T>
-{
-    internal Loader(string path, string extension)
-    {
-        this.path = path;
-        this.extension = extension;
-    }
-
-
-    private string path { get; }
-    private string extension { get; }
-
-    internal event FileLoadedEventHandler? FileLoaded;
-
-    internal event PluginLoadedEventHandler? PluginLoaded;
-
-    internal List<T>? Load()
-    {
-        var list = new List<T>();
-        if (!Directory.Exists(path))
-        {
-            Directory.CreateDirectory(path);
-            return null;
-        }
-
-        var files = Directory.GetFiles(path, $"*.{extension}", SearchOption.AllDirectories);
-        foreach (var file in files)
-        {
-            Assembly.LoadFrom(file);
-            if (FileLoaded != null)
-            {
-                var args = new LoaderArgs
-                {
-                    Exception = null,
-                    TypeName = nameof(T),
-                    IsLoaded = false,
-                    PluginName = new FileInfo(file).Name.Split('.')[0],
-                    Plugin = null
-                };
-                FileLoaded.Invoke(args);
-            }
-        }
-
-        try
-        {
-            var interfaceType = typeof(T);
-            var types = AppDomain.CurrentDomain.GetAssemblies()
-                                 .SelectMany(a => a.GetTypes())
-                                 .Where(p => interfaceType.IsAssignableFrom(p) && p.IsClass)
-                                 .ToArray();
-
-
-            list.Clear();
-            foreach (var type in types)
-                try
-                {
-                    var plugin = (T)Activator.CreateInstance(type)!;
-                    list.Add(plugin);
-
-
-                    if (PluginLoaded != null)
-                        PluginLoaded.Invoke(new LoaderArgs
-                        {
-                            Exception = null,
-                            IsLoaded = true,
-                            PluginName = type.FullName,
-                            TypeName = nameof(T),
-                            Plugin = plugin
-                        }
-                        );
-                }
-                catch (Exception ex)
-                {
-                    if (PluginLoaded != null)
-                        PluginLoaded.Invoke(new LoaderArgs
-                        {
-                            Exception = ex,
-                            IsLoaded = false,
-                            PluginName = type.FullName,
-                            TypeName = nameof(T)
-                        });
-                }
-        }
-        catch (Exception ex)
-        {
-            Logger.WriteErrFile(ex.ToString());
-        }
-
-
-        return list;
-    }
-
-
-    internal delegate void FileLoadedEventHandler(LoaderArgs args);
-
-    internal delegate void PluginLoadedEventHandler(LoaderArgs args);
-}

PluginManager/Loaders/LoaderV2.cs

@@ -8,9 +8,17 @@ using PluginManager.Interfaces;
 
 namespace PluginManager.Loaders
 {
-    internal class LoaderV2
+    internal class LoaderArgs : EventArgs
     {
-        internal LoaderV2(string path, string extension)
+        internal string? PluginName { get; init; }
+        internal string? TypeName { get; init; }
+        internal bool IsLoaded { get; init; }
+        internal Exception? Exception { get; init; }
+        internal object? Plugin { get; init; }
+    }
+    internal class Loader
+    {
+        internal Loader(string path, string extension)
         {
             this.path = path;
             this.extension = extension;

PluginManager/Loaders/PluginLoader.cs

@@ -97,7 +97,7 @@ public class PluginLoader
         Logger.WriteLogFile("Starting plugin loader ... Client: " + _client.CurrentUser.Username);
         Logger.WriteLine("Loading plugins");
 
-        var loader = new LoaderV2("./Data/Plugins", "dll");
+        var loader = new Loader("./Data/Plugins", "dll");
         loader.FileLoaded += (args) => Logger.WriteLogFile($"{args.PluginName} file Loaded");
         loader.PluginLoaded += Loader_PluginLoaded;
         var res = loader.Load();