aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Plugin system] Move byte addressable media images to dependency injection.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-06 00:46:36 +01:00
parent 508b78719d
commit 9572abf86d
8 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: 33da34f017...8cc6d3f18b

4
Aaru.Core/ImageFormat.cs
View File

@@ -84,11 +84,11 @@ public static class ImageFormat
return imageFormat; return imageFormat;
// Check all but RAW plugin // Check all but RAW plugin
foreach(Type pluginType in plugins.ByteAddressableImages.Values) foreach(IByteAddressableImage imagePlugin in plugins.ByteAddressableImages.Values)
{ {
try try
{ {
if(Activator.CreateInstance(pluginType) is not IByteAddressableImage imagePlugin) if(imagePlugin is null)
continue; continue;
if(imagePlugin.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000")) if(imagePlugin.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))

8
Aaru.Generators/PluginRegisterGenerator.cs
View File

@@ -247,16 +247,16 @@ public class PluginRegisterGenerator : ISourceGenerator
if(byteAddressableImagePlugins?.Count > 0) if(byteAddressableImagePlugins?.Count > 0)
{ {
sb.AppendLine(" public List<Type> GetAllByteAddressablePlugins() => new()"); sb.AppendLine(" public void RegisterByteAddressablePlugins(IServiceCollection services)");
sb.AppendLine(" {"); sb.AppendLine(" {");
foreach(string plugin in byteAddressableImagePlugins) foreach(string plugin in byteAddressableImagePlugins)
sb.AppendLine($" typeof({plugin}),"); sb.AppendLine($" services.AddTransient<IByteAddressableImage, {plugin}>();");
sb.AppendLine(" };"); sb.AppendLine(" }");
} }
else else
sb.AppendLine(" public List<Type> GetAllByteAddressablePlugins() => null;"); sb.AppendLine(" public void RegisterByteAddressablePlugins(IServiceCollection services) {}");
sb.AppendLine("}"); sb.AppendLine("}");

1
Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
View File

@@ -607,7 +607,6 @@ public sealed class MainWindowViewModel : ViewModelBase
var checkRaw = false; var checkRaw = false;
List<string> idPlugins; List<string> idPlugins;
Type pluginType;
PluginRegister plugins = PluginRegister.Singleton; PluginRegister plugins = PluginRegister.Singleton;
if(partitions.Count == 0) if(partitions.Count == 0)

6
Aaru.Tests/Images/BlockMediaImageTest.cs
View File

@@ -243,13 +243,9 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
string pluginName = idPlugins[j]; string pluginName = idPlugins[j];
if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName, if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName,
out Type pluginType)) out IReadOnlyFilesystem fs))
continue; continue;
Assert.IsNotNull(pluginType, Localization.Could_not_instantiate_filesystem_plugin);
var fs = Activator.CreateInstance(pluginType) as IReadOnlyFilesystem;
Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, pluginName)); Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, pluginName));
ErrorNumber error = fs.Mount(image, partitions[i], null, null, null); ErrorNumber error = fs.Mount(image, partitions[i], null, null, null);

1
Aaru.Tests/Issues/FsExtractIssueTest.cs
View File

@@ -76,7 +76,6 @@ public abstract class FsExtractIssueTest
if(idPlugins.Count == 0) if(idPlugins.Count == 0)
continue; continue;
Type pluginType;
ErrorNumber error; ErrorNumber error;
if(idPlugins.Count > 1) if(idPlugins.Count > 1)

1
Aaru/Commands/Filesystem/ExtractFiles.cs
View File

@@ -311,7 +311,6 @@ sealed class ExtractFilesCommand : Command
AaruConsole.WriteLine(UI.Filesystem_not_identified); AaruConsole.WriteLine(UI.Filesystem_not_identified);
else else
{ {
Type pluginType;
ErrorNumber error = ErrorNumber.InvalidArgument; ErrorNumber error = ErrorNumber.InvalidArgument;
if(idPlugins.Count > 1) if(idPlugins.Count > 1)

1
Aaru/Commands/Filesystem/Ls.cs
View File

@@ -284,7 +284,6 @@ sealed class LsCommand : Command
AaruConsole.WriteLine(UI.Filesystem_not_identified); AaruConsole.WriteLine(UI.Filesystem_not_identified);
else else
{ {
Type pluginType;
ErrorNumber error = ErrorNumber.InvalidArgument; ErrorNumber error = ErrorNumber.InvalidArgument;
if(idPlugins.Count > 1) if(idPlugins.Count > 1)