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

Use Type for filesystem plugin list.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-17 14:56:37 +00:00
parent 07cbdf13e3
commit 0c1bf310f9
15 changed files with 159 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Aaru.Core/Filesystems.cs
View File

@@ -30,8 +30,8 @@
// Copyright © 2011-2023 Natalia Portillo // Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Aaru.CommonTypes; using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
@@ -53,7 +53,15 @@ public static class Filesystems
{ {
PluginBase plugins = GetPluginBase.Instance; PluginBase plugins = GetPluginBase.Instance;
idPlugins = (from plugin in plugins.PluginsList.Values where plugin.Identify(imagePlugin, partition) idPlugins = new List<string>();
select getGuid ? plugin.Id.ToString() : plugin.Name.ToLower()).ToList();
foreach(Type plugin in plugins.Filesystems.Values)
{
if(Activator.CreateInstance(plugin) is not IFilesystem fs)
continue;
if(fs.Identify(imagePlugin, partition))
idPlugins.Add(getGuid ? fs.Id.ToString() : fs.Name.ToLower());
}
} }
} }

4
Aaru.Core/Sidecar/BlockMedia.cs
View File

@@ -709,7 +709,7 @@ public sealed partial class Sidecar
List<FileSystem> lstFs = new(); List<FileSystem> lstFs = new();
foreach(IFilesystem plugin in plugins.PluginsList.Values) foreach(IFilesystem plugin in plugins.Filesystems.Values)
try try
{ {
if(_aborted) if(_aborted)
@@ -766,7 +766,7 @@ public sealed partial class Sidecar
List<FileSystem> lstFs = new(); List<FileSystem> lstFs = new();
foreach(IFilesystem plugin in plugins.PluginsList.Values) foreach(IFilesystem plugin in plugins.Filesystems.Values)
try try
{ {
if(_aborted) if(_aborted)

4
Aaru.Core/Sidecar/OpticalDisc.cs
View File

@@ -530,7 +530,7 @@ public sealed partial class Sidecar
List<FileSystem> lstFs = new(); List<FileSystem> lstFs = new();
foreach(IFilesystem plugin in plugins.PluginsList.Values) foreach(IFilesystem plugin in plugins.Filesystems.Values)
try try
{ {
if(_aborted) if(_aborted)
@@ -588,7 +588,7 @@ public sealed partial class Sidecar
Sequence = xmlTrk.Sequence.Number Sequence = xmlTrk.Sequence.Number
}; };
foreach(IFilesystem plugin in plugins.PluginsList.Values) foreach(IFilesystem plugin in plugins.Filesystems.Values)
try try
{ {
if(_aborted) if(_aborted)

2
Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs
View File

@@ -97,7 +97,7 @@ public sealed class PluginsViewModel : ViewModelBase
Author = partition.Author Author = partition.Author
}); });
foreach(IFilesystem filesystem in GetPluginBase.Instance.PluginsList.Values) foreach(IFilesystem filesystem in GetPluginBase.Instance.Filesystems.Values)
Filesystems.Add(new PluginModel Filesystems.Add(new PluginModel
{ {
Name = filesystem.Name, Name = filesystem.Name,

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

@@ -593,7 +593,7 @@ public sealed class MainWindowViewModel : ViewModelBase
bool checkRaw = false; bool checkRaw = false;
List<string> idPlugins; List<string> idPlugins;
IFilesystem plugin; Type pluginType;
PluginBase plugins = GetPluginBase.Instance; PluginBase plugins = GetPluginBase.Instance;
if(partitions.Count == 0) if(partitions.Count == 0)
@@ -636,11 +636,14 @@ public sealed class MainWindowViewModel : ViewModelBase
AaruConsole.WriteLine(string.Format(UI.Identified_by_0_plugins, idPlugins.Count)); AaruConsole.WriteLine(string.Format(UI.Identified_by_0_plugins, idPlugins.Count));
foreach(string pluginName in idPlugins) foreach(string pluginName in idPlugins)
if(plugins.PluginsList.TryGetValue(pluginName, out plugin)) if(plugins.Filesystems.TryGetValue(pluginName, out pluginType))
{ {
plugin.GetInformation(imageFormat, partition, out string information, null); if(Activator.CreateInstance(pluginType) is not IFilesystem fs)
continue;
var fsPlugin = plugin as IReadOnlyFilesystem; fs.GetInformation(imageFormat, partition, out string information, null);
var fsPlugin = fs as IReadOnlyFilesystem;
if(fsPlugin != null) if(fsPlugin != null)
{ {
@@ -655,11 +658,11 @@ public sealed class MainWindowViewModel : ViewModelBase
var filesystemModel = new FileSystemModel var filesystemModel = new FileSystemModel
{ {
VolumeName = VolumeName =
plugin.Metadata.VolumeName is null ? $"{plugin.Metadata.Type}" fs.Metadata.VolumeName is null ? $"{fs.Metadata.Type}"
: $"{plugin.Metadata.VolumeName} ({plugin.Metadata.Type})", : $"{fs.Metadata.VolumeName} ({fs.Metadata.Type})",
Filesystem = plugin, Filesystem = fs,
ReadOnlyFilesystem = fsPlugin, ReadOnlyFilesystem = fsPlugin,
ViewModel = new FileSystemViewModel(plugin.Metadata, information) ViewModel = new FileSystemViewModel(fs.Metadata, information)
}; };
// TODO: Trap expanding item // TODO: Trap expanding item
@@ -675,7 +678,7 @@ public sealed class MainWindowViewModel : ViewModelBase
Statistics.AddCommand("ls"); Statistics.AddCommand("ls");
} }
Statistics.AddFilesystem(plugin.Metadata.Type); Statistics.AddFilesystem(fs.Metadata.Type);
partitionModel.FileSystems.Add(filesystemModel); partitionModel.FileSystems.Add(filesystemModel);
} }
} }
@@ -705,11 +708,14 @@ public sealed class MainWindowViewModel : ViewModelBase
AaruConsole.WriteLine(string.Format(UI.Identified_by_0_plugins, idPlugins.Count)); AaruConsole.WriteLine(string.Format(UI.Identified_by_0_plugins, idPlugins.Count));
foreach(string pluginName in idPlugins) foreach(string pluginName in idPlugins)
if(plugins.PluginsList.TryGetValue(pluginName, out plugin)) if(plugins.Filesystems.TryGetValue(pluginName, out pluginType))
{ {
plugin.GetInformation(imageFormat, wholePart, out string information, null); if(Activator.CreateInstance(pluginType) is not IFilesystem fs)
continue;
var fsPlugin = plugin as IReadOnlyFilesystem; fs.GetInformation(imageFormat, wholePart, out string information, null);
var fsPlugin = fs as IReadOnlyFilesystem;
if(fsPlugin != null) if(fsPlugin != null)
{ {
@@ -722,11 +728,11 @@ public sealed class MainWindowViewModel : ViewModelBase
var filesystemModel = new FileSystemModel var filesystemModel = new FileSystemModel
{ {
VolumeName = plugin.Metadata.VolumeName is null ? $"{plugin.Metadata.Type}" VolumeName = fs.Metadata.VolumeName is null ? $"{fs.Metadata.Type}"
: $"{plugin.Metadata.VolumeName} ({plugin.Metadata.Type})", : $"{fs.Metadata.VolumeName} ({fs.Metadata.Type})",
Filesystem = plugin, Filesystem = fs,
ReadOnlyFilesystem = fsPlugin, ReadOnlyFilesystem = fsPlugin,
ViewModel = new FileSystemViewModel(plugin.Metadata, information) ViewModel = new FileSystemViewModel(fs.Metadata, information)
}; };
// TODO: Trap expanding item // TODO: Trap expanding item
@@ -742,7 +748,7 @@ public sealed class MainWindowViewModel : ViewModelBase
Statistics.AddCommand("ls"); Statistics.AddCommand("ls");
} }
Statistics.AddFilesystem(plugin.Metadata.Type); Statistics.AddFilesystem(fs.Metadata.Type);
imageModel.PartitionSchemesOrFileSystems.Add(filesystemModel); imageModel.PartitionSchemesOrFileSystems.Add(filesystemModel);
} }
} }

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

@@ -237,14 +237,12 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
string pluginName = idPlugins[j]; string pluginName = idPlugins[j];
if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName, if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName,
out IReadOnlyFilesystem plugin)) out Type pluginType))
continue; continue;
Assert.IsNotNull(plugin, Localization.Could_not_instantiate_filesystem_plugin); Assert.IsNotNull(pluginType, Localization.Could_not_instantiate_filesystem_plugin);
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?. var fs = Activator.CreateInstance(pluginType) as IReadOnlyFilesystem;
Invoke(new object[]
{});
Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, pluginName)); Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, pluginName));
@@ -278,13 +276,12 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
{ {
string pluginName = idPlugins[j]; string pluginName = idPlugins[j];
if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out IReadOnlyFilesystem plugin)) if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out Type pluginType))
continue; continue;
Assert.IsNotNull(plugin, Localization.Could_not_instantiate_filesystem_plugin); Assert.IsNotNull(pluginType, Localization.Could_not_instantiate_filesystem_plugin);
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?. var fs = Activator.CreateInstance(pluginType) as IReadOnlyFilesystem;
Invoke(Array.Empty<object>());
Assert.IsNotNull(fs, $"Could not instantiate filesystem {pluginName} in {testFile}"); Assert.IsNotNull(fs, $"Could not instantiate filesystem {pluginName} in {testFile}");

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

