From 106c36492bb2a45980f9db07e53bcac8e3c27c51 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 9 Jun 2020 22:55:59 -0700 Subject: [PATCH] Move IFileSystem etc. into fsa namespace --- src/LibHac/Fs/Accessors/DirectoryAccessor.cs | 1 + src/LibHac/Fs/Accessors/FileAccessor.cs | 1 + src/LibHac/Fs/Accessors/FileSystemAccessor.cs | 1 + src/LibHac/Fs/FileStorage2.cs | 1 + src/LibHac/Fs/FileStorageBasedFileSystem.cs | 1 + src/LibHac/Fs/FileSystemClient.FileSystem.cs | 1 + src/LibHac/Fs/FileSystemClient.cs | 1 + src/LibHac/Fs/FileSystemClientUtils.cs | 1 + src/LibHac/Fs/FsEnums.cs | 1 + .../Fs/{ => Fsa}/IAttributeFileSystem.cs | 2 +- src/LibHac/Fs/{ => Fsa}/IDirectory.cs | 2 +- src/LibHac/Fs/Fsa/IDirectory2.cs | 55 --- src/LibHac/Fs/{ => Fsa}/IFile.cs | 2 +- src/LibHac/Fs/Fsa/IFile2.cs | 248 ----------- src/LibHac/Fs/{ => Fsa}/IFileSystem.cs | 2 +- src/LibHac/Fs/Fsa/IFileSystem2.cs | 408 ------------------ src/LibHac/Fs/InMemoryFileSystem.cs | 1 + src/LibHac/Fs/Shim/Application.cs | 1 + src/LibHac/Fs/Shim/BcatSaveData.cs | 1 + src/LibHac/Fs/Shim/Bis.cs | 1 + src/LibHac/Fs/Shim/Content.cs | 1 + src/LibHac/Fs/Shim/ContentStorage.cs | 1 + src/LibHac/Fs/Shim/CustomStorage.cs | 1 + src/LibHac/Fs/Shim/GameCard.cs | 1 + src/LibHac/Fs/Shim/Host.cs | 1 + src/LibHac/Fs/Shim/SaveData.cs | 1 + src/LibHac/Fs/Shim/SdCard.cs | 1 + src/LibHac/Fs/Shim/SystemSaveData.cs | 1 + .../Creators/EmulatedBisFileSystemCreator.cs | 1 + .../EmulatedBisFileSystemCreatorConfig.cs | 1 + .../Creators/EmulatedGameCardFsCreator.cs | 1 + .../Creators/EmulatedSdFileSystemCreator.cs | 1 + .../Creators/EncryptedFileSystemCreator.cs | 1 + .../IBuiltInStorageFileSystemCreator.cs | 1 + .../Creators/IEncryptedFileSystemCreator.cs | 2 +- .../Creators/IFatFileSystemCreator.cs | 1 + .../Creators/IGameCardFileSystemCreator.cs | 1 + .../Creators/IHostFileSystemCreator.cs | 2 +- .../Creators/IPartitionFileSystemCreator.cs | 1 + .../Creators/IRomFileSystemCreator.cs | 1 + .../Creators/ISaveDataFileSystemCreator.cs | 1 + .../Creators/ISdFileSystemCreator.cs | 2 +- .../Creators/IStorageOnNcaCreator.cs | 1 + .../ISubDirectoryFileSystemCreator.cs | 2 +- .../ITargetManagerFileSystemCreator.cs | 2 +- .../Creators/PartitionFileSystemCreator.cs | 1 + .../Creators/RomFileSystemCreator.cs | 1 + .../Creators/SaveDataFileSystemCreator.cs | 1 + .../FsService/Creators/StorageOnNcaCreator.cs | 1 + .../Creators/SubDirectoryFileSystemCreator.cs | 2 +- .../TargetManagerFileSystemCreator.cs | 2 +- .../FsService/DefaultFsServerObjects.cs | 2 +- src/LibHac/FsService/FileSystemProxy.cs | 1 + src/LibHac/FsService/FileSystemProxyCore.cs | 1 + src/LibHac/FsService/IFileSystemProxy.cs | 1 + src/LibHac/FsService/IMultiCommitManager.cs | 2 +- .../FsService/Impl/MultiCommitManager.cs | 1 + src/LibHac/FsService/Util.cs | 1 + src/LibHac/FsSystem/AesXtsDirectory.cs | 1 + src/LibHac/FsSystem/AesXtsFile.cs | 1 + src/LibHac/FsSystem/AesXtsFileHeader.cs | 1 + src/LibHac/FsSystem/AesXtsFileSystem.cs | 1 + src/LibHac/FsSystem/ConcatenationDirectory.cs | 1 + src/LibHac/FsSystem/ConcatenationFile.cs | 1 + .../FsSystem/ConcatenationFileSystem.cs | 1 + src/LibHac/FsSystem/Delta.cs | 1 + src/LibHac/FsSystem/DirectorySaveDataFile.cs | 1 + .../FsSystem/DirectorySaveDataFileSystem.cs | 1 + src/LibHac/FsSystem/DirectoryUtils.cs | 1 + src/LibHac/FsSystem/FileReader.cs | 2 +- src/LibHac/FsSystem/FileStorage.cs | 1 + src/LibHac/FsSystem/FileSystemExtensions.cs | 1 + src/LibHac/FsSystem/LayeredFileSystem.cs | 1 + src/LibHac/FsSystem/LocalDirectory.cs | 1 + src/LibHac/FsSystem/LocalFile.cs | 1 + src/LibHac/FsSystem/LocalFileSystem.cs | 1 + src/LibHac/FsSystem/NcaUtils/Nca.cs | 1 + src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs | 1 + src/LibHac/FsSystem/NullFile.cs | 1 + src/LibHac/FsSystem/NxFileStream.cs | 1 + src/LibHac/FsSystem/PartitionDirectory.cs | 1 + src/LibHac/FsSystem/PartitionFile.cs | 1 + src/LibHac/FsSystem/PartitionFileSystem.cs | 1 + .../FsSystem/PartitionFileSystemBuilder.cs | 1 + .../FsSystem/PartitionFileSystemCore.cs | 1 + src/LibHac/FsSystem/ReadOnlyFile.cs | 1 + src/LibHac/FsSystem/ReadOnlyFileSystem.cs | 1 + src/LibHac/FsSystem/RomFs/RomFsBuilder.cs | 1 + src/LibHac/FsSystem/RomFs/RomFsDirectory.cs | 1 + src/LibHac/FsSystem/RomFs/RomFsFile.cs | 1 + src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs | 1 + src/LibHac/FsSystem/Save/SaveDataDirectory.cs | 1 + src/LibHac/FsSystem/Save/SaveDataFile.cs | 1 + .../FsSystem/Save/SaveDataFileSystem.cs | 1 + .../FsSystem/Save/SaveDataFileSystemCore.cs | 1 + src/LibHac/FsSystem/StorageExtensions.cs | 1 + src/LibHac/FsSystem/StorageFile.cs | 1 + src/LibHac/FsSystem/StreamFile.cs | 1 + src/LibHac/FsSystem/SubdirectoryFileSystem.cs | 1 + src/LibHac/FsSystem/Utility.cs | 1 + src/LibHac/Loader/NsoReader.cs | 1 + src/LibHac/SwitchFs.cs | 1 + src/LibHac/Xci.cs | 1 + src/hactoolnet/FsUtils.cs | 1 + src/hactoolnet/ProcessDelta.cs | 1 + src/hactoolnet/ProcessNca.cs | 1 + src/hactoolnet/ProcessSave.cs | 1 + src/hactoolnet/ProcessSwitchFs.cs | 1 + src/hactoolnet/ResultLogger.cs | 1 + .../LibHac.Tests/Fs/AesXtsFileSystemTests.cs | 1 + .../Fs/DirectorySaveDataFileSystemTests.cs | 1 + .../FileSystemServerFactory.cs | 1 + .../Fs/FileSystemClientTests/ShimTests/Bis.cs | 1 + .../FileSystemClientTests/ShimTests/SdCard.cs | 1 + .../CommittableIFileSystemTests.Commit.cs | 1 + .../CommittableIFileSystemTests.cs | 2 +- .../IAttributeFileSystemTests.cs | 1 + ...leSystemTests.CleanDirectoryRecursively.cs | 1 + .../IFileSystemTests.CreateDirectory.cs | 1 + .../IFileSystemTests.CreateFile.cs | 1 + .../IFileSystemTests.DeleteDirectory.cs | 1 + ...eSystemTests.DeleteDirectoryRecursively.cs | 1 + .../IFileSystemTests.DeleteFile.cs | 1 + .../IFileSystemTests.GetEntryType.cs | 1 + .../IFileSystemTests.IDirectory.cs | 1 + .../IFileSystemTests.IFile.Read.cs | 1 + .../IFileSystemTests.IFile.Size.cs | 1 + .../IFileSystemTests.IFile.Write.cs | 1 + .../IFileSystemTests.OpenDirectory.cs | 1 + .../IFileSystemTests.OpenFile.cs | 1 + .../IFileSystemTests.RenameDirectory.cs | 1 + .../IFileSystemTests.RenameFile.cs | 1 + .../IFileSystemTestBase/IFileSystemTests.cs | 2 +- .../Fs/InMemoryFileSystemTests.cs | 1 + .../LibHac.Tests/Fs/LayeredFileSystemTests.cs | 1 + .../Fs/SubdirectoryFileSystemTests.cs | 1 + 136 files changed, 133 insertions(+), 727 deletions(-) rename src/LibHac/Fs/{ => Fsa}/IAttributeFileSystem.cs (98%) rename src/LibHac/Fs/{ => Fsa}/IDirectory.cs (98%) delete mode 100644 src/LibHac/Fs/Fsa/IDirectory2.cs rename src/LibHac/Fs/{ => Fsa}/IFile.cs (99%) delete mode 100644 src/LibHac/Fs/Fsa/IFile2.cs rename src/LibHac/Fs/{ => Fsa}/IFileSystem.cs (99%) delete mode 100644 src/LibHac/Fs/Fsa/IFileSystem2.cs diff --git a/src/LibHac/Fs/Accessors/DirectoryAccessor.cs b/src/LibHac/Fs/Accessors/DirectoryAccessor.cs index 582e0aa6..21cea24d 100644 --- a/src/LibHac/Fs/Accessors/DirectoryAccessor.cs +++ b/src/LibHac/Fs/Accessors/DirectoryAccessor.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs.Fsa; namespace LibHac.Fs.Accessors { diff --git a/src/LibHac/Fs/Accessors/FileAccessor.cs b/src/LibHac/Fs/Accessors/FileAccessor.cs index 93307b55..1c341f27 100644 --- a/src/LibHac/Fs/Accessors/FileAccessor.cs +++ b/src/LibHac/Fs/Accessors/FileAccessor.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs.Fsa; namespace LibHac.Fs.Accessors { diff --git a/src/LibHac/Fs/Accessors/FileSystemAccessor.cs b/src/LibHac/Fs/Accessors/FileSystemAccessor.cs index 2178d29b..09e37668 100644 --- a/src/LibHac/Fs/Accessors/FileSystemAccessor.cs +++ b/src/LibHac/Fs/Accessors/FileSystemAccessor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using LibHac.Common; +using LibHac.Fs.Fsa; namespace LibHac.Fs.Accessors { diff --git a/src/LibHac/Fs/FileStorage2.cs b/src/LibHac/Fs/FileStorage2.cs index 0a5514b5..1f94d562 100644 --- a/src/LibHac/Fs/FileStorage2.cs +++ b/src/LibHac/Fs/FileStorage2.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics; using System.Runtime.CompilerServices; +using LibHac.Fs.Fsa; namespace LibHac.Fs { diff --git a/src/LibHac/Fs/FileStorageBasedFileSystem.cs b/src/LibHac/Fs/FileStorageBasedFileSystem.cs index 35150ad3..843c840b 100644 --- a/src/LibHac/Fs/FileStorageBasedFileSystem.cs +++ b/src/LibHac/Fs/FileStorageBasedFileSystem.cs @@ -1,4 +1,5 @@ using LibHac.Common; +using LibHac.Fs.Fsa; namespace LibHac.Fs { diff --git a/src/LibHac/Fs/FileSystemClient.FileSystem.cs b/src/LibHac/Fs/FileSystemClient.FileSystem.cs index 73e40b0b..0d8aff2f 100644 --- a/src/LibHac/Fs/FileSystemClient.FileSystem.cs +++ b/src/LibHac/Fs/FileSystemClient.FileSystem.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs.Accessors; +using LibHac.Fs.Fsa; namespace LibHac.Fs { diff --git a/src/LibHac/Fs/FileSystemClient.cs b/src/LibHac/Fs/FileSystemClient.cs index bb7e0c71..e63415e1 100644 --- a/src/LibHac/Fs/FileSystemClient.cs +++ b/src/LibHac/Fs/FileSystemClient.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using LibHac.Common; using LibHac.Fs.Accessors; +using LibHac.Fs.Fsa; using LibHac.FsService; using LibHac.FsSystem; diff --git a/src/LibHac/Fs/FileSystemClientUtils.cs b/src/LibHac/Fs/FileSystemClientUtils.cs index b104af69..331e209b 100644 --- a/src/LibHac/Fs/FileSystemClientUtils.cs +++ b/src/LibHac/Fs/FileSystemClientUtils.cs @@ -3,6 +3,7 @@ using System.Buffers; using System.Collections.Generic; using LibHac.Common; using LibHac.Fs.Accessors; +using LibHac.Fs.Fsa; using LibHac.FsSystem; namespace LibHac.Fs diff --git a/src/LibHac/Fs/FsEnums.cs b/src/LibHac/Fs/FsEnums.cs index 5582f5a8..a39a281d 100644 --- a/src/LibHac/Fs/FsEnums.cs +++ b/src/LibHac/Fs/FsEnums.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs.Fsa; namespace LibHac.Fs { diff --git a/src/LibHac/Fs/IAttributeFileSystem.cs b/src/LibHac/Fs/Fsa/IAttributeFileSystem.cs similarity index 98% rename from src/LibHac/Fs/IAttributeFileSystem.cs rename to src/LibHac/Fs/Fsa/IAttributeFileSystem.cs index 450b73fc..7e2af4b6 100644 --- a/src/LibHac/Fs/IAttributeFileSystem.cs +++ b/src/LibHac/Fs/Fsa/IAttributeFileSystem.cs @@ -1,6 +1,6 @@ using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.Fs.Fsa { // ReSharper disable once InconsistentNaming public abstract class IAttributeFileSystem : IFileSystem diff --git a/src/LibHac/Fs/IDirectory.cs b/src/LibHac/Fs/Fsa/IDirectory.cs similarity index 98% rename from src/LibHac/Fs/IDirectory.cs rename to src/LibHac/Fs/Fsa/IDirectory.cs index 5ec28a40..3d5012fa 100644 --- a/src/LibHac/Fs/IDirectory.cs +++ b/src/LibHac/Fs/Fsa/IDirectory.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.Fs.Fsa { // ReSharper disable once InconsistentNaming /// diff --git a/src/LibHac/Fs/Fsa/IDirectory2.cs b/src/LibHac/Fs/Fsa/IDirectory2.cs deleted file mode 100644 index cfa58a9a..00000000 --- a/src/LibHac/Fs/Fsa/IDirectory2.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; - -namespace LibHac.Fs.Fsa -{ - // ReSharper disable once InconsistentNaming - /// - /// Provides an interface for enumerating the child entries of a directory. - /// - public abstract class IDirectory2 : IDisposable - { - /// - /// Retrieves the next entries that this directory contains. Does not search subdirectories. - /// - /// The number of s that - /// were read into . - /// The buffer the entries will be read into. - /// The of the requested operation. - /// With each call of , the object will - /// continue to iterate through all the entries it contains. - /// Each call will attempt to read as many entries as the buffer can contain. - /// Once all the entries have been read, all subsequent calls to will - /// read 0 entries into the buffer. - public Result Read(out long entriesRead, Span entryBuffer) - { - if (entryBuffer.IsEmpty) - { - entriesRead = 0; - return Result.Success; - } - - return DoRead(out entriesRead, entryBuffer); - } - - /// - /// Retrieves the number of file system entries that this directory contains. Does not search subdirectories. - /// - /// The number of child entries the directory contains. - /// The of the requested operation. - public Result GetEntryCount(out long entryCount) - { - return DoGetEntryCount(out entryCount); - } - - protected abstract Result DoRead(out long entriesRead, Span entryBuffer); - protected abstract Result DoGetEntryCount(out long entryCount); - - protected virtual void Dispose(bool disposing) { } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - } -} diff --git a/src/LibHac/Fs/IFile.cs b/src/LibHac/Fs/Fsa/IFile.cs similarity index 99% rename from src/LibHac/Fs/IFile.cs rename to src/LibHac/Fs/Fsa/IFile.cs index 08a81d3d..ed5361bc 100644 --- a/src/LibHac/Fs/IFile.cs +++ b/src/LibHac/Fs/Fsa/IFile.cs @@ -1,7 +1,7 @@ using System; using LibHac.Diag; -namespace LibHac.Fs +namespace LibHac.Fs.Fsa { // ReSharper disable once InconsistentNaming /// diff --git a/src/LibHac/Fs/Fsa/IFile2.cs b/src/LibHac/Fs/Fsa/IFile2.cs deleted file mode 100644 index 8c075d00..00000000 --- a/src/LibHac/Fs/Fsa/IFile2.cs +++ /dev/null @@ -1,248 +0,0 @@ -using System; -using LibHac.Diag; - -namespace LibHac.Fs.Fsa -{ - // ReSharper disable once InconsistentNaming - /// - /// Provides an interface for reading and writing a sequence of bytes. - /// - /// is similar to , and has a few main differences: - /// - /// - allows an to be set that controls read, write - /// and append permissions for the file. - /// - /// - If the cannot read or write as many bytes as requested, it will read - /// or write as many bytes as it can and return that number of bytes to the caller. - /// - /// - If is called on an offset past the end of the , - /// the mode is set and the file supports expansion, - /// the file will be expanded so that it is large enough to contain the written data. - public abstract class IFile2 : IDisposable - { - /// - /// Reads a sequence of bytes from the current . - /// - /// If the operation returns successfully, The total number of bytes read into - /// the buffer. This can be less than the size of the buffer if the IFile is too short to fulfill the request. - /// The offset in the at which to begin reading. - /// The buffer where the read bytes will be stored. - /// The number of bytes read will be no larger than the length of the buffer. - /// Options for reading from the . - /// The of the requested operation. - public Result Read(out long bytesRead, long offset, Span destination, in ReadOption option) - { - if (destination.IsEmpty) - { - bytesRead = 0; - return Result.Success; - } - - if (offset < 0) - { - bytesRead = 0; - return ResultFs.OutOfRange.Log(); - } - - if (long.MaxValue - offset < destination.Length) - { - bytesRead = 0; - return ResultFs.OutOfRange.Log(); - } - - return DoRead(out bytesRead, offset, destination, in option); - } - - /// - /// Reads a sequence of bytes from the current with no s. - /// - /// If the operation returns successfully, The total number of bytes read into - /// the buffer. This can be less than the size of the buffer if the IFile is too short to fulfill the request. - /// The offset in the at which to begin reading. - /// The buffer where the read bytes will be stored. - /// The number of bytes read will be no larger than the length of the buffer. - /// The of the requested operation. - public Result Read(out long bytesRead, long offset, Span destination) - { - return Read(out bytesRead, offset, destination, ReadOption.None); - } - - /// - /// Writes a sequence of bytes to the current . - /// - /// The offset in the at which to begin writing. - /// The buffer containing the bytes to be written. - /// Options for writing to the . - /// The of the requested operation. - public Result Write(long offset, ReadOnlySpan source, in WriteOption option) - { - if (source.IsEmpty) - { - if (option.HasFlushFlag()) - { - Result rc = Flush(); - if (rc.IsFailure()) return rc; - } - - return Result.Success; - } - - if (offset < 0) - return ResultFs.OutOfRange.Log(); - - if (long.MaxValue - offset < source.Length) - return ResultFs.OutOfRange.Log(); - - return DoWrite(offset, source, in option); - } - - /// - /// Causes any buffered data to be written to the underlying device. - /// - public Result Flush() - { - return DoFlush(); - } - - /// - /// Sets the size of the file in bytes. - /// - /// The desired size of the file in bytes. - /// The of the requested operation. - public Result SetSize(long size) - { - if (size < 0) - return ResultFs.OutOfRange.Log(); - - return DoSetSize(size); - } - - /// - /// Gets the number of bytes in the file. - /// - /// If the operation returns successfully, the length of the file in bytes. - /// The of the requested operation. - public Result GetSize(out long size) - { - return DoGetSize(out size); - } - - /// - /// Performs various operations on the file. Used to extend the functionality of the interface. - /// - /// A buffer that will contain the response from the operation. - /// The operation to be performed. - /// The offset of the range to operate on. - /// The size of the range to operate on. - /// An input buffer. Size may vary depending on the operation performed. - /// The of the requested operation. - public Result OperateRange(Span outBuffer, OperationId operationId, long offset, long size, - ReadOnlySpan inBuffer) - { - return DoOperateRange(outBuffer, operationId, offset, size, inBuffer); - } - - /// - /// Performs various operations on the file. Used to extend the functionality of the interface. - /// - /// The operation to be performed. - /// The offset of the range to operate on. - /// The size of the range to operate on. - /// The of the requested operation. - public Result OperateRange(OperationId operationId, long offset, long size) - { - return DoOperateRange(Span.Empty, operationId, offset, size, ReadOnlySpan.Empty); - } - - protected Result DryRead(out long readableBytes, long offset, long size, in ReadOption option, - OpenMode openMode) - { - // Check that we can read. - if (!openMode.HasFlag(OpenMode.Read)) - { - readableBytes = default; - return ResultFs.InvalidOpenModeForRead.Log(); - } - - // Get the file size, and validate our offset. - Result rc = GetSize(out long fileSize); - if (rc.IsFailure()) - { - readableBytes = default; - return rc; - } - - if (offset > fileSize) - { - readableBytes = default; - return ResultFs.OutOfRange.Log(); - } - - readableBytes = Math.Min(fileSize - offset, size); - return Result.Success; - } - - protected Result DrySetSize(long size, OpenMode openMode) - { - // Check that we can write. - if (!openMode.HasFlag(OpenMode.Write)) - return ResultFs.InvalidOpenModeForWrite.Log(); - - Assert.AssertTrue(size >= 0); - - return Result.Success; - } - - protected Result DryWrite(out bool needsAppend, long offset, long size, in WriteOption option, - OpenMode openMode) - { - // Check that we can write. - if (!openMode.HasFlag(OpenMode.Write)) - { - needsAppend = default; - return ResultFs.InvalidOpenModeForWrite.Log(); - } - - // Get the file size. - Result rc = GetSize(out long fileSize); - if (rc.IsFailure()) - { - needsAppend = default; - return rc; - } - - if (fileSize < offset + size) - { - if (!openMode.HasFlag(OpenMode.AllowAppend)) - { - needsAppend = default; - return ResultFs.FileExtensionWithoutOpenModeAllowAppend.Log(); - } - - needsAppend = true; - } - else - { - needsAppend = false; - } - - return Result.Success; - } - - protected abstract Result DoRead(out long bytesRead, long offset, Span destination, in ReadOption option); - protected abstract Result DoWrite(long offset, ReadOnlySpan source, in WriteOption option); - protected abstract Result DoFlush(); - protected abstract Result DoSetSize(long size); - protected abstract Result DoGetSize(out long size); - protected abstract Result DoOperateRange(Span outBuffer, OperationId operationId, long offset, long size, - ReadOnlySpan inBuffer); - - protected virtual void Dispose(bool disposing) { } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - } -} diff --git a/src/LibHac/Fs/IFileSystem.cs b/src/LibHac/Fs/Fsa/IFileSystem.cs similarity index 99% rename from src/LibHac/Fs/IFileSystem.cs rename to src/LibHac/Fs/Fsa/IFileSystem.cs index 57304eda..df54e17b 100644 --- a/src/LibHac/Fs/IFileSystem.cs +++ b/src/LibHac/Fs/Fsa/IFileSystem.cs @@ -2,7 +2,7 @@ using LibHac.Common; using LibHac.FsSystem; -namespace LibHac.Fs +namespace LibHac.Fs.Fsa { // ReSharper disable once InconsistentNaming /// diff --git a/src/LibHac/Fs/Fsa/IFileSystem2.cs b/src/LibHac/Fs/Fsa/IFileSystem2.cs deleted file mode 100644 index 65c3caaf..00000000 --- a/src/LibHac/Fs/Fsa/IFileSystem2.cs +++ /dev/null @@ -1,408 +0,0 @@ -using System; -using LibHac.Common; - -namespace LibHac.Fs.Fsa -{ - // ReSharper disable once InconsistentNaming - /// - /// Provides an interface for accessing a file system. / is used as the path delimiter. - /// - public abstract class IFileSystem2 : IDisposable - { - /// - /// Creates or overwrites a file at the specified path. - /// - /// The full path of the file to create. - /// The initial size of the created file. - /// Flags to control how the file is created. - /// Should usually be - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The parent directory of the specified path does not exist: - /// Specified path already exists as either a file or directory: - /// Insufficient free space to create the file: - /// - public Result CreateFile(U8Span path, long size, CreateFileOptions option) - { - if (path.IsNull()) - return ResultFs.NullptrArgument.Log(); - - if (size < 0) - return ResultFs.OutOfRange.Log(); - - return DoCreateFile(path, size, option); - } - - /// - /// Deletes the specified file. - /// - /// The full path of the file to delete. - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The specified path does not exist or is a directory: - /// - public Result DeleteFile(U8Span path) - { - if (path.IsNull()) - return ResultFs.NullptrArgument.Log(); - - return DoDeleteFile(path); - } - - /// - /// Creates all directories and subdirectories in the specified path unless they already exist. - /// - /// The full path of the directory to create. - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The parent directory of the specified path does not exist: - /// Specified path already exists as either a file or directory: - /// Insufficient free space to create the directory: - /// - public Result CreateDirectory(U8Span path) - { - if (path.IsNull()) - return ResultFs.NullptrArgument.Log(); - - return DoCreateDirectory(path); - } - - /// - /// Deletes the specified directory. - /// - /// The full path of the directory to delete. - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The specified path does not exist or is a file: - /// The specified directory is not empty: - /// - public Result DeleteDirectory(U8Span path) - { - if (path.IsNull()) - return ResultFs.NullptrArgument.Log(); - - return DoDeleteDirectory(path); - } - - /// - /// Deletes the specified directory and any subdirectories and files in the directory. - /// - /// The full path of the directory to delete. - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The specified path does not exist or is a file: - /// - public Result DeleteDirectoryRecursively(U8Span path) - { - if (path.IsNull()) - return ResultFs.NullptrArgument.Log(); - - return DoDeleteDirectoryRecursively(path); - } - - /// - /// Deletes any subdirectories and files in the specified directory. - /// - /// The full path of the directory to clean. - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The specified path does not exist or is a file: - /// - public Result CleanDirectoryRecursively(U8Span path) - { - if (path.IsNull()) - return ResultFs.NullptrArgument.Log(); - - return DoCleanDirectoryRecursively(path); - } - - /// - /// Renames or moves a file to a new location. - /// - /// The full path of the file to rename. - /// The new full path of the file. - /// The of the requested operation. - /// - /// If and are the same, this function does nothing and returns successfully. - /// The following codes may be returned under certain conditions: - /// - /// does not exist or is a directory: - /// 's parent directory does not exist: - /// already exists as either a file or directory: - /// - public Result RenameFile(U8Span oldPath, U8Span newPath) - { - if (oldPath.IsNull()) - return ResultFs.NullptrArgument.Log(); - - if (newPath.IsNull()) - return ResultFs.NullptrArgument.Log(); - - return DoRenameFile(oldPath, newPath); - } - - /// - /// Renames or moves a directory to a new location. - /// - /// The full path of the directory to rename. - /// The new full path of the directory. - /// The of the requested operation. - /// - /// If and are the same, this function does nothing and returns . - /// The following codes may be returned under certain conditions: - /// - /// does not exist or is a file: - /// 's parent directory does not exist: - /// already exists as either a file or directory: - /// Either or is a subpath of the other: - /// - public Result RenameDirectory(U8Span oldPath, U8Span newPath) - { - if (oldPath.IsNull()) - return ResultFs.NullptrArgument.Log(); - - if (newPath.IsNull()) - return ResultFs.NullptrArgument.Log(); - - return DoRenameDirectory(oldPath, newPath); - } - - /// - /// Determines whether the specified path is a file or directory, or does not exist. - /// - /// If the operation returns successfully, the of the file. - /// The full path to check. - /// The of the requested operation. - public Result GetEntryType(out DirectoryEntryType entryType, U8Span path) - { - if (path.IsNull()) - { - entryType = default; - return ResultFs.NullptrArgument.Log(); - } - - return DoGetEntryType(out entryType, path); - } - - /// - /// Gets the amount of available free space on a drive, in bytes. - /// - /// If the operation returns successfully, the amount of free space available on the drive, in bytes. - /// The path of the drive to query. Unused in almost all cases. - /// The of the requested operation. - public Result GetFreeSpaceSize(out long freeSpace, U8Span path) - { - if (path.IsNull()) - { - freeSpace = default; - return ResultFs.NullptrArgument.Log(); - } - - return DoGetFreeSpaceSize(out freeSpace, path); - } - - /// - /// Gets the total size of storage space on a drive, in bytes. - /// - /// If the operation returns successfully, the total size of the drive, in bytes. - /// The path of the drive to query. Unused in almost all cases. - /// The of the requested operation. - public Result GetTotalSpaceSize(out long totalSpace, U8Span path) - { - if (path.IsNull()) - { - totalSpace = default; - return ResultFs.NullptrArgument.Log(); - } - - return DoGetTotalSpaceSize(out totalSpace, path); - } - - /// - /// Opens an instance for the specified path. - /// - /// If the operation returns successfully, - /// An instance for the specified path. - /// The full path of the file to open. - /// Specifies the access permissions of the created . - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The specified path does not exist or is a directory: - /// - public Result OpenFile(out IFile2 file, U8Span path, OpenMode mode) - { - if (path.IsNull()) - { - file = default; - return ResultFs.NullptrArgument.Log(); - } - - if ((mode & OpenMode.ReadWrite) == 0) - { - file = default; - return ResultFs.InvalidOpenMode.Log(); - } - - if ((mode & ~OpenMode.All) != 0) - { - file = default; - return ResultFs.InvalidOpenMode.Log(); - } - - return DoOpenFile(out file, path, mode); - } - - /// - /// Creates an instance for enumerating the specified directory. - /// - /// If the operation returns successfully, - /// An instance for the specified directory. - /// The directory's full path. - /// Specifies which sub-entries should be enumerated. - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The specified path does not exist or is a file: - /// - public Result OpenDirectory(out IDirectory2 directory, U8Span path, OpenDirectoryMode mode) - { - if (path.IsNull()) - { - directory = default; - return ResultFs.NullptrArgument.Log(); - } - - if ((mode & OpenDirectoryMode.All) == 0) - { - directory = default; - return ResultFs.InvalidOpenMode.Log(); - } - - if ((mode & ~(OpenDirectoryMode.All | OpenDirectoryMode.NoFileSize)) != 0) - { - directory = default; - return ResultFs.InvalidOpenMode.Log(); - } - - return DoOpenDirectory(out directory, path, mode); - } - - /// - /// Commits any changes to a transactional file system. - /// Does nothing if called on a non-transactional file system. - /// - /// The of the requested operation. - public Result Commit() => DoCommit(); - - public Result CommitProvisionally(long counter) => DoCommitProvisionally(counter); - - public Result Rollback() => DoRollback(); - - public Result Flush() => DoFlush(); - - /// - /// Gets the creation, last accessed, and last modified timestamps of a file or directory. - /// - /// If the operation returns successfully, the timestamps for the specified file or directory. - /// These value are expressed as Unix timestamps. - /// The path of the file or directory. - /// The of the requested operation. - /// - /// The following codes may be returned under certain conditions: - /// - /// The specified path does not exist: - /// - public Result GetFileTimeStampRaw(out FileTimeStampRaw timeStamp, U8Span path) - { - if (path.IsNull()) - { - timeStamp = default; - return ResultFs.NullptrArgument.Log(); - } - - return DoGetFileTimeStampRaw(out timeStamp, path); - } - - /// - /// Performs a query on the specified file. - /// - /// This method allows implementers of to accept queries and operations - /// not included in the IFileSystem interface itself. - /// The buffer for receiving data from the query operation. - /// May be unused depending on the query type. - /// The buffer for sending data to the query operation. - /// May be unused depending on the query type. - /// The type of query to perform. - /// The full path of the file to query. - /// The of the requested operation. - public Result QueryEntry(Span outBuffer, ReadOnlySpan inBuffer, QueryId queryId, U8Span path) - { - if (path.IsNull()) - return ResultFs.NullptrArgument.Log(); - - return DoQueryEntry(outBuffer, inBuffer, queryId, path); - } - - protected abstract Result DoCreateFile(U8Span path, long size, CreateFileOptions option); - protected abstract Result DoDeleteFile(U8Span path); - protected abstract Result DoCreateDirectory(U8Span path); - protected abstract Result DoDeleteDirectory(U8Span path); - protected abstract Result DoDeleteDirectoryRecursively(U8Span path); - protected abstract Result DoCleanDirectoryRecursively(U8Span path); - protected abstract Result DoRenameFile(U8Span oldPath, U8Span newPath); - protected abstract Result DoRenameDirectory(U8Span oldPath, U8Span newPath); - protected abstract Result DoGetEntryType(out DirectoryEntryType entryType, U8Span path); - - protected virtual Result DoGetFreeSpaceSize(out long freeSpace, U8Span path) - { - freeSpace = default; - return ResultFs.NotImplemented.Log(); - } - - protected virtual Result DoGetTotalSpaceSize(out long totalSpace, U8Span path) - { - totalSpace = default; - return ResultFs.NotImplemented.Log(); - } - - protected abstract Result DoOpenFile(out IFile2 file, U8Span path, OpenMode mode); - protected abstract Result DoOpenDirectory(out IDirectory2 directory, U8Span path, OpenDirectoryMode mode); - protected abstract Result DoCommit(); - - protected virtual Result DoCommitProvisionally(long counter) => ResultFs.NotImplemented.Log(); - protected virtual Result DoRollback() => ResultFs.NotImplemented.Log(); - protected virtual Result DoFlush() => ResultFs.NotImplemented.Log(); - - protected virtual Result DoGetFileTimeStampRaw(out FileTimeStampRaw timeStamp, U8Span path) - { - timeStamp = default; - return ResultFs.NotImplemented.Log(); - } - - protected virtual Result DoQueryEntry(Span outBuffer, ReadOnlySpan inBuffer, QueryId queryId, - U8Span path) => ResultFs.NotImplemented.Log(); - - protected virtual void Dispose(bool disposing) { } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - } -} diff --git a/src/LibHac/Fs/InMemoryFileSystem.cs b/src/LibHac/Fs/InMemoryFileSystem.cs index 09642fec..f6513919 100644 --- a/src/LibHac/Fs/InMemoryFileSystem.cs +++ b/src/LibHac/Fs/InMemoryFileSystem.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.IO; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsSystem; namespace LibHac.Fs diff --git a/src/LibHac/Fs/Shim/Application.cs b/src/LibHac/Fs/Shim/Application.cs index 109aa08e..e76cd176 100644 --- a/src/LibHac/Fs/Shim/Application.cs +++ b/src/LibHac/Fs/Shim/Application.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; using LibHac.FsSystem; diff --git a/src/LibHac/Fs/Shim/BcatSaveData.cs b/src/LibHac/Fs/Shim/BcatSaveData.cs index 05a5542a..98e3fa71 100644 --- a/src/LibHac/Fs/Shim/BcatSaveData.cs +++ b/src/LibHac/Fs/Shim/BcatSaveData.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; using LibHac.Ncm; diff --git a/src/LibHac/Fs/Shim/Bis.cs b/src/LibHac/Fs/Shim/Bis.cs index ba4f5ba5..283b52b8 100644 --- a/src/LibHac/Fs/Shim/Bis.cs +++ b/src/LibHac/Fs/Shim/Bis.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; using LibHac.FsSystem; using static LibHac.Fs.CommonMountNames; diff --git a/src/LibHac/Fs/Shim/Content.cs b/src/LibHac/Fs/Shim/Content.cs index 86435b44..5cc6c083 100644 --- a/src/LibHac/Fs/Shim/Content.cs +++ b/src/LibHac/Fs/Shim/Content.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; using LibHac.FsSystem; using LibHac.Ncm; diff --git a/src/LibHac/Fs/Shim/ContentStorage.cs b/src/LibHac/Fs/Shim/ContentStorage.cs index 3efa8c21..2e7324d0 100644 --- a/src/LibHac/Fs/Shim/ContentStorage.cs +++ b/src/LibHac/Fs/Shim/ContentStorage.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; namespace LibHac.Fs.Shim diff --git a/src/LibHac/Fs/Shim/CustomStorage.cs b/src/LibHac/Fs/Shim/CustomStorage.cs index d377e81b..8f751dc6 100644 --- a/src/LibHac/Fs/Shim/CustomStorage.cs +++ b/src/LibHac/Fs/Shim/CustomStorage.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; namespace LibHac.Fs.Shim diff --git a/src/LibHac/Fs/Shim/GameCard.cs b/src/LibHac/Fs/Shim/GameCard.cs index 0535a188..50123fc7 100644 --- a/src/LibHac/Fs/Shim/GameCard.cs +++ b/src/LibHac/Fs/Shim/GameCard.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; namespace LibHac.Fs.Shim diff --git a/src/LibHac/Fs/Shim/Host.cs b/src/LibHac/Fs/Shim/Host.cs index e26fae22..c16849d4 100644 --- a/src/LibHac/Fs/Shim/Host.cs +++ b/src/LibHac/Fs/Shim/Host.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; using LibHac.FsSystem; using static LibHac.Fs.CommonMountNames; diff --git a/src/LibHac/Fs/Shim/SaveData.cs b/src/LibHac/Fs/Shim/SaveData.cs index 6f4ff330..8fde8f76 100644 --- a/src/LibHac/Fs/Shim/SaveData.cs +++ b/src/LibHac/Fs/Shim/SaveData.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; using LibHac.Ncm; diff --git a/src/LibHac/Fs/Shim/SdCard.cs b/src/LibHac/Fs/Shim/SdCard.cs index d0504001..3be963d9 100644 --- a/src/LibHac/Fs/Shim/SdCard.cs +++ b/src/LibHac/Fs/Shim/SdCard.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; namespace LibHac.Fs.Shim diff --git a/src/LibHac/Fs/Shim/SystemSaveData.cs b/src/LibHac/Fs/Shim/SystemSaveData.cs index 3bb55ef0..af98ef99 100644 --- a/src/LibHac/Fs/Shim/SystemSaveData.cs +++ b/src/LibHac/Fs/Shim/SystemSaveData.cs @@ -1,4 +1,5 @@ using LibHac.Common; +using LibHac.Fs.Fsa; using LibHac.FsService; namespace LibHac.Fs.Shim diff --git a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs index 2cf17e25..467f21e0 100644 --- a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs @@ -1,5 +1,6 @@ using System.Diagnostics; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs index 90b75a58..1dbe7b52 100644 --- a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs +++ b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs @@ -1,5 +1,6 @@ using System.Diagnostics; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EmulatedGameCardFsCreator.cs b/src/LibHac/FsService/Creators/EmulatedGameCardFsCreator.cs index f5fc1f71..3f1738d5 100644 --- a/src/LibHac/FsService/Creators/EmulatedGameCardFsCreator.cs +++ b/src/LibHac/FsService/Creators/EmulatedGameCardFsCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs b/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs index ce13dc4c..881a7ba8 100644 --- a/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs b/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs index 11d751bb..2493935f 100644 --- a/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; namespace LibHac.FsService.Creators diff --git a/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs b/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs index b94ca90a..0ad90fcd 100644 --- a/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs b/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs index f6cfde96..b1445988 100644 --- a/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs b/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs index b86fac56..8a763db8 100644 --- a/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs b/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs index 550ce9c6..a6e98e38 100644 --- a/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs b/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs index d7c50ff5..109de58f 100644 --- a/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs b/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs index af99e8cd..44140ba2 100644 --- a/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs b/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs index b2ea3957..0f141424 100644 --- a/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs b/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs index dd62d5ee..08a1d955 100644 --- a/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem.Save; namespace LibHac.FsService.Creators diff --git a/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs b/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs index 041f0217..b368a5a9 100644 --- a/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs b/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs index 2d6d8fb3..274aa426 100644 --- a/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs +++ b/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem.NcaUtils; namespace LibHac.FsService.Creators diff --git a/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs b/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs index a3510a46..39d021c4 100644 --- a/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs @@ -1,5 +1,5 @@ using LibHac.Common; -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs b/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs index cae86243..550be0c7 100644 --- a/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/PartitionFileSystemCreator.cs b/src/LibHac/FsService/Creators/PartitionFileSystemCreator.cs index 3d78508f..e508faeb 100644 --- a/src/LibHac/FsService/Creators/PartitionFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/PartitionFileSystemCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.Detail; diff --git a/src/LibHac/FsService/Creators/RomFileSystemCreator.cs b/src/LibHac/FsService/Creators/RomFileSystemCreator.cs index a1309b51..8b8bb5b6 100644 --- a/src/LibHac/FsService/Creators/RomFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/RomFileSystemCreator.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem.RomFs; namespace LibHac.FsService.Creators diff --git a/src/LibHac/FsService/Creators/SaveDataFileSystemCreator.cs b/src/LibHac/FsService/Creators/SaveDataFileSystemCreator.cs index 997954d3..6d44022b 100644 --- a/src/LibHac/FsService/Creators/SaveDataFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/SaveDataFileSystemCreator.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.Save; diff --git a/src/LibHac/FsService/Creators/StorageOnNcaCreator.cs b/src/LibHac/FsService/Creators/StorageOnNcaCreator.cs index f93c12d4..85455dec 100644 --- a/src/LibHac/FsService/Creators/StorageOnNcaCreator.cs +++ b/src/LibHac/FsService/Creators/StorageOnNcaCreator.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.Detail; using LibHac.FsSystem.NcaUtils; diff --git a/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs b/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs index 9ddbc677..bc36c475 100644 --- a/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs @@ -1,5 +1,5 @@ using LibHac.Common; -using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; namespace LibHac.FsService.Creators diff --git a/src/LibHac/FsService/Creators/TargetManagerFileSystemCreator.cs b/src/LibHac/FsService/Creators/TargetManagerFileSystemCreator.cs index 1ccefcc8..5834b5f4 100644 --- a/src/LibHac/FsService/Creators/TargetManagerFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/TargetManagerFileSystemCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/DefaultFsServerObjects.cs b/src/LibHac/FsService/DefaultFsServerObjects.cs index c71c406a..5fbed7f4 100644 --- a/src/LibHac/FsService/DefaultFsServerObjects.cs +++ b/src/LibHac/FsService/DefaultFsServerObjects.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsService.Creators; namespace LibHac.FsService diff --git a/src/LibHac/FsService/FileSystemProxy.cs b/src/LibHac/FsService/FileSystemProxy.cs index 1725da97..886de3f6 100644 --- a/src/LibHac/FsService/FileSystemProxy.cs +++ b/src/LibHac/FsService/FileSystemProxy.cs @@ -2,6 +2,7 @@ using System.Runtime.CompilerServices; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsService.Impl; using LibHac.FsSystem; using LibHac.Kvdb; diff --git a/src/LibHac/FsService/FileSystemProxyCore.cs b/src/LibHac/FsService/FileSystemProxyCore.cs index 0feb8a81..bfee4564 100644 --- a/src/LibHac/FsService/FileSystemProxyCore.cs +++ b/src/LibHac/FsService/FileSystemProxyCore.cs @@ -3,6 +3,7 @@ using System.Buffers.Text; using System.Runtime.CompilerServices; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.Fs.Shim; using LibHac.FsSystem; using LibHac.FsService.Creators; diff --git a/src/LibHac/FsService/IFileSystemProxy.cs b/src/LibHac/FsService/IFileSystemProxy.cs index 15711c93..d84e60e0 100644 --- a/src/LibHac/FsService/IFileSystemProxy.cs +++ b/src/LibHac/FsService/IFileSystemProxy.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.Ncm; using LibHac.Spl; diff --git a/src/LibHac/FsService/IMultiCommitManager.cs b/src/LibHac/FsService/IMultiCommitManager.cs index 029946d9..5d811966 100644 --- a/src/LibHac/FsService/IMultiCommitManager.cs +++ b/src/LibHac/FsService/IMultiCommitManager.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsService { diff --git a/src/LibHac/FsService/Impl/MultiCommitManager.cs b/src/LibHac/FsService/Impl/MultiCommitManager.cs index e8a0a31b..3b77a44f 100644 --- a/src/LibHac/FsService/Impl/MultiCommitManager.cs +++ b/src/LibHac/FsService/Impl/MultiCommitManager.cs @@ -2,6 +2,7 @@ using System.Runtime.InteropServices; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.Fs.Shim; namespace LibHac.FsService.Impl diff --git a/src/LibHac/FsService/Util.cs b/src/LibHac/FsService/Util.cs index 243717b5..5e44e966 100644 --- a/src/LibHac/FsService/Util.cs +++ b/src/LibHac/FsService/Util.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; namespace LibHac.FsService diff --git a/src/LibHac/FsSystem/AesXtsDirectory.cs b/src/LibHac/FsSystem/AesXtsDirectory.cs index ddf2d8a2..542efd48 100644 --- a/src/LibHac/FsSystem/AesXtsDirectory.cs +++ b/src/LibHac/FsSystem/AesXtsDirectory.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/AesXtsFile.cs b/src/LibHac/FsSystem/AesXtsFile.cs index cb09d90c..7c5c7340 100644 --- a/src/LibHac/FsSystem/AesXtsFile.cs +++ b/src/LibHac/FsSystem/AesXtsFile.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/AesXtsFileHeader.cs b/src/LibHac/FsSystem/AesXtsFileHeader.cs index 400bfd93..646c94d9 100644 --- a/src/LibHac/FsSystem/AesXtsFileHeader.cs +++ b/src/LibHac/FsSystem/AesXtsFileHeader.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/AesXtsFileSystem.cs b/src/LibHac/FsSystem/AesXtsFileSystem.cs index 88ff6f38..8ab3c1d9 100644 --- a/src/LibHac/FsSystem/AesXtsFileSystem.cs +++ b/src/LibHac/FsSystem/AesXtsFileSystem.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/ConcatenationDirectory.cs b/src/LibHac/FsSystem/ConcatenationDirectory.cs index 5e3e0ff0..36b8195f 100644 --- a/src/LibHac/FsSystem/ConcatenationDirectory.cs +++ b/src/LibHac/FsSystem/ConcatenationDirectory.cs @@ -2,6 +2,7 @@ using System.Runtime.InteropServices; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/ConcatenationFile.cs b/src/LibHac/FsSystem/ConcatenationFile.cs index 4dc30989..52bca2a1 100644 --- a/src/LibHac/FsSystem/ConcatenationFile.cs +++ b/src/LibHac/FsSystem/ConcatenationFile.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Linq; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/ConcatenationFileSystem.cs b/src/LibHac/FsSystem/ConcatenationFileSystem.cs index b65b5cc6..5a254faa 100644 --- a/src/LibHac/FsSystem/ConcatenationFileSystem.cs +++ b/src/LibHac/FsSystem/ConcatenationFileSystem.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/Delta.cs b/src/LibHac/FsSystem/Delta.cs index a3869dbe..f8bc168a 100644 --- a/src/LibHac/FsSystem/Delta.cs +++ b/src/LibHac/FsSystem/Delta.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/DirectorySaveDataFile.cs b/src/LibHac/FsSystem/DirectorySaveDataFile.cs index 0a02b6be..d2ce1d30 100644 --- a/src/LibHac/FsSystem/DirectorySaveDataFile.cs +++ b/src/LibHac/FsSystem/DirectorySaveDataFile.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs b/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs index 821b49e1..f6fadb93 100644 --- a/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs +++ b/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/DirectoryUtils.cs b/src/LibHac/FsSystem/DirectoryUtils.cs index feaf3659..2f26bafe 100644 --- a/src/LibHac/FsSystem/DirectoryUtils.cs +++ b/src/LibHac/FsSystem/DirectoryUtils.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/FileReader.cs b/src/LibHac/FsSystem/FileReader.cs index b1c79db8..47798817 100644 --- a/src/LibHac/FsSystem/FileReader.cs +++ b/src/LibHac/FsSystem/FileReader.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/FileStorage.cs b/src/LibHac/FsSystem/FileStorage.cs index 29c5d240..133b6a7e 100644 --- a/src/LibHac/FsSystem/FileStorage.cs +++ b/src/LibHac/FsSystem/FileStorage.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/FileSystemExtensions.cs b/src/LibHac/FsSystem/FileSystemExtensions.cs index 858cf318..849056b5 100644 --- a/src/LibHac/FsSystem/FileSystemExtensions.cs +++ b/src/LibHac/FsSystem/FileSystemExtensions.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.IO; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/LayeredFileSystem.cs b/src/LibHac/FsSystem/LayeredFileSystem.cs index d37be7d8..ccb5916d 100644 --- a/src/LibHac/FsSystem/LayeredFileSystem.cs +++ b/src/LibHac/FsSystem/LayeredFileSystem.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/LocalDirectory.cs b/src/LibHac/FsSystem/LocalDirectory.cs index 12bdf853..933b1252 100644 --- a/src/LibHac/FsSystem/LocalDirectory.cs +++ b/src/LibHac/FsSystem/LocalDirectory.cs @@ -4,6 +4,7 @@ using System.IO; using System.Runtime.CompilerServices; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/LocalFile.cs b/src/LibHac/FsSystem/LocalFile.cs index 9cd7c1e6..22f3b7a2 100644 --- a/src/LibHac/FsSystem/LocalFile.cs +++ b/src/LibHac/FsSystem/LocalFile.cs @@ -2,6 +2,7 @@ using System.IO; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/LocalFileSystem.cs b/src/LibHac/FsSystem/LocalFileSystem.cs index 99745ee9..12906dfb 100644 --- a/src/LibHac/FsSystem/LocalFileSystem.cs +++ b/src/LibHac/FsSystem/LocalFileSystem.cs @@ -4,6 +4,7 @@ using System.IO; using System.Threading; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/NcaUtils/Nca.cs b/src/LibHac/FsSystem/NcaUtils/Nca.cs index d81ee843..0626f84b 100644 --- a/src/LibHac/FsSystem/NcaUtils/Nca.cs +++ b/src/LibHac/FsSystem/NcaUtils/Nca.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem.RomFs; using LibHac.Spl; diff --git a/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs b/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs index 8b906765..7ce6ab25 100644 --- a/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs @@ -3,6 +3,7 @@ using System.Buffers.Binary; using System.Diagnostics; using LibHac.Crypto; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.NcaUtils { diff --git a/src/LibHac/FsSystem/NullFile.cs b/src/LibHac/FsSystem/NullFile.cs index 3cd238ee..20a701c1 100644 --- a/src/LibHac/FsSystem/NullFile.cs +++ b/src/LibHac/FsSystem/NullFile.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/NxFileStream.cs b/src/LibHac/FsSystem/NxFileStream.cs index 00d8593e..88a7e78f 100644 --- a/src/LibHac/FsSystem/NxFileStream.cs +++ b/src/LibHac/FsSystem/NxFileStream.cs @@ -1,6 +1,7 @@ using System; using System.IO; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionDirectory.cs b/src/LibHac/FsSystem/PartitionDirectory.cs index d563fc19..03550613 100644 --- a/src/LibHac/FsSystem/PartitionDirectory.cs +++ b/src/LibHac/FsSystem/PartitionDirectory.cs @@ -3,6 +3,7 @@ using System.IO; using System.Text; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionFile.cs b/src/LibHac/FsSystem/PartitionFile.cs index 5cbcf6e7..8ad0c829 100644 --- a/src/LibHac/FsSystem/PartitionFile.cs +++ b/src/LibHac/FsSystem/PartitionFile.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionFileSystem.cs b/src/LibHac/FsSystem/PartitionFileSystem.cs index aa299e58..4be509f1 100644 --- a/src/LibHac/FsSystem/PartitionFileSystem.cs +++ b/src/LibHac/FsSystem/PartitionFileSystem.cs @@ -6,6 +6,7 @@ using System.Text; using LibHac.Common; using LibHac.Crypto; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs b/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs index 158f2db1..b6133b5f 100644 --- a/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs +++ b/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs @@ -6,6 +6,7 @@ using System.Text; using LibHac.Common; using LibHac.Crypto; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionFileSystemCore.cs b/src/LibHac/FsSystem/PartitionFileSystemCore.cs index 5497707d..01f03440 100644 --- a/src/LibHac/FsSystem/PartitionFileSystemCore.cs +++ b/src/LibHac/FsSystem/PartitionFileSystemCore.cs @@ -3,6 +3,7 @@ using System.Runtime.CompilerServices; using LibHac.Common; using LibHac.Crypto; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem.Detail; namespace LibHac.FsSystem diff --git a/src/LibHac/FsSystem/ReadOnlyFile.cs b/src/LibHac/FsSystem/ReadOnlyFile.cs index 0c0a2378..61a1e820 100644 --- a/src/LibHac/FsSystem/ReadOnlyFile.cs +++ b/src/LibHac/FsSystem/ReadOnlyFile.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/ReadOnlyFileSystem.cs b/src/LibHac/FsSystem/ReadOnlyFileSystem.cs index 72f0d493..f7addcfc 100644 --- a/src/LibHac/FsSystem/ReadOnlyFileSystem.cs +++ b/src/LibHac/FsSystem/ReadOnlyFileSystem.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs b/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs index dae93716..7a823195 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs b/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs index 3f5733cc..6f2aaae8 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs @@ -2,6 +2,7 @@ using System.Text; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/RomFs/RomFsFile.cs b/src/LibHac/FsSystem/RomFs/RomFsFile.cs index 22907666..e3d70170 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsFile.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsFile.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs b/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs index 9b7c96fc..310aa7eb 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/Save/SaveDataDirectory.cs b/src/LibHac/FsSystem/Save/SaveDataDirectory.cs index 21b70e55..81e6ec6f 100644 --- a/src/LibHac/FsSystem/Save/SaveDataDirectory.cs +++ b/src/LibHac/FsSystem/Save/SaveDataDirectory.cs @@ -2,6 +2,7 @@ using System.Text; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/SaveDataFile.cs b/src/LibHac/FsSystem/Save/SaveDataFile.cs index a8abd814..b3a0b6df 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFile.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFile.cs @@ -2,6 +2,7 @@ using System.IO; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs b/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs index 311de5f5..6ec53e1e 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs @@ -3,6 +3,7 @@ using System.IO; using LibHac.Common; using LibHac.Crypto; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs b/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs index f48c3273..aa7c3fb8 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs @@ -1,6 +1,7 @@ using System.IO; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/StorageExtensions.cs b/src/LibHac/FsSystem/StorageExtensions.cs index 107b5a80..da2da86d 100644 --- a/src/LibHac/FsSystem/StorageExtensions.cs +++ b/src/LibHac/FsSystem/StorageExtensions.cs @@ -3,6 +3,7 @@ using System.Buffers; using System.IO; using System.Runtime.InteropServices; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/StorageFile.cs b/src/LibHac/FsSystem/StorageFile.cs index 9c6d362a..e32faaae 100644 --- a/src/LibHac/FsSystem/StorageFile.cs +++ b/src/LibHac/FsSystem/StorageFile.cs @@ -1,5 +1,6 @@ using System; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/StreamFile.cs b/src/LibHac/FsSystem/StreamFile.cs index f45e1627..b0b8ddf4 100644 --- a/src/LibHac/FsSystem/StreamFile.cs +++ b/src/LibHac/FsSystem/StreamFile.cs @@ -1,6 +1,7 @@ using System; using System.IO; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/SubdirectoryFileSystem.cs b/src/LibHac/FsSystem/SubdirectoryFileSystem.cs index 1ce09c4f..8eb4c861 100644 --- a/src/LibHac/FsSystem/SubdirectoryFileSystem.cs +++ b/src/LibHac/FsSystem/SubdirectoryFileSystem.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/Utility.cs b/src/LibHac/FsSystem/Utility.cs index 8e03cc33..a38efa5c 100644 --- a/src/LibHac/FsSystem/Utility.cs +++ b/src/LibHac/FsSystem/Utility.cs @@ -4,6 +4,7 @@ using System.Threading; using LibHac.Common; using LibHac.Diag; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.FsSystem { diff --git a/src/LibHac/Loader/NsoReader.cs b/src/LibHac/Loader/NsoReader.cs index 17c9039f..4266d17a 100644 --- a/src/LibHac/Loader/NsoReader.cs +++ b/src/LibHac/Loader/NsoReader.cs @@ -2,6 +2,7 @@ using System.Runtime.CompilerServices; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.Loader { diff --git a/src/LibHac/SwitchFs.cs b/src/LibHac/SwitchFs.cs index 565403be..4361002e 100644 --- a/src/LibHac/SwitchFs.cs +++ b/src/LibHac/SwitchFs.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using LibHac.FsSystem.Save; diff --git a/src/LibHac/Xci.cs b/src/LibHac/Xci.cs index e2bb6fb9..66eeab96 100644 --- a/src/LibHac/Xci.cs +++ b/src/LibHac/Xci.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; namespace LibHac diff --git a/src/hactoolnet/FsUtils.cs b/src/hactoolnet/FsUtils.cs index 8dfff38e..c8163d88 100644 --- a/src/hactoolnet/FsUtils.cs +++ b/src/hactoolnet/FsUtils.cs @@ -3,6 +3,7 @@ using System.Buffers; using LibHac; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; namespace hactoolnet diff --git a/src/hactoolnet/ProcessDelta.cs b/src/hactoolnet/ProcessDelta.cs index 9c9d03b1..00f6da1b 100644 --- a/src/hactoolnet/ProcessDelta.cs +++ b/src/hactoolnet/ProcessDelta.cs @@ -4,6 +4,7 @@ using System.Runtime.InteropServices; using System.Text; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using static hactoolnet.Print; diff --git a/src/hactoolnet/ProcessNca.cs b/src/hactoolnet/ProcessNca.cs index eef9771e..cf3755b2 100644 --- a/src/hactoolnet/ProcessNca.cs +++ b/src/hactoolnet/ProcessNca.cs @@ -3,6 +3,7 @@ using System.Text; using LibHac; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using LibHac.Npdm; diff --git a/src/hactoolnet/ProcessSave.cs b/src/hactoolnet/ProcessSave.cs index e663fccb..1b0093f5 100644 --- a/src/hactoolnet/ProcessSave.cs +++ b/src/hactoolnet/ProcessSave.cs @@ -6,6 +6,7 @@ using System.Text; using LibHac; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.Save; using static hactoolnet.Print; diff --git a/src/hactoolnet/ProcessSwitchFs.cs b/src/hactoolnet/ProcessSwitchFs.cs index 637848cd..4d9f1bd8 100644 --- a/src/hactoolnet/ProcessSwitchFs.cs +++ b/src/hactoolnet/ProcessSwitchFs.cs @@ -6,6 +6,7 @@ using System.Runtime.InteropServices; using System.Text; using LibHac; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using LibHac.FsSystem.Save; diff --git a/src/hactoolnet/ResultLogger.cs b/src/hactoolnet/ResultLogger.cs index ea9cec34..69674a50 100644 --- a/src/hactoolnet/ResultLogger.cs +++ b/src/hactoolnet/ResultLogger.cs @@ -4,6 +4,7 @@ using System.IO; using System.Reflection; using LibHac; using LibHac.Fs; +using LibHac.Fs.Fsa; namespace hactoolnet { diff --git a/tests/LibHac.Tests/Fs/AesXtsFileSystemTests.cs b/tests/LibHac.Tests/Fs/AesXtsFileSystemTests.cs index 9d02ba09..44fe7029 100644 --- a/tests/LibHac.Tests/Fs/AesXtsFileSystemTests.cs +++ b/tests/LibHac.Tests/Fs/AesXtsFileSystemTests.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.Tests.Fs.IFileSystemTestBase; diff --git a/tests/LibHac.Tests/Fs/DirectorySaveDataFileSystemTests.cs b/tests/LibHac.Tests/Fs/DirectorySaveDataFileSystemTests.cs index 87e8eb74..c4192058 100644 --- a/tests/LibHac.Tests/Fs/DirectorySaveDataFileSystemTests.cs +++ b/tests/LibHac.Tests/Fs/DirectorySaveDataFileSystemTests.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.Tests.Fs.IFileSystemTestBase; using Xunit; diff --git a/tests/LibHac.Tests/Fs/FileSystemClientTests/FileSystemServerFactory.cs b/tests/LibHac.Tests/Fs/FileSystemClientTests/FileSystemServerFactory.cs index 4d95b7ea..9a628c42 100644 --- a/tests/LibHac.Tests/Fs/FileSystemClientTests/FileSystemServerFactory.cs +++ b/tests/LibHac.Tests/Fs/FileSystemClientTests/FileSystemServerFactory.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsService; namespace LibHac.Tests.Fs.FileSystemClientTests diff --git a/tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/Bis.cs b/tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/Bis.cs index c15f1be9..e253afac 100644 --- a/tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/Bis.cs +++ b/tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/Bis.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.Fs.Shim; using Xunit; diff --git a/tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/SdCard.cs b/tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/SdCard.cs index f4742175..d102a0a8 100644 --- a/tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/SdCard.cs +++ b/tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/SdCard.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.Fs.Shim; using Xunit; diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.Commit.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.Commit.cs index 3cda8312..00db4445 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.Commit.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.Commit.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.cs index 8aacb0fe..1141f000 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.Tests.Fs.IFileSystemTestBase { diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IAttributeFileSystemTests.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IAttributeFileSystemTests.cs index 59b35933..2b3ddbf3 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IAttributeFileSystemTests.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IAttributeFileSystemTests.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CleanDirectoryRecursively.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CleanDirectoryRecursively.cs index 20a2bd27..95e8896b 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CleanDirectoryRecursively.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CleanDirectoryRecursively.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CreateDirectory.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CreateDirectory.cs index 5169b447..e9fc73c2 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CreateDirectory.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CreateDirectory.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CreateFile.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CreateFile.cs index 8f437383..fabad17a 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CreateFile.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.CreateFile.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteDirectory.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteDirectory.cs index a4f18b73..af127a6c 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteDirectory.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteDirectory.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteDirectoryRecursively.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteDirectoryRecursively.cs index 8d27bd17..9f2c9243 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteDirectoryRecursively.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteDirectoryRecursively.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteFile.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteFile.cs index c9fe658d..f8593414 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteFile.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.DeleteFile.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.GetEntryType.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.GetEntryType.cs index d94df8f3..70c1913a 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.GetEntryType.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.GetEntryType.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IDirectory.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IDirectory.cs index cb0bc160..80300da9 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IDirectory.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IDirectory.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Read.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Read.cs index 8233e9ba..8eacc3d0 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Read.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Read.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Size.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Size.cs index 4660e8e2..f9cce094 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Size.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Size.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Write.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Write.cs index 0c259473..8ca76e86 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Write.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Write.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.OpenDirectory.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.OpenDirectory.cs index 94e408bb..78188f07 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.OpenDirectory.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.OpenDirectory.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.OpenFile.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.OpenFile.cs index a6c5dfe6..85d6529a 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.OpenFile.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.OpenFile.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameDirectory.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameDirectory.cs index c6343f0f..74540f41 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameDirectory.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameDirectory.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameFile.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameFile.cs index f588af0d..696db645 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameFile.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameFile.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using Xunit; namespace LibHac.Tests.Fs.IFileSystemTestBase diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.cs index a5f76787..e3ea3ce1 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.Fs.Fsa; namespace LibHac.Tests.Fs.IFileSystemTestBase { diff --git a/tests/LibHac.Tests/Fs/InMemoryFileSystemTests.cs b/tests/LibHac.Tests/Fs/InMemoryFileSystemTests.cs index c4170dea..e99d4da8 100644 --- a/tests/LibHac.Tests/Fs/InMemoryFileSystemTests.cs +++ b/tests/LibHac.Tests/Fs/InMemoryFileSystemTests.cs @@ -1,4 +1,5 @@ using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.Tests.Fs.IFileSystemTestBase; namespace LibHac.Tests.Fs diff --git a/tests/LibHac.Tests/Fs/LayeredFileSystemTests.cs b/tests/LibHac.Tests/Fs/LayeredFileSystemTests.cs index 5e7949ee..0c9e3d22 100644 --- a/tests/LibHac.Tests/Fs/LayeredFileSystemTests.cs +++ b/tests/LibHac.Tests/Fs/LayeredFileSystemTests.cs @@ -1,6 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using Xunit; diff --git a/tests/LibHac.Tests/Fs/SubdirectoryFileSystemTests.cs b/tests/LibHac.Tests/Fs/SubdirectoryFileSystemTests.cs index ab91e662..2046b743 100644 --- a/tests/LibHac.Tests/Fs/SubdirectoryFileSystemTests.cs +++ b/tests/LibHac.Tests/Fs/SubdirectoryFileSystemTests.cs @@ -1,5 +1,6 @@ using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.Tests.Fs.IFileSystemTestBase; using Xunit;