From 33da34f017ccb082c5ab639267d9c7b0b5b67009 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Fri, 6 Oct 2023 00:40:37 +0100
Subject: [PATCH] [Plugin system] Move writable media images to dependency
 injection.

---
 Interfaces/IPluginRegister.cs |  8 +++++---
 PluginRegister.cs             | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Interfaces/IPluginRegister.cs b/Interfaces/IPluginRegister.cs
index df6ca34..7e35cb1 100644
--- a/Interfaces/IPluginRegister.cs
+++ b/Interfaces/IPluginRegister.cs
@@ -95,9 +95,11 @@ public interface IPluginRegister
     /// <param name="services">Service collection</param>
     void RegisterWritableFloppyImagePlugins(IServiceCollection services);
 
-    /// <summary>Gets all writable media image plugins</summary>
-    /// <returns>List of writable media image plugins</returns>
-    List<Type> GetAllWritableImagePlugins();
+    /// <summary>
+    ///     Registers all writable media image plugins in the provided service collection
+    /// </summary>
+    /// <param name="services">Service collection</param>
+    void RegisterWritableImagePlugins(IServiceCollection services);
 
     /// <summary>
     ///     Registers all archive plugins in the provided service collection
diff --git a/PluginRegister.cs b/PluginRegister.cs
index 6e2f10c..e561a3d 100644
--- a/PluginRegister.cs
+++ b/PluginRegister.cs
@@ -47,15 +47,22 @@ public class PluginRegister
     /// <summary>List of byte addressable image plugins</summary>
     public readonly SortedDictionary<string, Type> ByteAddressableImages;
 
-    /// <summary>List of writable media image plugins</summary>
-    public readonly SortedDictionary<string, Type> WritableImages;
     IServiceProvider   _serviceProvider;
     IServiceCollection _services;
 
-    PluginRegister()
+    PluginRegister() => ByteAddressableImages = new SortedDictionary<string, Type>();
+
+    /// <summary>List of writable media image plugins</summary>
+    public SortedDictionary<string, IBaseWritableImage> WritableImages
     {
-        WritableImages        = new SortedDictionary<string, Type>();
-        ByteAddressableImages = new SortedDictionary<string, Type>();
+        get
+        {
+            SortedDictionary<string, IBaseWritableImage> mediaImages = new();
+            foreach(IBaseWritableImage plugin in _serviceProvider.GetServices<IBaseWritableImage>())
+                mediaImages[plugin.Name.ToLower()] = plugin;
+
+            return mediaImages;
+        }
     }
 
     /// <summary>List of writable floppy image plugins</summary>
@@ -221,14 +228,7 @@ public class PluginRegister
         pluginRegister.RegisterMediaImagePlugins(_services);
         pluginRegister.RegisterPartitionPlugins(_services);
         pluginRegister.RegisterWritableFloppyImagePlugins(_services);
-
-        foreach(Type type in pluginRegister.GetAllWritableImagePlugins() ?? Enumerable.Empty<Type>())
-        {
-            if(Activator.CreateInstance(type) is IBaseWritableImage plugin &&
-               !WritableImages.ContainsKey(plugin.Name.ToLower()))
-                WritableImages.Add(plugin.Name.ToLower(), type);
-        }
-
+        pluginRegister.RegisterWritableImagePlugins(_services);
         pluginRegister.RegisterArchivePlugins(_services);
 
         foreach(Type type in pluginRegister.GetAllByteAddressablePlugins() ?? Enumerable.Empty<Type>())