From b7366181b4d19965674348d64b722b900e3319b7 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 17 Dec 2022 22:41:36 +0000 Subject: [PATCH] Move filesystem metadata to GetInformation method for information only plugins. --- Interfaces/IFilesystem.cs | 8 ++++---- Interfaces/IReadOnlyFilesystem.cs | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Interfaces/IFilesystem.cs b/Interfaces/IFilesystem.cs index a23cd9e3e..33b150d76 100644 --- a/Interfaces/IFilesystem.cs +++ b/Interfaces/IFilesystem.cs @@ -51,8 +51,6 @@ public interface IFilesystem string Name { get; } /// Plugin UUID. Guid Id { get; } - /// Information about the filesystem as expected by Aaru Metadata - FileSystem Metadata { get; } /// Plugin author string Author { get; } @@ -65,7 +63,9 @@ public interface IFilesystem /// Gets information about the identified filesystem. /// Disk image. /// Partition. - /// Filesystem information. /// Which encoding to use for this filesystem. - void GetInformation(IMediaImage imagePlugin, Partition partition, out string information, Encoding encoding); + /// Filesystem information. + /// Information about the filesystem as expected by Aaru Metadata + void GetInformation(IMediaImage imagePlugin, Partition partition, Encoding encoding, out string information, + out FileSystem metadata); } \ No newline at end of file diff --git a/Interfaces/IReadOnlyFilesystem.cs b/Interfaces/IReadOnlyFilesystem.cs index 957f61838..21ab419af 100644 --- a/Interfaces/IReadOnlyFilesystem.cs +++ b/Interfaces/IReadOnlyFilesystem.cs @@ -40,6 +40,7 @@ using System; using System.Collections.Generic; using System.Text; +using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Structs; @@ -49,6 +50,9 @@ namespace Aaru.CommonTypes.Interfaces; /// Defines the interface to implement reading the contents of a filesystem public interface IReadOnlyFilesystem : IFilesystem { + /// Information about the filesystem as expected by Aaru Metadata + FileSystem Metadata { get; } + /// Retrieves a list of options supported by the filesystem, with name, type and description IEnumerable<(string name, Type type, string description)> SupportedOptions { get; }