@@ -188,14 +188,14 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
for(int i = 0; i < track.FileSystems.Length; i++) for(int i = 0; i < track.FileSystems.Length; i++)
{ {
PluginBase plugins = GetPluginBase.Instance; PluginBase plugins = GetPluginBase.Instance;
bool found = plugins.PluginsList.TryGetValue(idPlugins[i], out IFilesystem plugin); bool found = plugins.Filesystems.TryGetValue(idPlugins[i], out Type pluginType);
// ReSharper disable once ConditionIsAlwaysTrueOrFalse // ReSharper disable once ConditionIsAlwaysTrueOrFalse
// It is not the case, it changes // It is not the case, it changes
if(!found) if(!found)
continue; continue;
var fs = Activator.CreateInstance(plugin.GetType()) as IFilesystem; var fs = Activator.CreateInstance(pluginType) as IFilesystem;
Assert.NotNull(fs, Assert.NotNull(fs,
string.Format(Localization.Could_not_instantiate_filesystem_for_0, string.Format(Localization.Could_not_instantiate_filesystem_for_0,
@@ -230,7 +230,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
Assert.AreEqual(track.FileSystems[i].VolumeSerial, fs.Metadata.VolumeSerial, Assert.AreEqual(track.FileSystems[i].VolumeSerial, fs.Metadata.VolumeSerial,
string.Format(Localization.Volume_serial_0, testFile)); string.Format(Localization.Volume_serial_0, testFile));
if(Activator.CreateInstance(plugin.GetType()) is not IReadOnlyFilesystem rofs) if(Activator.CreateInstance(pluginType) is not IReadOnlyFilesystem rofs)
{ {
if(track.FileSystems[i].Contents != null || if(track.FileSystems[i].Contents != null ||
track.FileSystems[i].ContentsJson != null || track.FileSystems[i].ContentsJson != null ||

7
Aaru.Tests/Issues/FsExtractHashIssueTest.cs
View File

@@ -121,13 +121,12 @@ public abstract class FsExtractHashIssueTest
{ {
string pluginName = idPlugins[j]; string pluginName = idPlugins[j];
if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out IReadOnlyFilesystem plugin)) if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out Type pluginType))
continue; continue;
Assert.IsNotNull(plugin, Localization.Could_not_instantiate_filesystem_plugin); Assert.IsNotNull(pluginType, Localization.Could_not_instantiate_filesystem_plugin);
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?. var fs = Activator.CreateInstance(pluginType) as IReadOnlyFilesystem;
Invoke(Array.Empty<object>());
Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, pluginName)); Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, pluginName));

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

@@ -74,47 +74,48 @@ public abstract class FsExtractIssueTest
if(idPlugins.Count == 0) if(idPlugins.Count == 0)
continue; continue;
IReadOnlyFilesystem plugin; Type pluginType;
ErrorNumber error; ErrorNumber error;
if(idPlugins.Count > 1) if(idPlugins.Count > 1)
{ {
foreach(string pluginName in idPlugins) foreach(string pluginName in idPlugins)
if(plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out plugin)) if(plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out pluginType))
{ {
Assert.IsNotNull(plugin, Localization.Could_not_instantiate_filesystem_plugin); Assert.IsNotNull(pluginType, Localization.Could_not_instantiate_filesystem_plugin);
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?. var fs = Activator.CreateInstance(pluginType) as IReadOnlyFilesystem;
Invoke(Array.Empty<object>());
Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, pluginName)); Assert.IsNotNull(fs,
string.Format(Localization.Could_not_instantiate_filesystem_0, pluginName));
filesystemFound = true; filesystemFound = true;
error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace); error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace);
Assert.AreEqual(ErrorNumber.NoError, error, string.Format(Localization.Could_not_mount_0_in_partition_1, pluginName, i)); Assert.AreEqual(ErrorNumber.NoError, error,
string.Format(Localization.Could_not_mount_0_in_partition_1, pluginName, i));
ExtractFilesInDir("/", fs, Xattrs); ExtractFilesInDir("/", fs, Xattrs);
} }
} }
else else
{ {
plugins.ReadOnlyFilesystems.TryGetValue(idPlugins[0], out plugin); plugins.ReadOnlyFilesystems.TryGetValue(idPlugins[0], out pluginType);
if(plugin is null) if(pluginType is null)
continue; continue;
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?. var fs = Activator.CreateInstance(pluginType) as IReadOnlyFilesystem;
Invoke(Array.Empty<object>());
Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, plugin.Name)); Assert.IsNotNull(fs, string.Format(Localization.Could_not_instantiate_filesystem_0, fs.Name));
filesystemFound = true; filesystemFound = true;
error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace); error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace);
Assert.AreEqual(ErrorNumber.NoError, error, string.Format(Localization.Could_not_mount_0_in_partition_1, plugin.Name, i)); Assert.AreEqual(ErrorNumber.NoError, error,
string.Format(Localization.Could_not_mount_0_in_partition_1, fs.Name, i));
ExtractFilesInDir("/", fs, Xattrs); ExtractFilesInDir("/", fs, Xattrs);
} }
@@ -137,7 +138,8 @@ public abstract class FsExtractIssueTest
{ {
error = fs.Stat(path + "/" + entry, out FileEntryInfo stat); error = fs.Stat(path + "/" + entry, out FileEntryInfo stat);
Assert.AreEqual(ErrorNumber.NoError, error, string.Format(Localization.Error_getting_stat_for_entry_0, entry)); Assert.AreEqual(ErrorNumber.NoError, error,
string.Format(Localization.Error_getting_stat_for_entry_0, entry));
if(stat.Attributes.HasFlag(FileAttributes.Directory)) if(stat.Attributes.HasFlag(FileAttributes.Directory))
{ {
@@ -151,7 +153,8 @@ public abstract class FsExtractIssueTest
error = fs.ListXAttr(path + "/" + entry, out List<string> xattrs); error = fs.ListXAttr(path + "/" + entry, out List<string> xattrs);
Assert.AreEqual(ErrorNumber.NoError, error, Assert.AreEqual(ErrorNumber.NoError, error,
string.Format(Localization.Error_0_getting_extended_attributes_for_entry_1, error, path + "/" + entry)); string.Format(Localization.Error_0_getting_extended_attributes_for_entry_1, error,
path + "/" + entry));
if(error == ErrorNumber.NoError) if(error == ErrorNumber.NoError)
foreach(string xattr in xattrs) foreach(string xattr in xattrs)
@@ -160,7 +163,8 @@ public abstract class FsExtractIssueTest
error = fs.GetXattr(path + "/" + entry, xattr, ref xattrBuf); error = fs.GetXattr(path + "/" + entry, xattr, ref xattrBuf);
Assert.AreEqual(ErrorNumber.NoError, error, Assert.AreEqual(ErrorNumber.NoError, error,
string.Format(Localization.Error_0_reading_extended_attributes_for_entry_1, error, path + "/" + entry)); string.Format(Localization.Error_0_reading_extended_attributes_for_entry_1,
error, path + "/" + entry));
} }
} }
@@ -168,7 +172,8 @@ public abstract class FsExtractIssueTest
error = fs.Read(path + "/" + entry, 0, stat.Length, ref outBuf); error = fs.Read(path + "/" + entry, 0, stat.Length, ref outBuf);
Assert.AreEqual(ErrorNumber.NoError, error, string.Format(Localization.Error_0_reading_file_1, error, path + "/" + entry)); Assert.AreEqual(ErrorNumber.NoError, error,
string.Format(Localization.Error_0_reading_file_1, error, path + "/" + entry));
} }
} }
} }

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

