[Plugin system] Initialize plugin base in tests.

Aaru.Core/Filesystems.cs

@@ -51,7 +51,6 @@ public static class Filesystems
     public static void Identify(IMediaImage imagePlugin, out List<string> idPlugins, Partition partition,
                                 bool        getGuid = false)
     {
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         idPlugins = new List<string>();

Aaru.Core/ImageFormat.cs

@@ -49,7 +49,6 @@ public static class ImageFormat
     {
         try
         {
-            PluginBase.Init();
             PluginRegister plugins = PluginRegister.Singleton;
 
             IBaseImage imageFormat = null;

Aaru.Core/Partitions.cs

@@ -50,7 +50,6 @@ public static class Partitions
     /// <returns>List of found partitions</returns>
     public static List<Partition> GetAll(IMediaImage image)
     {
-        PluginBase.Init();
         PluginRegister  plugins          = PluginRegister.Singleton;
         List<Partition> foundPartitions  = new();
         List<Partition> childPartitions  = new();

Aaru.Core/Sidecar/Sidecar.cs

@@ -61,7 +61,6 @@ public sealed partial class Sidecar
     /// <summary>Initializes a new instance of this class</summary>
     public Sidecar()
     {
-        PluginBase.Init();
         _plugins      = PluginRegister.Singleton;
         _imgChkWorker = new Checksum();
         _aborted      = false;
@@ -77,8 +76,6 @@ public sealed partial class Sidecar
     /// <param name="encoding">Encoding for analysis</param>
     public Sidecar(IBaseImage image, string imagePath, Guid filterId, Encoding encoding)
     {
-        PluginBase.Init();
-
         _image        = image;
         _imagePath    = imagePath;
         _filterId     = filterId;

Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs

@@ -36,7 +36,6 @@ using System.Reactive;
 using System.Reflection;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
-using Aaru.Core;
 using Aaru.Gui.Models;
 using Aaru.Gui.Views.Dialogs;
 using Aaru.Localization;
@@ -61,7 +60,6 @@ public sealed class PluginsViewModel : ViewModelBase
         FloppyImages         = new ObservableCollection<PluginModel>();
         WritableFloppyImages = new ObservableCollection<PluginModel>();
         CloseCommand         = ReactiveCommand.Create(ExecuteCloseCommand);
-        PluginBase.Init();
 
         // TODO: Takes too much time
         foreach(Type filterType in PluginRegister.Singleton.Filters.Values)

Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs

@@ -173,7 +173,6 @@ public sealed class ImageConvertViewModel : ViewModelBase
         DriveSerialNumberVisible     = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveSerialNumber);
         DriveFirmwareRevisionVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveFirmwareRevision);
 
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         foreach(Type pluginType in plugins.WritableImages.Values)

Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs

@@ -168,7 +168,6 @@ public sealed class MediaDumpViewModel : ViewModelBase
             }
         }
 
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         foreach(Type pluginType in plugins.WritableImages.Values)

Aaru.Tests/Filesystems/FilesystemTest.cs

@@ -21,6 +21,10 @@ public abstract class FilesystemTest(string fileSystemType)
 
     public abstract FileSystemTest[] Tests { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
+
     [Test]
     public void Detect()
     {
@@ -40,8 +44,7 @@ public abstract class FilesystemTest(string fileSystemType)
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter inputFilter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter inputFilter = filtersList.GetFilter(testFile);
 
                 Assert.IsNotNull(inputFilter, string.Format(Localization.Filter_0, testFile));
 
@@ -120,8 +123,7 @@ public abstract class FilesystemTest(string fileSystemType)
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter inputFilter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter inputFilter = filtersList.GetFilter(testFile);
 
                 Assert.IsNotNull(inputFilter, string.Format(Localization.Filter_0, testFile));
 
@@ -160,8 +162,7 @@ public abstract class FilesystemTest(string fileSystemType)
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter inputFilter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter inputFilter = filtersList.GetFilter(testFile);
 
                 Assert.IsNotNull(inputFilter, string.Format(Localization.Filter_0, testFile));
 

Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs

@@ -43,8 +43,7 @@ public abstract class ReadOnlyFilesystemTest : FilesystemTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter inputFilter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter inputFilter = filtersList.GetFilter(testFile);
 
                 Assert.IsNotNull(inputFilter, string.Format(Localization.Filter_0, testFile));
 
@@ -183,8 +182,7 @@ public abstract class ReadOnlyFilesystemTest : FilesystemTest
             if(!exists)
                 continue;
 
-            var     filtersList = new FiltersList();
+            IFilter inputFilter = PluginRegister.Singleton.GetFilter(testFile);
-            IFilter inputFilter = filtersList.GetFilter(testFile);
 
             if(ImageFormat.Detect(inputFilter) is not IMediaImage image)
                 continue;

Aaru.Tests/Images/BlockMediaImageTest.cs

@@ -20,6 +20,9 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
     const           uint                     SECTORS_TO_READ = 256;
     public abstract BlockImageTestExpected[] Tests { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
     [Test]
     public void Info()
     {
@@ -39,8 +42,7 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage;
@@ -90,8 +92,7 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage;
@@ -135,7 +136,6 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
     public void Contents()
     {
         Environment.CurrentDirectory = DataFolder;
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         Assert.Multiple(() =>
@@ -155,8 +155,7 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage;

Aaru.Tests/Images/OpticalMediaImageTest.cs

@@ -27,6 +27,10 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
     const           uint                       SECTORS_TO_READ = 256;
     public abstract OpticalImageTestExpected[] Tests { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
+
     [Test]
     public void Info()
     {
@@ -46,8 +50,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as IOpticalMediaImage;
@@ -158,8 +161,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as IOpticalMediaImage;
@@ -199,7 +201,6 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
 
                             for(var i = 0; i < track.FileSystems.Length; i++)
                             {
-                                PluginBase.Init();
                                 PluginRegister plugins = PluginRegister.Singleton;
                                 bool found = plugins.Filesystems.TryGetValue(idPlugins[i], out Type pluginType);
 
@@ -361,8 +362,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     return;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as IOpticalMediaImage;

Aaru.Tests/Images/TapeMediaImageTest.cs

@@ -4,6 +4,7 @@ using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
+using Aaru.Core;
 using FluentAssertions;
 using FluentAssertions.Execution;
 using NUnit.Framework;
@@ -17,6 +18,10 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest
 
     public abstract TapeImageTestExpected[] Tests { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
+
     [Test]
     public void Tape()
     {
@@ -36,8 +41,7 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as ITapeImage;
@@ -85,8 +89,7 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage;
@@ -136,8 +139,7 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(Plugin.GetType()) as IMediaImage;

Aaru.Tests/Issues/FsExtractHashIssueTest.cs

@@ -28,13 +28,16 @@ public abstract class FsExtractHashIssueTest
     protected abstract bool                       ExpectPartitions { get; }
     protected abstract string                     Namespace        { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
+
     [Test]
     public void Test()
     {
         Environment.CurrentDirectory = DataFolder;
 
-        var     filtersList = new FiltersList();
+        IFilter inputFilter = PluginRegister.Singleton.GetFilter(TestFile);
-        IFilter inputFilter = filtersList.GetFilter(TestFile);
 
         Dictionary<string, string> options = ParsedOptions;
         options["debug"] = Debug.ToString();
@@ -46,7 +49,6 @@ public abstract class FsExtractHashIssueTest
         if(Encoding != null)
             encodingClass = Claunia.Encoding.Encoding.GetEncoding(Encoding);
 
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         var imageFormat = ImageFormat.Detect(inputFilter) as IMediaImage;

Aaru.Tests/Issues/FsExtractIssueTest.cs

@@ -22,13 +22,15 @@ public abstract class FsExtractIssueTest
     public abstract bool                       ExpectPartitions { get; }
     public abstract string                     Namespace        { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
     [Test]
     public void Test()
     {
         Environment.CurrentDirectory = DataFolder;
 
-        var     filtersList = new FiltersList();
+        IFilter inputFilter = PluginRegister.Singleton.GetFilter(TestFile);
-        IFilter inputFilter = filtersList.GetFilter(TestFile);
 
         Dictionary<string, string> options = ParsedOptions;
         options["debug"] = Debug.ToString();
@@ -40,7 +42,6 @@ public abstract class FsExtractIssueTest
         if(Encoding != null)
             encodingClass = Claunia.Encoding.Encoding.GetEncoding(Encoding);
 
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         var imageFormat = ImageFormat.Detect(inputFilter) as IMediaImage;

Aaru.Tests/Issues/ImageReadIssueTest.cs

@@ -16,6 +16,9 @@ public abstract class ImageReadIssueTest
     public abstract string DataFolder { get; }
     public abstract string TestFile   { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
     [Test]
     public void Test()
     {
@@ -24,8 +27,7 @@ public abstract class ImageReadIssueTest
         bool exists = File.Exists(TestFile);
         Assert.True(exists, Localization.Test_file_not_found);
 
-        var     filtersList = new FiltersList();
+        IFilter inputFilter = PluginRegister.Singleton.GetFilter(TestFile);
-        IFilter inputFilter = filtersList.GetFilter(TestFile);
 
         Assert.IsNotNull(inputFilter, Localization.Filter_for_test_file_is_not_detected);
 

Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs

@@ -38,6 +38,9 @@ public abstract class OpticalImageConvertIssueTest
     public abstract string                     Md5                     { get; }
     public abstract bool                       UseLong                 { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
     [Test]
     public void Convert()
     {
@@ -47,8 +50,7 @@ public abstract class OpticalImageConvertIssueTest
         Metadata    sidecar = null;
         ErrorNumber errno;
 
-        var     filtersList = new FiltersList();
+        IFilter inputFilter = PluginRegister.Singleton.GetFilter(InputPath);
-        IFilter inputFilter = filtersList.GetFilter(InputPath);
 
         Assert.IsNotNull(inputFilter, Localization.Cannot_open_specified_file);
 
@@ -368,10 +370,12 @@ public abstract class OpticalImageConvertIssueTest
         if(trackFlags.Count > 0)
         {
             foreach((byte track, byte flags) in trackFlags)
+            {
                 outputOptical.WriteSectorTag(new[]
                 {
                     flags
                 }, track, SectorTagType.CdTrackFlags);
+            }
         }
 
         if(mcn != null)

Aaru.Tests/Issues/OpticalImageReadIssueTest.cs

@@ -18,6 +18,9 @@ public abstract class OpticalImageReadIssueTest
     public abstract string DataFolder { get; }
     public abstract string TestFile   { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
     [Test]
     public void Test()
     {
@@ -26,8 +29,7 @@ public abstract class OpticalImageReadIssueTest
         bool exists = File.Exists(TestFile);
         Assert.True(exists, Localization.Test_file_not_found);
 
-        var     filtersList = new FiltersList();
+        IFilter inputFilter = PluginRegister.Singleton.GetFilter(TestFile);
-        IFilter inputFilter = filtersList.GetFilter(TestFile);
 
         Assert.IsNotNull(inputFilter, Localization.Filter_for_test_file_is_not_detected);
 

Aaru.Tests/Partitions/PartitionSchemeTest.cs

@@ -15,6 +15,9 @@ public abstract class PartitionSchemeTest
     public abstract string          DataFolder { get; }
     public abstract PartitionTest[] Tests      { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
     [Test]
     public void Test()
     {
@@ -33,8 +36,7 @@ public abstract class PartitionSchemeTest
                 // ReSharper disable once HeuristicUnreachableCode
                 continue;
 
-            var     filtersList = new FiltersList();
+            IFilter inputFilter = PluginRegister.Singleton.GetFilter(testFile);
-            IFilter inputFilter = filtersList.GetFilter(testFile);
 
             Assert.IsNotNull(inputFilter, string.Format(Localization.Filter_0, testFile));
 

Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs

@@ -8,6 +8,7 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
+using Aaru.Core;
 using Aaru.Core.Media;
 using Aaru.Devices;
 using FluentAssertions;
@@ -21,6 +22,9 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
     const           uint                       SECTORS_TO_READ = 256;
     public abstract OpticalImageTestExpected[] Tests { get; }
 
+    [OneTimeSetUp]
+    public void InitTest() => PluginBase.Init();
+
     [Test]
     public void Info()
     {
@@ -41,8 +45,7 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var image = Activator.CreateInstance(InputPlugin.GetType()) as IOpticalMediaImage;
@@ -151,8 +154,7 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
                 if(!exists)
                     continue;
 
-                var     filtersList = new FiltersList();
+                IFilter filter = PluginRegister.Singleton.GetFilter(testFile);
-                IFilter filter      = filtersList.GetFilter(testFile);
                 filter.Open(testFile);
 
                 var inputFormat = Activator.CreateInstance(InputPlugin.GetType()) as IOpticalMediaImage;
@@ -464,10 +466,12 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
                 if(trackFlags.Count > 0)
                 {
                     foreach((byte track, byte flags) in trackFlags)
+                    {
                         outputFormat.WriteSectorTag(new[]
                         {
                             flags
                         }, track, SectorTagType.CdTrackFlags);
+                    }
                 }
 
                 if(mcn != null)
@@ -496,8 +500,7 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
                               string.Format(Localization.Error_0_closing_output_image_Contents_are_not_correct,
                                             outputFormat.ErrorMessage));
 
-                filtersList = new FiltersList();
+                filter = PluginRegister.Singleton.GetFilter(outputPath);
-                filter      = filtersList.GetFilter(outputPath);
                 filter.Open(outputPath);
 
                 string tmpFolder = Path.GetDirectoryName(outputPath);

Aaru/Commands/Filesystem/Options.cs

@@ -88,7 +88,6 @@ sealed class ListOptionsCommand : Command
         AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", verbose);
         Statistics.AddCommand("list-options");
 
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         AaruConsole.WriteLine(UI.Read_only_filesystems_options);

Aaru/Commands/Image/Options.cs

@@ -88,7 +88,6 @@ sealed class ListOptionsCommand : Command
         AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", verbose);
         Statistics.AddCommand("list-options");
 
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         AaruConsole.WriteLine(UI.Read_Write_media_images_options);

Aaru/Commands/ListNamespaces.cs

@@ -87,7 +87,6 @@ sealed class ListNamespacesCommand : Command
         AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", verbose);
         Statistics.AddCommand("list-namespaces");
 
-        PluginBase.Init();
         PluginRegister plugins = PluginRegister.Singleton;
 
         foreach(KeyValuePair<string, Type> kvp in plugins.ReadOnlyFilesystems)

Aaru/Commands/Media/Dump.cs

@@ -370,7 +370,6 @@ sealed class DumpMediaCommand : Command
         if(isResponse)
             eject = true;
 
-        PluginBase.Init();
         PluginRegister           plugins    = PluginRegister.Singleton;
         List<IBaseWritableImage> candidates = new();
         string                   extension  = Path.GetExtension(outputPath);