[Plugin system] Move checksums to dependency injection.

Aaru.Archives/Aaru.Archives.csproj

@@ -53,6 +53,7 @@
     <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj"/>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4"/>
     <PackageReference Include="SharpCompress" Version="0.34.0"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
       <PrivateAssets>all</PrivateAssets>

Aaru.Core/Aaru.Core.csproj

@@ -74,6 +74,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4"/>
     <PackageReference Include="SkiaSharp" Version="2.88.6"/>
     <PackageReference Include="Spectre.Console" Version="0.47.0"/>
     <PackageReference Include="System.ValueTuple" Version="4.5.0"/>

Aaru.Core/PluginBase.cs

@@ -32,13 +32,16 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Aaru.Checksums;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.DiscImages;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Aaru.Core;
 
 /// <summary>Plugin base operations</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Global")]
 public sealed class PluginBase
 {
     static PluginBase _instance;
@@ -63,6 +66,8 @@ public sealed class PluginBase
     public readonly SortedDictionary<string, Type> WritableFloppyImages;
     /// <summary>List of writable media image plugins</summary>
     public readonly SortedDictionary<string, Type> WritableImages;
+    IServiceProvider   _serviceProvider;
+    IServiceCollection _services;
 
     PluginBase()
     {
@@ -78,6 +83,19 @@ public sealed class PluginBase
         ByteAddressableImages = new SortedDictionary<string, Type>();
     }
 
+    /// <summary>List of all checksums formats</summary>
+    public SortedDictionary<string, IChecksum> Checksums
+    {
+        get
+        {
+            SortedDictionary<string, IChecksum> checksums = new();
+            foreach(IChecksum plugin in _serviceProvider.GetServices<IChecksum>())
+                checksums.Add(plugin.Name.ToLower(), plugin);
+
+            return checksums;
+        }
+    }
+
     /// <summary>Gets a singleton with all the known plugins</summary>
     public static PluginBase Singleton
     {
@@ -86,22 +104,26 @@ public sealed class PluginBase
             if(_instance != null)
                 return _instance;
 
-            _instance = new PluginBase();
+            _instance = new PluginBase
+            {
+                _services = new ServiceCollection()
+            };
 
-            IPluginRegister checksumRegister    = new Register();
+            IPluginRegister imagesRegister      = new Register();
-            IPluginRegister imagesRegister      = new DiscImages.Register();
             IPluginRegister filesystemsRegister = new Aaru.Filesystems.Register();
             IPluginRegister filtersRegister     = new Filters.Register();
             IPluginRegister partitionsRegister  = new Aaru.Partitions.Register();
             IPluginRegister archiveRegister     = new Archives.Register();
 
-            _instance.AddPlugins(checksumRegister);
+            _instance.AddPlugins(new Checksums.Register());
             _instance.AddPlugins(imagesRegister);
             _instance.AddPlugins(filesystemsRegister);
             _instance.AddPlugins(filtersRegister);
             _instance.AddPlugins(partitionsRegister);
             _instance.AddPlugins(archiveRegister);
 
+            _instance._serviceProvider = _instance._services.BuildServiceProvider();
+
             return _instance;
         }
     }
@@ -110,6 +132,8 @@ public sealed class PluginBase
     /// <param name="pluginRegister">Plugin register</param>
     void AddPlugins(IPluginRegister pluginRegister)
     {
+        pluginRegister.RegisterChecksumPlugins(_services);
+
         foreach(Type type in pluginRegister.GetAllFilesystemPlugins() ?? Enumerable.Empty<Type>())
         {
             if(Activator.CreateInstance(type) is IFilesystem plugin && !Filesystems.ContainsKey(plugin.Name.ToLower()))

Aaru.Devices/Aaru.Devices.csproj

@@ -42,6 +42,7 @@
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4"/>
     <PackageReference Include="System.Management" Version="8.0.0-rc.1.23419.4"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
   </ItemGroup>

Aaru.Filesystems/Aaru.Filesystems.csproj

@@ -45,6 +45,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Claunia.Encoding" Version="1.9.2"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4"/>
     <PackageReference Include="System.ValueTuple" Version="4.5.0"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
   </ItemGroup>

Aaru.Filters/Aaru.Filters.csproj

@@ -58,6 +58,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DotNetZip" Version="1.16.0"/>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4"/>
     <PackageReference Include="SharpCompress" Version="0.34.0"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
   </ItemGroup>

Aaru.Generators/PluginRegisterGenerator.cs

@@ -100,6 +100,7 @@ public class PluginRegisterGenerator : ISourceGenerator
         sb.AppendLine("using System;");
         sb.AppendLine("using System.Collections.Generic;");
         sb.AppendLine("using Aaru.CommonTypes.Interfaces;");
+        sb.AppendLine("using Microsoft.Extensions.DependencyInjection;");
         sb.AppendLine();
         sb.AppendLine($"namespace {@namespace};");
         sb.AppendLine();
@@ -123,16 +124,14 @@ public class PluginRegisterGenerator : ISourceGenerator
 
         if(checksums?.Count > 0)
         {
-            sb.AppendLine("    public List<Type> GetAllChecksumPlugins() => new()");
+            sb.AppendLine("    public void RegisterChecksumPlugins(IServiceCollection services)");
             sb.AppendLine("    {");
-
             foreach(string plugin in checksums)
-                sb.AppendLine($"        typeof({plugin}),");
+                sb.AppendLine($"        services.AddTransient<IChecksum, {plugin}>();");
-
+            sb.AppendLine("    }");
-            sb.AppendLine("    };");
         }
         else
-            sb.AppendLine("    public List<Type> GetAllChecksumPlugins() => null;");
+            sb.AppendLine("    public void RegisterChecksumPlugins(IServiceCollection services) {}");
 
         sb.AppendLine();
 

Aaru.Partitions/Aaru.Partitions.csproj

@@ -60,6 +60,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4"/>
     <PackageReference Include="Spectre.Console" Version="0.47.0"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
   </ItemGroup>

Aaru/Main.cs

@@ -240,7 +240,6 @@ class MainClass
         rootCommand.AddCommand(new ImageFamily());
         rootCommand.AddCommand(new MediaFamily());
         rootCommand.AddCommand(new ArchiveFamily());
-
         rootCommand.AddCommand(new ConfigureCommand());
         rootCommand.AddCommand(new FormatsCommand());
         rootCommand.AddCommand(new ListEncodingsCommand());