@@ -308,7 +308,7 @@ sealed class ExtractFilesCommand : Command
AaruConsole.WriteLine(UI.Filesystem_not_identified); AaruConsole.WriteLine(UI.Filesystem_not_identified);
else else
{ {
IReadOnlyFilesystem plugin; Type pluginType;
ErrorNumber error = ErrorNumber.InvalidArgument; ErrorNumber error = ErrorNumber.InvalidArgument;
if(idPlugins.Count > 1) if(idPlugins.Count > 1)
@@ -317,14 +317,12 @@ sealed class ExtractFilesCommand : Command
}[/]"); }[/]");
foreach(string pluginName in idPlugins) foreach(string pluginName in idPlugins)
if(plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out plugin)) if(plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out pluginType))
{ {
AaruConsole.WriteLine($"[bold]{string.Format(UI.As_identified_by_0, plugin.Name)}[/]"); AaruConsole.WriteLine($"[bold]{string.Format(UI.As_identified_by_0, pluginType.Name)
}[/]");
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?. if(Activator.CreateInstance(pluginType) is not IReadOnlyFilesystem fs)
Invoke(Array.Empty<object>());
if(fs is null)
continue; continue;
Core.Spectre.ProgressSingleSpinner(ctx => Core.Spectre.ProgressSingleSpinner(ctx =>
@@ -350,18 +348,13 @@ sealed class ExtractFilesCommand : Command
} }
else else
{ {
plugins.ReadOnlyFilesystems.TryGetValue(idPlugins[0], out plugin); plugins.ReadOnlyFilesystems.TryGetValue(idPlugins[0], out pluginType);
if(plugin == null) if(pluginType == null ||
Activator.CreateInstance(pluginType) is not IReadOnlyFilesystem fs)
continue; continue;
AaruConsole.WriteLine($"[bold]{string.Format(UI.Identified_by_0, plugin.Name)}[/]"); AaruConsole.WriteLine($"[bold]{string.Format(UI.Identified_by_0, pluginType.Name)}[/]");
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.
Invoke(Array.Empty<object>());
if(fs is null)
continue;
Core.Spectre.ProgressSingleSpinner(ctx => Core.Spectre.ProgressSingleSpinner(ctx =>
{ {

50
Aaru/Commands/Filesystem/Info.cs
View File

@@ -221,7 +221,7 @@ sealed class FilesystemInfoCommand : Command
} }
List<string> idPlugins = null; List<string> idPlugins = null;
IFilesystem plugin; Type pluginType;
string information; string information;
if(partitions) if(partitions)
@@ -301,31 +301,35 @@ sealed class FilesystemInfoCommand : Command
idPlugins.Count)}[/]"); idPlugins.Count)}[/]");
foreach(string pluginName in idPlugins) foreach(string pluginName in idPlugins)
if(plugins.PluginsList.TryGetValue(pluginName, out plugin)) if(plugins.Filesystems.TryGetValue(pluginName, out pluginType))
{ {
AaruConsole.WriteLine($"[bold]{string.Format(UI.As_identified_by_0, plugin.Name) if(Activator.CreateInstance(pluginType) is not IFilesystem fs)
continue;
AaruConsole.WriteLine($"[bold]{string.Format(UI.As_identified_by_0, fs.Name)
}[/]"); }[/]");
plugin.GetInformation(imageFormat, partitionsList[i], out information, fs.GetInformation(imageFormat, partitionsList[i], out information,
encodingClass); encodingClass);
AaruConsole.Write(information); AaruConsole.Write(information);
Statistics.AddFilesystem(plugin.Metadata.Type); Statistics.AddFilesystem(fs.Metadata.Type);
} }
break; break;
} }
default: default:
{ {
plugins.PluginsList.TryGetValue(idPlugins[0], out plugin); plugins.Filesystems.TryGetValue(idPlugins[0], out pluginType);
if(plugin == null) if(pluginType == null ||
Activator.CreateInstance(pluginType) is not IFilesystem fs)
continue; continue;
AaruConsole.WriteLine($"[bold]{string.Format(UI.Identified_by_0, plugin.Name)}[/]"); AaruConsole.WriteLine($"[bold]{string.Format(UI.Identified_by_0, fs.Name)}[/]");
plugin.GetInformation(imageFormat, partitionsList[i], out information, encodingClass); fs.GetInformation(imageFormat, partitionsList[i], out information, encodingClass);
AaruConsole.Write("{0}", information); AaruConsole.Write("{0}", information);
Statistics.AddFilesystem(plugin.Metadata.Type); Statistics.AddFilesystem(fs.Metadata.Type);
break; break;
} }
@@ -363,27 +367,31 @@ sealed class FilesystemInfoCommand : Command
}[/]"); }[/]");
foreach(string pluginName in idPlugins) foreach(string pluginName in idPlugins)
if(plugins.PluginsList.TryGetValue(pluginName, out plugin)) if(plugins.Filesystems.TryGetValue(pluginName, out pluginType))
{ {
AaruConsole.WriteLine($"[bold]{string.Format(UI.As_identified_by_0, plugin.Name)}[/]"); if(Activator.CreateInstance(pluginType) is not IFilesystem fs)
plugin.GetInformation(imageFormat, wholePart, out information, encodingClass); continue;
AaruConsole.WriteLine($"[bold]{string.Format(UI.As_identified_by_0, fs.Name)}[/]");
fs.GetInformation(imageFormat, wholePart, out information, encodingClass);
AaruConsole.Write(information); AaruConsole.Write(information);
Statistics.AddFilesystem(plugin.Metadata.Type); Statistics.AddFilesystem(fs.Metadata.Type);
} }
break; break;
} }
default: default:
{ {
plugins.PluginsList.TryGetValue(idPlugins[0], out plugin); plugins.Filesystems.TryGetValue(idPlugins[0], out pluginType);
if(plugin != null) if(pluginType == null ||
{ Activator.CreateInstance(pluginType) is not IFilesystem fs)
AaruConsole.WriteLine($"[bold]{string.Format(UI.Identified_by_0, plugin.Name)}[/]"); break;
plugin.GetInformation(imageFormat, wholePart, out information, encodingClass);
AaruConsole.WriteLine($"[bold]{string.Format(UI.Identified_by_0, fs.Name)}[/]");
fs.GetInformation(imageFormat, wholePart, out information, encodingClass);
AaruConsole.Write(information); AaruConsole.Write(information);
Statistics.AddFilesystem(plugin.Metadata.Type); Statistics.AddFilesystem(fs.Metadata.Type);
}
break; break;
} }

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

@@ -279,7 +279,7 @@ sealed class LsCommand : Command
AaruConsole.WriteLine(UI.Filesystem_not_identified); AaruConsole.WriteLine(UI.Filesystem_not_identified);
else else
{ {
IReadOnlyFilesystem plugin; Type pluginType;
ErrorNumber error = ErrorNumber.InvalidArgument; ErrorNumber error = ErrorNumber.InvalidArgument;
if(idPlugins.Count > 1) if(idPlugins.Count > 1)
@@ -288,16 +288,13 @@ sealed class LsCommand : Command
}[/]"); }[/]");
foreach(string pluginName in idPlugins) foreach(string pluginName in idPlugins)
if(plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out plugin)) if(plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out pluginType))
{ {
AaruConsole.WriteLine($"[bold]{string.Format(UI.As_identified_by_0, plugin.Name)}[/]"); if(Activator.CreateInstance(pluginType) is not IReadOnlyFilesystem fs)
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.
Invoke(Array.Empty<object>());
if(fs == null)
continue; continue;
AaruConsole.WriteLine($"[bold]{string.Format(UI.As_identified_by_0, fs.Name)}[/]");
Core.Spectre.ProgressSingleSpinner(ctx => Core.Spectre.ProgressSingleSpinner(ctx =>
{ {
ctx.AddTask(UI.Mounting_filesystem).IsIndeterminate(); ctx.AddTask(UI.Mounting_filesystem).IsIndeterminate();
@@ -318,18 +315,12 @@ sealed class LsCommand : Command
} }
else else
{ {
plugins.ReadOnlyFilesystems.TryGetValue(idPlugins[0], out plugin); plugins.ReadOnlyFilesystems.TryGetValue(idPlugins[0], out pluginType);
if(plugin == null) if(Activator.CreateInstance(pluginType) is not IReadOnlyFilesystem fs)
continue; continue;
AaruConsole.WriteLine($"[bold]{string.Format(UI.Identified_by_0, plugin.Name)}[/]"); AaruConsole.WriteLine($"[bold]{string.Format(UI.Identified_by_0, fs.Name)}[/]");
var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.
Invoke(Array.Empty<object>());
if(fs == null)
continue;
Core.Spectre.ProgressSingleSpinner(ctx => Core.Spectre.ProgressSingleSpinner(ctx =>
{ {

9
Aaru/Commands/Filesystem/Options.cs
View File

@@ -88,16 +88,19 @@ sealed class ListOptionsCommand : Command
AaruConsole.WriteLine(UI.Read_only_filesystems_options); AaruConsole.WriteLine(UI.Read_only_filesystems_options);
foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in plugins.ReadOnlyFilesystems) foreach(KeyValuePair<string, Type> kvp in plugins.ReadOnlyFilesystems)
{ {
List<(string name, Type type, string description)> options = kvp.Value.SupportedOptions.ToList(); if(Activator.CreateInstance(kvp.Value) is not IReadOnlyFilesystem fs)
continue;
List<(string name, Type type, string description)> options = fs.SupportedOptions.ToList();
if(options.Count == 0) if(options.Count == 0)
continue; continue;
var table = new Table var table = new Table
{ {
Title = new TableTitle(string.Format(UI.Options_for_0, kvp.Value.Name)) Title = new TableTitle(string.Format(UI.Options_for_0, fs.Name))
}; };
table.AddColumn(UI.Title_Name); table.AddColumn(UI.Title_Name);

26
Aaru/Commands/Formats.cs
View File

@@ -30,6 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo // Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.CommandLine; using System.CommandLine;
using System.CommandLine.NamingConventionBinder; using System.CommandLine.NamingConventionBinder;
@@ -153,7 +154,7 @@ sealed class FormatsCommand : Command
table = new Table table = new Table
{ {
Title = new TableTitle(string.Format(UI.Supported_filesystems_for_identification_and_information_only_0, Title = new TableTitle(string.Format(UI.Supported_filesystems_for_identification_and_information_only_0,
plugins.PluginsList.Count(t => !t.Value.GetType().GetInterfaces(). plugins.Filesystems.Count(t => !t.Value.GetInterfaces().
Contains(typeof( Contains(typeof(
IReadOnlyFilesystem))))) IReadOnlyFilesystem)))))
}; };
@@ -163,12 +164,18 @@ sealed class FormatsCommand : Command
table.AddColumn(UI.Title_Filesystem); table.AddColumn(UI.Title_Filesystem);
foreach(KeyValuePair<string, IFilesystem> kvp in plugins.PluginsList.Where(t => !t.Value.GetType(). foreach(KeyValuePair<string, Type> kvp in plugins.Filesystems.Where(t => !t.Value.GetInterfaces().
GetInterfaces().Contains(typeof(IReadOnlyFilesystem)))) Contains(typeof(
IReadOnlyFilesystem))))
{
if(Activator.CreateInstance(kvp.Value) is not IFilesystem fs)
continue;
if(verbose) if(verbose)
table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name)); table.AddRow(fs.Id.ToString(), Markup.Escape(fs.Name));
else else
table.AddRow(Markup.Escape(kvp.Value.Name)); table.AddRow(Markup.Escape(kvp.Value.Name));
}
AnsiConsole.Write(table); AnsiConsole.Write(table);
@@ -185,11 +192,16 @@ sealed class FormatsCommand : Command
table.AddColumn(UI.Title_Filesystem); table.AddColumn(UI.Title_Filesystem);
foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in plugins.ReadOnlyFilesystems) foreach(KeyValuePair<string, Type> kvp in plugins.ReadOnlyFilesystems)
{
if(Activator.CreateInstance(kvp.Value) is not IReadOnlyFilesystem fs)
continue;
if(verbose) if(verbose)
table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name)); table.AddRow(fs.Id.ToString(), Markup.Escape(fs.Name));
else else
table.AddRow(Markup.Escape(kvp.Value.Name)); table.AddRow(Markup.Escape(fs.Name));
}
AnsiConsole.Write(table); AnsiConsole.Write(table);

14
Aaru/Commands/ListNamespaces.cs
View File

@@ -30,6 +30,7 @@
// Copyright © 2011-2023 Natalia Portillo // Copyright © 2011-2023 Natalia Portillo
// ****************************************************************************/ // ****************************************************************************/
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.CommandLine; using System.CommandLine;
using System.CommandLine.NamingConventionBinder; using System.CommandLine.NamingConventionBinder;
@@ -84,18 +85,23 @@ sealed class ListNamespacesCommand : Command
PluginBase plugins = GetPluginBase.Instance; PluginBase plugins = GetPluginBase.Instance;
foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in foreach(KeyValuePair<string, Type> kvp in plugins.ReadOnlyFilesystems)
plugins.ReadOnlyFilesystems.Where(kvp => kvp.Value.Namespaces is not null))
{ {
if(Activator.CreateInstance(kvp.Value) is not IReadOnlyFilesystem fs)
continue;
if(fs.Namespaces is null)
continue;
Table table = new() Table table = new()
{ {
Title = new TableTitle(string.Format(UI.Namespaces_for_0, kvp.Value.Name)) Title = new TableTitle(string.Format(UI.Namespaces_for_0, fs.Name))
}; };
table.AddColumn(UI.Title_Namespace); table.AddColumn(UI.Title_Namespace);
table.AddColumn(UI.Title_Description); table.AddColumn(UI.Title_Description);
foreach(KeyValuePair<string, string> @namespace in kvp.Value.Namespaces.OrderBy(t => t.Key)) foreach(KeyValuePair<string, string> @namespace in fs.Namespaces.OrderBy(t => t.Key))
table.AddRow(@namespace.Key, @namespace.Value); table.AddRow(@namespace.Key, @namespace.Value);
AnsiConsole.Write(table); AnsiConsole.Write(table);