From 0e01aa3984ddafab23486ba7f19ee8b21f2331ae Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Sat, 21 Sep 2019 12:29:10 -0500 Subject: [PATCH] Rename FS namespaces --- src/LibHac/Cnmt.cs | 2 +- src/LibHac/Common/Id128.cs | 2 +- src/LibHac/Crypto.cs | 2 +- src/LibHac/{FsClient => Fs}/Accessors/DirectoryAccessor.cs | 4 ++-- src/LibHac/{FsClient => Fs}/Accessors/FileAccessor.cs | 4 ++-- src/LibHac/{FsClient => Fs}/Accessors/FileSystemAccessor.cs | 4 ++-- src/LibHac/{FsClient => Fs}/Accessors/MountTable.cs | 4 ++-- src/LibHac/{FsClient => Fs}/ContentStorage.cs | 4 ++-- src/LibHac/{FsClient => Fs}/DirectoryHandle.cs | 4 ++-- src/LibHac/{FsClient => Fs}/FileHandle.cs | 4 ++-- src/LibHac/{FsClient => Fs}/FileSystemClient.Directory.cs | 4 ++-- src/LibHac/{FsClient => Fs}/FileSystemClient.File.cs | 4 ++-- src/LibHac/{FsClient => Fs}/FileSystemClient.FileSystem.cs | 4 ++-- src/LibHac/{FsClient => Fs}/FileSystemClient.Mount.cs | 4 ++-- src/LibHac/{FsClient => Fs}/FileSystemClient.cs | 4 ++-- src/LibHac/{FsClient => Fs}/FileSystemManager.cs | 6 +++--- src/LibHac/{FsClient => Fs}/FileSystemManagerUtils.cs | 6 +++--- src/LibHac/{FsClient => Fs}/IAccessLog.cs | 2 +- src/LibHac/{FsClient => Fs}/ICommonMountNameGenerator.cs | 2 +- src/LibHac/{FsClient => Fs}/MountHelpers.cs | 4 ++-- src/LibHac/{FsClient => Fs}/SdCardAccessLog.cs | 2 +- .../FsService/Creators/EmulatedBisFileSystemCreator.cs | 2 +- .../Creators/EmulatedBisFileSystemCreatorConfig.cs | 2 +- .../FsService/Creators/EmulatedSdFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/FileSystemCreators.cs | 2 +- src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs | 2 +- .../FsService/Creators/IBuiltInStorageFileSystemCreator.cs | 2 +- .../FsService/Creators/IEncryptedFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/IFatFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/IGameCardStorageCreator.cs | 2 +- src/LibHac/FsService/Creators/IHostFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/IMemoryStorageCreator.cs | 2 +- .../FsService/Creators/IPartitionFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/IRomFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs | 4 ++-- src/LibHac/FsService/Creators/ISdFileSystemCreator.cs | 2 +- src/LibHac/FsService/Creators/ISdStorageCreator.cs | 2 +- src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs | 4 ++-- .../FsService/Creators/ISubDirectoryFileSystemCreator.cs | 2 +- .../FsService/Creators/ITargetManagerFileSystemCreator.cs | 2 +- .../FsService/Creators/SubDirectoryFileSystemCreator.cs | 2 +- src/LibHac/FsService/FileSystemProxy.cs | 2 +- src/LibHac/FsService/FileSystemProxyCore.cs | 4 ++-- src/LibHac/FsService/FileSystemServer.cs | 2 +- src/LibHac/FsService/IFileSystemProxy.cs | 2 +- src/LibHac/FsService/Util.cs | 2 +- src/LibHac/{Fs => FsSystem}/Aes128CtrExStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/Aes128CtrStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/Aes128CtrTransform.cs | 2 +- src/LibHac/{Fs => FsSystem}/Aes128XtsStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/Aes128XtsTransform.cs | 2 +- src/LibHac/{Fs => FsSystem}/AesXtsDirectory.cs | 2 +- src/LibHac/{Fs => FsSystem}/AesXtsFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/AesXtsFileHeader.cs | 2 +- src/LibHac/{Fs => FsSystem}/AesXtsFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/BucketTree.cs | 2 +- src/LibHac/{Fs => FsSystem}/CachedStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/ConcatenationDirectory.cs | 2 +- src/LibHac/{Fs => FsSystem}/ConcatenationFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/ConcatenationFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/ConcatenationStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/ConcatenationStorageBuilder.cs | 2 +- src/LibHac/{Fs => FsSystem}/Delta.cs | 2 +- src/LibHac/{Fs => FsSystem}/DirectoryEntry.cs | 2 +- src/LibHac/{Fs => FsSystem}/DirectorySaveDataFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/DirectorySaveDataFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/DirectoryUtils.cs | 2 +- src/LibHac/{Fs => FsSystem}/FileBase.cs | 2 +- src/LibHac/{Fs => FsSystem}/FileReader.cs | 2 +- src/LibHac/{Fs => FsSystem}/FileStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/FileSystemExtensions.cs | 2 +- src/LibHac/{Fs => FsSystem}/FileTimeStamp.cs | 2 +- src/LibHac/{Fs => FsSystem}/FsEnums.cs | 2 +- src/LibHac/{Fs => FsSystem}/FsPath.cs | 2 +- .../HierarchicalIntegrityVerificationStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/IAttributeFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/IDirectory.cs | 2 +- src/LibHac/{Fs => FsSystem}/IFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/IFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/IStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/IndirectStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/IntegrityVerificationStorage.cs | 4 ++-- src/LibHac/{Fs => FsSystem}/LayeredFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/LayeredFileSystemDirectory.cs | 2 +- src/LibHac/{Fs => FsSystem}/LocalDirectory.cs | 2 +- src/LibHac/{Fs => FsSystem}/LocalFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/LocalFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/LocalStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/MemoryStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/Messages.cs | 2 +- src/LibHac/{Fs => FsSystem}/NcaUtils/Nca.cs | 4 ++-- src/LibHac/{Fs => FsSystem}/NcaUtils/NcaExtensions.cs | 2 +- src/LibHac/{Fs => FsSystem}/NcaUtils/NcaFsHeader.cs | 2 +- .../{Fs => FsSystem}/NcaUtils/NcaFsIntegrityInfoIvfc.cs | 2 +- .../{Fs => FsSystem}/NcaUtils/NcaFsIntegrityInfoSha256.cs | 2 +- src/LibHac/{Fs => FsSystem}/NcaUtils/NcaFsPatchInfo.cs | 2 +- src/LibHac/{Fs => FsSystem}/NcaUtils/NcaHeader.cs | 2 +- src/LibHac/{Fs => FsSystem}/NcaUtils/NcaKeyType.cs | 2 +- src/LibHac/{Fs => FsSystem}/NcaUtils/NcaStructs.cs | 2 +- src/LibHac/{Fs => FsSystem}/NullFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/NullStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/NxFileStream.cs | 2 +- src/LibHac/{Fs => FsSystem}/PartitionDirectory.cs | 2 +- src/LibHac/{Fs => FsSystem}/PartitionFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/PartitionFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/PartitionFileSystemBuilder.cs | 2 +- src/LibHac/{Fs => FsSystem}/PathParser.cs | 2 +- src/LibHac/{Fs => FsSystem}/PathTools.cs | 2 +- src/LibHac/{Fs => FsSystem}/ReadOnlyFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/ReadOnlyFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/ResultFs.cs | 2 +- src/LibHac/{Fs => FsSystem}/ResultRangeFs.cs | 2 +- src/LibHac/{Fs => FsSystem}/RightsId.cs | 2 +- .../{Fs => FsSystem}/RomFs/HierarchicalRomFileTable.cs | 2 +- src/LibHac/{Fs => FsSystem}/RomFs/RomFsBuilder.cs | 2 +- src/LibHac/{Fs => FsSystem}/RomFs/RomFsDictionary.cs | 2 +- src/LibHac/{Fs => FsSystem}/RomFs/RomFsDirectory.cs | 2 +- src/LibHac/{Fs => FsSystem}/RomFs/RomFsEntries.cs | 2 +- src/LibHac/{Fs => FsSystem}/RomFs/RomFsFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/RomFs/RomFsFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/AllocationTable.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/AllocationTableIterator.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/AllocationTableStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/DuplexBitmap.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/DuplexStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/Header.cs | 2 +- .../{Fs => FsSystem}/Save/HierarchicalDuplexStorage.cs | 2 +- .../{Fs => FsSystem}/Save/HierarchicalSaveFileTable.cs | 2 +- .../{Fs => FsSystem}/Save/ISaveDataExtraDataAccessor.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/JournalMap.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/JournalStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/RemapStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/SaveDataDirectory.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/SaveDataFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/SaveDataFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/SaveDataFileSystemCore.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/SaveExtensions.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/SaveFsEntry.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/SaveFsList.cs | 2 +- src/LibHac/{Fs => FsSystem}/Save/SaveResults.cs | 2 +- src/LibHac/{Fs => FsSystem}/SaveDataAttribute.cs | 4 ++-- src/LibHac/{Fs => FsSystem}/SaveDataCreateInfo.cs | 2 +- src/LibHac/{Fs => FsSystem}/SaveDataStructs.cs | 4 ++-- src/LibHac/{Fs => FsSystem}/SaveIndexerStruct.cs | 2 +- src/LibHac/{Fs => FsSystem}/SaveMetaCreateInfo.cs | 2 +- src/LibHac/{Fs => FsSystem}/SectorStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/StorageBase.cs | 2 +- src/LibHac/{Fs => FsSystem}/StorageExtensions.cs | 2 +- src/LibHac/{Fs => FsSystem}/StorageFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/StorageStream.cs | 2 +- src/LibHac/{Fs => FsSystem}/StreamFile.cs | 2 +- src/LibHac/{Fs => FsSystem}/StreamStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/SubStorage.cs | 2 +- src/LibHac/{Fs => FsSystem}/SubdirectoryFileSystem.cs | 2 +- src/LibHac/{Fs => FsSystem}/UserId.cs | 2 +- src/LibHac/{Fs => FsSystem}/ValueStringBuilder.cs | 2 +- src/LibHac/Horizon.cs | 2 +- src/LibHac/Keyset.cs | 2 +- src/LibHac/Kip.cs | 2 +- src/LibHac/Ncm/IContentStorage.cs | 2 +- src/LibHac/Nro.cs | 2 +- src/LibHac/Nso.cs | 2 +- src/LibHac/Package1.cs | 2 +- src/LibHac/Package2.cs | 2 +- src/LibHac/SwitchFs.cs | 6 +++--- src/LibHac/Xci.cs | 2 +- src/hactoolnet/AccessLog.cs | 2 +- src/hactoolnet/FsUtils.cs | 2 +- src/hactoolnet/Options.cs | 2 +- src/hactoolnet/Print.cs | 4 ++-- src/hactoolnet/ProcessBench.cs | 2 +- src/hactoolnet/ProcessDelta.cs | 4 ++-- src/hactoolnet/ProcessFsBuild.cs | 4 ++-- src/hactoolnet/ProcessKip.cs | 2 +- src/hactoolnet/ProcessNca.cs | 4 ++-- src/hactoolnet/ProcessPackage.cs | 2 +- src/hactoolnet/ProcessPfs.cs | 2 +- src/hactoolnet/ProcessRomfs.cs | 4 ++-- src/hactoolnet/ProcessSave.cs | 4 ++-- src/hactoolnet/ProcessSwitchFs.cs | 6 +++--- src/hactoolnet/ProcessXci.cs | 4 ++-- tests/LibHac.Tests/AesXts.cs | 2 +- tests/LibHac.Tests/PathToolsTests.cs | 2 +- tests/LibHac.Tests/RomFsTests.cs | 2 +- 186 files changed, 221 insertions(+), 221 deletions(-) rename src/LibHac/{FsClient => Fs}/Accessors/DirectoryAccessor.cs (96%) rename src/LibHac/{FsClient => Fs}/Accessors/FileAccessor.cs (98%) rename src/LibHac/{FsClient => Fs}/Accessors/FileSystemAccessor.cs (99%) rename src/LibHac/{FsClient => Fs}/Accessors/MountTable.cs (96%) rename src/LibHac/{FsClient => Fs}/ContentStorage.cs (98%) rename src/LibHac/{FsClient => Fs}/DirectoryHandle.cs (87%) rename src/LibHac/{FsClient => Fs}/FileHandle.cs (86%) rename src/LibHac/{FsClient => Fs}/FileSystemClient.Directory.cs (93%) rename src/LibHac/{FsClient => Fs}/FileSystemClient.File.cs (97%) rename src/LibHac/{FsClient => Fs}/FileSystemClient.FileSystem.cs (98%) rename src/LibHac/{FsClient => Fs}/FileSystemClient.Mount.cs (93%) rename src/LibHac/{FsClient => Fs}/FileSystemClient.cs (96%) rename src/LibHac/{FsClient => Fs}/FileSystemManager.cs (99%) rename src/LibHac/{FsClient => Fs}/FileSystemManagerUtils.cs (99%) rename src/LibHac/{FsClient => Fs}/IAccessLog.cs (90%) rename src/LibHac/{FsClient => Fs}/ICommonMountNameGenerator.cs (83%) rename src/LibHac/{FsClient => Fs}/MountHelpers.cs (95%) rename src/LibHac/{FsClient => Fs}/SdCardAccessLog.cs (94%) rename src/LibHac/{Fs => FsSystem}/Aes128CtrExStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/Aes128CtrStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/Aes128CtrTransform.cs (98%) rename src/LibHac/{Fs => FsSystem}/Aes128XtsStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/Aes128XtsTransform.cs (99%) rename src/LibHac/{Fs => FsSystem}/AesXtsDirectory.cs (99%) rename src/LibHac/{Fs => FsSystem}/AesXtsFile.cs (99%) rename src/LibHac/{Fs => FsSystem}/AesXtsFileHeader.cs (99%) rename src/LibHac/{Fs => FsSystem}/AesXtsFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/BucketTree.cs (99%) rename src/LibHac/{Fs => FsSystem}/CachedStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/ConcatenationDirectory.cs (99%) rename src/LibHac/{Fs => FsSystem}/ConcatenationFile.cs (99%) rename src/LibHac/{Fs => FsSystem}/ConcatenationFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/ConcatenationStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/ConcatenationStorageBuilder.cs (98%) rename src/LibHac/{Fs => FsSystem}/Delta.cs (99%) rename src/LibHac/{Fs => FsSystem}/DirectoryEntry.cs (97%) rename src/LibHac/{Fs => FsSystem}/DirectorySaveDataFile.cs (98%) rename src/LibHac/{Fs => FsSystem}/DirectorySaveDataFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/DirectoryUtils.cs (99%) rename src/LibHac/{Fs => FsSystem}/FileBase.cs (99%) rename src/LibHac/{Fs => FsSystem}/FileReader.cs (99%) rename src/LibHac/{Fs => FsSystem}/FileStorage.cs (97%) rename src/LibHac/{Fs => FsSystem}/FileSystemExtensions.cs (99%) rename src/LibHac/{Fs => FsSystem}/FileTimeStamp.cs (82%) rename src/LibHac/{Fs => FsSystem}/FsEnums.cs (98%) rename src/LibHac/{Fs => FsSystem}/FsPath.cs (95%) rename src/LibHac/{Fs => FsSystem}/HierarchicalIntegrityVerificationStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/IAttributeFileSystem.cs (89%) rename src/LibHac/{Fs => FsSystem}/IDirectory.cs (98%) rename src/LibHac/{Fs => FsSystem}/IFile.cs (99%) rename src/LibHac/{Fs => FsSystem}/IFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/IStorage.cs (98%) rename src/LibHac/{Fs => FsSystem}/IndirectStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/IntegrityVerificationStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/LayeredFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/LayeredFileSystemDirectory.cs (98%) rename src/LibHac/{Fs => FsSystem}/LocalDirectory.cs (99%) rename src/LibHac/{Fs => FsSystem}/LocalFile.cs (99%) rename src/LibHac/{Fs => FsSystem}/LocalFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/LocalStorage.cs (97%) rename src/LibHac/{Fs => FsSystem}/MemoryStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/Messages.cs (95%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/Nca.cs (99%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/NcaExtensions.cs (99%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/NcaFsHeader.cs (98%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/NcaFsIntegrityInfoIvfc.cs (98%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/NcaFsIntegrityInfoSha256.cs (98%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/NcaFsPatchInfo.cs (97%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/NcaHeader.cs (99%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/NcaKeyType.cs (76%) rename src/LibHac/{Fs => FsSystem}/NcaUtils/NcaStructs.cs (97%) rename src/LibHac/{Fs => FsSystem}/NullFile.cs (97%) rename src/LibHac/{Fs => FsSystem}/NullStorage.cs (97%) rename src/LibHac/{Fs => FsSystem}/NxFileStream.cs (98%) rename src/LibHac/{Fs => FsSystem}/PartitionDirectory.cs (98%) rename src/LibHac/{Fs => FsSystem}/PartitionFile.cs (98%) rename src/LibHac/{Fs => FsSystem}/PartitionFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/PartitionFileSystemBuilder.cs (99%) rename src/LibHac/{Fs => FsSystem}/PathParser.cs (99%) rename src/LibHac/{Fs => FsSystem}/PathTools.cs (99%) rename src/LibHac/{Fs => FsSystem}/ReadOnlyFile.cs (97%) rename src/LibHac/{Fs => FsSystem}/ReadOnlyFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/ResultFs.cs (99%) rename src/LibHac/{Fs => FsSystem}/ResultRangeFs.cs (97%) rename src/LibHac/{Fs => FsSystem}/RightsId.cs (98%) rename src/LibHac/{Fs => FsSystem}/RomFs/HierarchicalRomFileTable.cs (99%) rename src/LibHac/{Fs => FsSystem}/RomFs/RomFsBuilder.cs (99%) rename src/LibHac/{Fs => FsSystem}/RomFs/RomFsDictionary.cs (99%) rename src/LibHac/{Fs => FsSystem}/RomFs/RomFsDirectory.cs (98%) rename src/LibHac/{Fs => FsSystem}/RomFs/RomFsEntries.cs (97%) rename src/LibHac/{Fs => FsSystem}/RomFs/RomFsFile.cs (97%) rename src/LibHac/{Fs => FsSystem}/RomFs/RomFsFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/AllocationTable.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/AllocationTableIterator.cs (98%) rename src/LibHac/{Fs => FsSystem}/Save/AllocationTableStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/DuplexBitmap.cs (97%) rename src/LibHac/{Fs => FsSystem}/Save/DuplexStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/Header.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/HierarchicalDuplexStorage.cs (98%) rename src/LibHac/{Fs => FsSystem}/Save/HierarchicalSaveFileTable.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/ISaveDataExtraDataAccessor.cs (83%) rename src/LibHac/{Fs => FsSystem}/Save/JournalMap.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/JournalStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/RemapStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/SaveDataDirectory.cs (98%) rename src/LibHac/{Fs => FsSystem}/Save/SaveDataFile.cs (98%) rename src/LibHac/{Fs => FsSystem}/Save/SaveDataFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/SaveDataFileSystemCore.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/SaveExtensions.cs (93%) rename src/LibHac/{Fs => FsSystem}/Save/SaveFsEntry.cs (96%) rename src/LibHac/{Fs => FsSystem}/Save/SaveFsList.cs (99%) rename src/LibHac/{Fs => FsSystem}/Save/SaveResults.cs (99%) rename src/LibHac/{Fs => FsSystem}/SaveDataAttribute.cs (98%) rename src/LibHac/{Fs => FsSystem}/SaveDataCreateInfo.cs (86%) rename src/LibHac/{Fs => FsSystem}/SaveDataStructs.cs (97%) rename src/LibHac/{Fs => FsSystem}/SaveIndexerStruct.cs (98%) rename src/LibHac/{Fs => FsSystem}/SaveMetaCreateInfo.cs (90%) rename src/LibHac/{Fs => FsSystem}/SectorStorage.cs (98%) rename src/LibHac/{Fs => FsSystem}/StorageBase.cs (98%) rename src/LibHac/{Fs => FsSystem}/StorageExtensions.cs (99%) rename src/LibHac/{Fs => FsSystem}/StorageFile.cs (98%) rename src/LibHac/{Fs => FsSystem}/StorageStream.cs (98%) rename src/LibHac/{Fs => FsSystem}/StreamFile.cs (99%) rename src/LibHac/{Fs => FsSystem}/StreamStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/SubStorage.cs (99%) rename src/LibHac/{Fs => FsSystem}/SubdirectoryFileSystem.cs (99%) rename src/LibHac/{Fs => FsSystem}/UserId.cs (98%) rename src/LibHac/{Fs => FsSystem}/ValueStringBuilder.cs (99%) diff --git a/src/LibHac/Cnmt.cs b/src/LibHac/Cnmt.cs index e6869390..b5616af3 100644 --- a/src/LibHac/Cnmt.cs +++ b/src/LibHac/Cnmt.cs @@ -1,6 +1,6 @@ using System.IO; using System.Linq; -using LibHac.Fs.NcaUtils; +using LibHac.FsSystem.NcaUtils; using LibHac.Ncm; using ContentType = LibHac.Ncm.ContentType; diff --git a/src/LibHac/Common/Id128.cs b/src/LibHac/Common/Id128.cs index 68deec6c..8b7f8529 100644 --- a/src/LibHac/Common/Id128.cs +++ b/src/LibHac/Common/Id128.cs @@ -35,7 +35,7 @@ namespace LibHac.Common public override bool Equals(object obj) { - return obj is Fs.UserId other && Equals(other); + return obj is FsSystem.UserId other && Equals(other); } public override int GetHashCode() diff --git a/src/LibHac/Crypto.cs b/src/LibHac/Crypto.cs index 3ae39d49..62c859ba 100644 --- a/src/LibHac/Crypto.cs +++ b/src/LibHac/Crypto.cs @@ -2,7 +2,7 @@ using System.IO; using System.Numerics; using System.Security.Cryptography; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/LibHac/FsClient/Accessors/DirectoryAccessor.cs b/src/LibHac/Fs/Accessors/DirectoryAccessor.cs similarity index 96% rename from src/LibHac/FsClient/Accessors/DirectoryAccessor.cs rename to src/LibHac/Fs/Accessors/DirectoryAccessor.cs index 86eed8ed..75cf7b25 100644 --- a/src/LibHac/FsClient/Accessors/DirectoryAccessor.cs +++ b/src/LibHac/Fs/Accessors/DirectoryAccessor.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsClient.Accessors +namespace LibHac.Fs.Accessors { public class DirectoryAccessor : IDisposable { diff --git a/src/LibHac/FsClient/Accessors/FileAccessor.cs b/src/LibHac/Fs/Accessors/FileAccessor.cs similarity index 98% rename from src/LibHac/FsClient/Accessors/FileAccessor.cs rename to src/LibHac/Fs/Accessors/FileAccessor.cs index 9624c6ec..d6ef410f 100644 --- a/src/LibHac/FsClient/Accessors/FileAccessor.cs +++ b/src/LibHac/Fs/Accessors/FileAccessor.cs @@ -1,7 +1,7 @@ using System; -using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsClient.Accessors +namespace LibHac.Fs.Accessors { public class FileAccessor : IFile { diff --git a/src/LibHac/FsClient/Accessors/FileSystemAccessor.cs b/src/LibHac/Fs/Accessors/FileSystemAccessor.cs similarity index 99% rename from src/LibHac/FsClient/Accessors/FileSystemAccessor.cs rename to src/LibHac/Fs/Accessors/FileSystemAccessor.cs index a52fe3c2..f89b4d61 100644 --- a/src/LibHac/FsClient/Accessors/FileSystemAccessor.cs +++ b/src/LibHac/Fs/Accessors/FileSystemAccessor.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsClient.Accessors +namespace LibHac.Fs.Accessors { public class FileSystemAccessor { diff --git a/src/LibHac/FsClient/Accessors/MountTable.cs b/src/LibHac/Fs/Accessors/MountTable.cs similarity index 96% rename from src/LibHac/FsClient/Accessors/MountTable.cs rename to src/LibHac/Fs/Accessors/MountTable.cs index de87b56e..06469eab 100644 --- a/src/LibHac/FsClient/Accessors/MountTable.cs +++ b/src/LibHac/Fs/Accessors/MountTable.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsClient.Accessors +namespace LibHac.Fs.Accessors { public class MountTable { diff --git a/src/LibHac/FsClient/ContentStorage.cs b/src/LibHac/Fs/ContentStorage.cs similarity index 98% rename from src/LibHac/FsClient/ContentStorage.cs rename to src/LibHac/Fs/ContentStorage.cs index a84137aa..25a8da2a 100644 --- a/src/LibHac/FsClient/ContentStorage.cs +++ b/src/LibHac/Fs/ContentStorage.cs @@ -1,9 +1,9 @@ using System; using LibHac.Common; -using LibHac.Fs; +using LibHac.FsSystem; using LibHac.FsService; -namespace LibHac.FsClient +namespace LibHac.Fs { public static class ContentStorage { diff --git a/src/LibHac/FsClient/DirectoryHandle.cs b/src/LibHac/Fs/DirectoryHandle.cs similarity index 87% rename from src/LibHac/FsClient/DirectoryHandle.cs rename to src/LibHac/Fs/DirectoryHandle.cs index cab42040..e76ac017 100644 --- a/src/LibHac/FsClient/DirectoryHandle.cs +++ b/src/LibHac/Fs/DirectoryHandle.cs @@ -1,7 +1,7 @@ using System; -using LibHac.FsClient.Accessors; +using LibHac.Fs.Accessors; -namespace LibHac.FsClient +namespace LibHac.Fs { public struct DirectoryHandle : IDisposable { diff --git a/src/LibHac/FsClient/FileHandle.cs b/src/LibHac/Fs/FileHandle.cs similarity index 86% rename from src/LibHac/FsClient/FileHandle.cs rename to src/LibHac/Fs/FileHandle.cs index 0c728291..acb4e211 100644 --- a/src/LibHac/FsClient/FileHandle.cs +++ b/src/LibHac/Fs/FileHandle.cs @@ -1,7 +1,7 @@ using System; -using LibHac.FsClient.Accessors; +using LibHac.Fs.Accessors; -namespace LibHac.FsClient +namespace LibHac.Fs { public struct FileHandle : IDisposable { diff --git a/src/LibHac/FsClient/FileSystemClient.Directory.cs b/src/LibHac/Fs/FileSystemClient.Directory.cs similarity index 93% rename from src/LibHac/FsClient/FileSystemClient.Directory.cs rename to src/LibHac/Fs/FileSystemClient.Directory.cs index 61b9151d..6d29c054 100644 --- a/src/LibHac/FsClient/FileSystemClient.Directory.cs +++ b/src/LibHac/Fs/FileSystemClient.Directory.cs @@ -1,7 +1,7 @@ using System; -using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsClient +namespace LibHac.Fs { public partial class FileSystemClient { diff --git a/src/LibHac/FsClient/FileSystemClient.File.cs b/src/LibHac/Fs/FileSystemClient.File.cs similarity index 97% rename from src/LibHac/FsClient/FileSystemClient.File.cs rename to src/LibHac/Fs/FileSystemClient.File.cs index 51a6b4dd..82ae189b 100644 --- a/src/LibHac/FsClient/FileSystemClient.File.cs +++ b/src/LibHac/Fs/FileSystemClient.File.cs @@ -1,7 +1,7 @@ using System; -using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsClient +namespace LibHac.Fs { public partial class FileSystemClient { diff --git a/src/LibHac/FsClient/FileSystemClient.FileSystem.cs b/src/LibHac/Fs/FileSystemClient.FileSystem.cs similarity index 98% rename from src/LibHac/FsClient/FileSystemClient.FileSystem.cs rename to src/LibHac/Fs/FileSystemClient.FileSystem.cs index a0f6bd2e..e701a656 100644 --- a/src/LibHac/FsClient/FileSystemClient.FileSystem.cs +++ b/src/LibHac/Fs/FileSystemClient.FileSystem.cs @@ -1,6 +1,6 @@ -using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsClient +namespace LibHac.Fs { public partial class FileSystemClient { diff --git a/src/LibHac/FsClient/FileSystemClient.Mount.cs b/src/LibHac/Fs/FileSystemClient.Mount.cs similarity index 93% rename from src/LibHac/FsClient/FileSystemClient.Mount.cs rename to src/LibHac/Fs/FileSystemClient.Mount.cs index e98044d6..0ccb6440 100644 --- a/src/LibHac/FsClient/FileSystemClient.Mount.cs +++ b/src/LibHac/Fs/FileSystemClient.Mount.cs @@ -1,8 +1,8 @@ using LibHac.Common; -using LibHac.Fs; +using LibHac.FsSystem; using LibHac.FsService; -namespace LibHac.FsClient +namespace LibHac.Fs { public partial class FileSystemClient { diff --git a/src/LibHac/FsClient/FileSystemClient.cs b/src/LibHac/Fs/FileSystemClient.cs similarity index 96% rename from src/LibHac/FsClient/FileSystemClient.cs rename to src/LibHac/Fs/FileSystemClient.cs index 8bc0a42a..3c4f5ff9 100644 --- a/src/LibHac/FsClient/FileSystemClient.cs +++ b/src/LibHac/Fs/FileSystemClient.cs @@ -1,8 +1,8 @@ using LibHac.Common; -using LibHac.Fs; +using LibHac.FsSystem; using LibHac.FsService; -namespace LibHac.FsClient +namespace LibHac.Fs { public partial class FileSystemClient { diff --git a/src/LibHac/FsClient/FileSystemManager.cs b/src/LibHac/Fs/FileSystemManager.cs similarity index 99% rename from src/LibHac/FsClient/FileSystemManager.cs rename to src/LibHac/Fs/FileSystemManager.cs index 45e2c4fc..29e33b55 100644 --- a/src/LibHac/FsClient/FileSystemManager.cs +++ b/src/LibHac/Fs/FileSystemManager.cs @@ -1,10 +1,10 @@ using System; using System.Runtime.CompilerServices; using LibHac.Common; -using LibHac.Fs; -using LibHac.FsClient.Accessors; +using LibHac.Fs.Accessors; +using LibHac.FsSystem; -namespace LibHac.FsClient +namespace LibHac.Fs { // Todo: Access log for FindFileSystem public class FileSystemManager diff --git a/src/LibHac/FsClient/FileSystemManagerUtils.cs b/src/LibHac/Fs/FileSystemManagerUtils.cs similarity index 99% rename from src/LibHac/FsClient/FileSystemManagerUtils.cs rename to src/LibHac/Fs/FileSystemManagerUtils.cs index eb2add2c..4aa01e30 100644 --- a/src/LibHac/FsClient/FileSystemManagerUtils.cs +++ b/src/LibHac/Fs/FileSystemManagerUtils.cs @@ -2,10 +2,10 @@ using System.Buffers; using System.Collections.Generic; using LibHac.Common; -using LibHac.Fs; -using LibHac.FsClient.Accessors; +using LibHac.Fs.Accessors; +using LibHac.FsSystem; -namespace LibHac.FsClient +namespace LibHac.Fs { public static class FileSystemManagerUtils { diff --git a/src/LibHac/FsClient/IAccessLog.cs b/src/LibHac/Fs/IAccessLog.cs similarity index 90% rename from src/LibHac/FsClient/IAccessLog.cs rename to src/LibHac/Fs/IAccessLog.cs index fbf83d5a..6ad9f3ca 100644 --- a/src/LibHac/FsClient/IAccessLog.cs +++ b/src/LibHac/Fs/IAccessLog.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.CompilerServices; -namespace LibHac.FsClient +namespace LibHac.Fs { public interface IAccessLog { diff --git a/src/LibHac/FsClient/ICommonMountNameGenerator.cs b/src/LibHac/Fs/ICommonMountNameGenerator.cs similarity index 83% rename from src/LibHac/FsClient/ICommonMountNameGenerator.cs rename to src/LibHac/Fs/ICommonMountNameGenerator.cs index 937c58d2..53838931 100644 --- a/src/LibHac/FsClient/ICommonMountNameGenerator.cs +++ b/src/LibHac/Fs/ICommonMountNameGenerator.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.FsClient +namespace LibHac.Fs { public interface ICommonMountNameGenerator { diff --git a/src/LibHac/FsClient/MountHelpers.cs b/src/LibHac/Fs/MountHelpers.cs similarity index 95% rename from src/LibHac/FsClient/MountHelpers.cs rename to src/LibHac/Fs/MountHelpers.cs index 18799d41..5d46e223 100644 --- a/src/LibHac/FsClient/MountHelpers.cs +++ b/src/LibHac/Fs/MountHelpers.cs @@ -1,7 +1,7 @@ using LibHac.Common; -using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsClient +namespace LibHac.Fs { internal static class MountHelpers { diff --git a/src/LibHac/FsClient/SdCardAccessLog.cs b/src/LibHac/Fs/SdCardAccessLog.cs similarity index 94% rename from src/LibHac/FsClient/SdCardAccessLog.cs rename to src/LibHac/Fs/SdCardAccessLog.cs index a69dc12a..345e64c2 100644 --- a/src/LibHac/FsClient/SdCardAccessLog.cs +++ b/src/LibHac/Fs/SdCardAccessLog.cs @@ -1,7 +1,7 @@ using System; using LibHac.FsService; -namespace LibHac.FsClient +namespace LibHac.Fs { /// /// The default access logger that will output to the SD card via . diff --git a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs index edba44ca..9ba8578a 100644 --- a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs index 1e6ebe98..0fd195ab 100644 --- a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs +++ b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs b/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs index b27c6aff..b5392d4f 100644 --- a/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs b/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs index 81d5dc4b..b1798719 100644 --- a/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/FileSystemCreators.cs b/src/LibHac/FsService/Creators/FileSystemCreators.cs index 2afa63df..0539a95c 100644 --- a/src/LibHac/FsService/Creators/FileSystemCreators.cs +++ b/src/LibHac/FsService/Creators/FileSystemCreators.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs b/src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs index e7e6df62..397da7ef 100644 --- a/src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs +++ b/src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +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..07c4b68d 100644 --- a/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs b/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs index f6cfde96..36f73579 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.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs b/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs index b86fac56..8b139d5c 100644 --- a/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs b/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs index 550ce9c6..c57357dd 100644 --- a/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IGameCardStorageCreator.cs b/src/LibHac/FsService/Creators/IGameCardStorageCreator.cs index e5fdfc19..b6afd9e5 100644 --- a/src/LibHac/FsService/Creators/IGameCardStorageCreator.cs +++ b/src/LibHac/FsService/Creators/IGameCardStorageCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs b/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs index d7c50ff5..809fbef0 100644 --- a/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IMemoryStorageCreator.cs b/src/LibHac/FsService/Creators/IMemoryStorageCreator.cs index 403dbe01..14b0e961 100644 --- a/src/LibHac/FsService/Creators/IMemoryStorageCreator.cs +++ b/src/LibHac/FsService/Creators/IMemoryStorageCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs b/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs index af99e8cd..d6b43d6b 100644 --- a/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs b/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs index b2ea3957..3429397f 100644 --- a/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs b/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs index 335d65e2..854fb051 100644 --- a/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs @@ -1,7 +1,7 @@ using System; using LibHac.Common; -using LibHac.Fs; -using LibHac.Fs.Save; +using LibHac.FsSystem; +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..0a0765dc 100644 --- a/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/ISdStorageCreator.cs b/src/LibHac/FsService/Creators/ISdStorageCreator.cs index 691359bb..bb2c2dac 100644 --- a/src/LibHac/FsService/Creators/ISdStorageCreator.cs +++ b/src/LibHac/FsService/Creators/ISdStorageCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs b/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs index 4c76e12a..92378a75 100644 --- a/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs +++ b/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs @@ -1,5 +1,5 @@ -using LibHac.Fs; -using LibHac.Fs.NcaUtils; +using LibHac.FsSystem; +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 3bae3cb7..1ac8a48a 100644 --- a/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs b/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs index e0858de4..59eed39a 100644 --- a/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs b/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs index ad2ecf8b..fed3898c 100644 --- a/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/FileSystemProxy.cs b/src/LibHac/FsService/FileSystemProxy.cs index 4449c91a..a015e579 100644 --- a/src/LibHac/FsService/FileSystemProxy.cs +++ b/src/LibHac/FsService/FileSystemProxy.cs @@ -1,7 +1,7 @@ using System; using LibHac.Common; using LibHac.Fs; -using LibHac.FsClient; +using LibHac.FsSystem; namespace LibHac.FsService { diff --git a/src/LibHac/FsService/FileSystemProxyCore.cs b/src/LibHac/FsService/FileSystemProxyCore.cs index 58250891..8463c2a3 100644 --- a/src/LibHac/FsService/FileSystemProxyCore.cs +++ b/src/LibHac/FsService/FileSystemProxyCore.cs @@ -1,6 +1,6 @@ using System; -using LibHac.Fs; -using LibHac.Fs.Save; +using LibHac.FsSystem; +using LibHac.FsSystem.Save; using LibHac.FsService.Creators; namespace LibHac.FsService diff --git a/src/LibHac/FsService/FileSystemServer.cs b/src/LibHac/FsService/FileSystemServer.cs index 974a8f34..849ba674 100644 --- a/src/LibHac/FsService/FileSystemServer.cs +++ b/src/LibHac/FsService/FileSystemServer.cs @@ -1,4 +1,4 @@ -using LibHac.FsClient; +using LibHac.Fs; using LibHac.FsService.Creators; namespace LibHac.FsService diff --git a/src/LibHac/FsService/IFileSystemProxy.cs b/src/LibHac/FsService/IFileSystemProxy.cs index ffc4d3fb..708d3155 100644 --- a/src/LibHac/FsService/IFileSystemProxy.cs +++ b/src/LibHac/FsService/IFileSystemProxy.cs @@ -1,6 +1,6 @@ using System; using LibHac.Common; -using LibHac.Fs; +using LibHac.FsSystem; using LibHac.Ncm; using LibHac.Spl; diff --git a/src/LibHac/FsService/Util.cs b/src/LibHac/FsService/Util.cs index b6ed2b2a..6519cf26 100644 --- a/src/LibHac/FsService/Util.cs +++ b/src/LibHac/FsService/Util.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService { diff --git a/src/LibHac/Fs/Aes128CtrExStorage.cs b/src/LibHac/FsSystem/Aes128CtrExStorage.cs similarity index 99% rename from src/LibHac/Fs/Aes128CtrExStorage.cs rename to src/LibHac/FsSystem/Aes128CtrExStorage.cs index de3c327e..eebe24ff 100644 --- a/src/LibHac/Fs/Aes128CtrExStorage.cs +++ b/src/LibHac/FsSystem/Aes128CtrExStorage.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class Aes128CtrExStorage : Aes128CtrStorage { diff --git a/src/LibHac/Fs/Aes128CtrStorage.cs b/src/LibHac/FsSystem/Aes128CtrStorage.cs similarity index 99% rename from src/LibHac/Fs/Aes128CtrStorage.cs rename to src/LibHac/FsSystem/Aes128CtrStorage.cs index 99bb5a40..0437c092 100644 --- a/src/LibHac/Fs/Aes128CtrStorage.cs +++ b/src/LibHac/FsSystem/Aes128CtrStorage.cs @@ -2,7 +2,7 @@ using System.Buffers; using System.Buffers.Binary; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class Aes128CtrStorage : SectorStorage { diff --git a/src/LibHac/Fs/Aes128CtrTransform.cs b/src/LibHac/FsSystem/Aes128CtrTransform.cs similarity index 98% rename from src/LibHac/Fs/Aes128CtrTransform.cs rename to src/LibHac/FsSystem/Aes128CtrTransform.cs index 1a430e82..beaf2d7b 100644 --- a/src/LibHac/Fs/Aes128CtrTransform.cs +++ b/src/LibHac/FsSystem/Aes128CtrTransform.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; using System.Runtime.InteropServices; using System.Security.Cryptography; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class Aes128CtrTransform { diff --git a/src/LibHac/Fs/Aes128XtsStorage.cs b/src/LibHac/FsSystem/Aes128XtsStorage.cs similarity index 99% rename from src/LibHac/Fs/Aes128XtsStorage.cs rename to src/LibHac/FsSystem/Aes128XtsStorage.cs index 3187a8ce..a0844d61 100644 --- a/src/LibHac/Fs/Aes128XtsStorage.cs +++ b/src/LibHac/FsSystem/Aes128XtsStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class Aes128XtsStorage : SectorStorage { diff --git a/src/LibHac/Fs/Aes128XtsTransform.cs b/src/LibHac/FsSystem/Aes128XtsTransform.cs similarity index 99% rename from src/LibHac/Fs/Aes128XtsTransform.cs rename to src/LibHac/FsSystem/Aes128XtsTransform.cs index 53aac4c6..9fc2eb55 100644 --- a/src/LibHac/Fs/Aes128XtsTransform.cs +++ b/src/LibHac/FsSystem/Aes128XtsTransform.cs @@ -29,7 +29,7 @@ using System.Buffers; using System.Runtime.InteropServices; using System.Security.Cryptography; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class Aes128XtsTransform { diff --git a/src/LibHac/Fs/AesXtsDirectory.cs b/src/LibHac/FsSystem/AesXtsDirectory.cs similarity index 99% rename from src/LibHac/Fs/AesXtsDirectory.cs rename to src/LibHac/FsSystem/AesXtsDirectory.cs index a8bd71cc..bb7d4415 100644 --- a/src/LibHac/Fs/AesXtsDirectory.cs +++ b/src/LibHac/FsSystem/AesXtsDirectory.cs @@ -1,7 +1,7 @@ using System; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class AesXtsDirectory : IDirectory { diff --git a/src/LibHac/Fs/AesXtsFile.cs b/src/LibHac/FsSystem/AesXtsFile.cs similarity index 99% rename from src/LibHac/Fs/AesXtsFile.cs rename to src/LibHac/FsSystem/AesXtsFile.cs index fcaa6335..683c2341 100644 --- a/src/LibHac/Fs/AesXtsFile.cs +++ b/src/LibHac/FsSystem/AesXtsFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class AesXtsFile : FileBase { diff --git a/src/LibHac/Fs/AesXtsFileHeader.cs b/src/LibHac/FsSystem/AesXtsFileHeader.cs similarity index 99% rename from src/LibHac/Fs/AesXtsFileHeader.cs rename to src/LibHac/FsSystem/AesXtsFileHeader.cs index 292b39e0..da830f82 100644 --- a/src/LibHac/Fs/AesXtsFileHeader.cs +++ b/src/LibHac/FsSystem/AesXtsFileHeader.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class AesXtsFileHeader { diff --git a/src/LibHac/Fs/AesXtsFileSystem.cs b/src/LibHac/FsSystem/AesXtsFileSystem.cs similarity index 99% rename from src/LibHac/Fs/AesXtsFileSystem.cs rename to src/LibHac/FsSystem/AesXtsFileSystem.cs index 529e4c5b..fa33b06a 100644 --- a/src/LibHac/Fs/AesXtsFileSystem.cs +++ b/src/LibHac/FsSystem/AesXtsFileSystem.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class AesXtsFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/BucketTree.cs b/src/LibHac/FsSystem/BucketTree.cs similarity index 99% rename from src/LibHac/Fs/BucketTree.cs rename to src/LibHac/FsSystem/BucketTree.cs index 0c7cdb42..a9095a77 100644 --- a/src/LibHac/Fs/BucketTree.cs +++ b/src/LibHac/FsSystem/BucketTree.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class BucketTree where T : BucketTreeEntry, new() { diff --git a/src/LibHac/Fs/CachedStorage.cs b/src/LibHac/FsSystem/CachedStorage.cs similarity index 99% rename from src/LibHac/Fs/CachedStorage.cs rename to src/LibHac/FsSystem/CachedStorage.cs index 964a4989..f73fffb2 100644 --- a/src/LibHac/Fs/CachedStorage.cs +++ b/src/LibHac/FsSystem/CachedStorage.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class CachedStorage : StorageBase { diff --git a/src/LibHac/Fs/ConcatenationDirectory.cs b/src/LibHac/FsSystem/ConcatenationDirectory.cs similarity index 99% rename from src/LibHac/Fs/ConcatenationDirectory.cs rename to src/LibHac/FsSystem/ConcatenationDirectory.cs index 88972e75..76587582 100644 --- a/src/LibHac/Fs/ConcatenationDirectory.cs +++ b/src/LibHac/FsSystem/ConcatenationDirectory.cs @@ -5,7 +5,7 @@ using LibHac.Common; using System.Runtime.InteropServices; #endif -namespace LibHac.Fs +namespace LibHac.FsSystem { public class ConcatenationDirectory : IDirectory { diff --git a/src/LibHac/Fs/ConcatenationFile.cs b/src/LibHac/FsSystem/ConcatenationFile.cs similarity index 99% rename from src/LibHac/Fs/ConcatenationFile.cs rename to src/LibHac/FsSystem/ConcatenationFile.cs index ad6842a8..887ac26a 100644 --- a/src/LibHac/Fs/ConcatenationFile.cs +++ b/src/LibHac/FsSystem/ConcatenationFile.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class ConcatenationFile : FileBase { diff --git a/src/LibHac/Fs/ConcatenationFileSystem.cs b/src/LibHac/FsSystem/ConcatenationFileSystem.cs similarity index 99% rename from src/LibHac/Fs/ConcatenationFileSystem.cs rename to src/LibHac/FsSystem/ConcatenationFileSystem.cs index b25f0f3e..c7c18686 100644 --- a/src/LibHac/Fs/ConcatenationFileSystem.cs +++ b/src/LibHac/FsSystem/ConcatenationFileSystem.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Runtime.InteropServices; #endif -namespace LibHac.Fs +namespace LibHac.FsSystem { /// /// An that stores large files as smaller, separate sub-files. diff --git a/src/LibHac/Fs/ConcatenationStorage.cs b/src/LibHac/FsSystem/ConcatenationStorage.cs similarity index 99% rename from src/LibHac/Fs/ConcatenationStorage.cs rename to src/LibHac/FsSystem/ConcatenationStorage.cs index af907d2f..7d695dc5 100644 --- a/src/LibHac/Fs/ConcatenationStorage.cs +++ b/src/LibHac/FsSystem/ConcatenationStorage.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class ConcatenationStorage : StorageBase { diff --git a/src/LibHac/Fs/ConcatenationStorageBuilder.cs b/src/LibHac/FsSystem/ConcatenationStorageBuilder.cs similarity index 98% rename from src/LibHac/Fs/ConcatenationStorageBuilder.cs rename to src/LibHac/FsSystem/ConcatenationStorageBuilder.cs index 86749565..ff2da7b8 100644 --- a/src/LibHac/Fs/ConcatenationStorageBuilder.cs +++ b/src/LibHac/FsSystem/ConcatenationStorageBuilder.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class ConcatenationStorageBuilder { diff --git a/src/LibHac/Fs/Delta.cs b/src/LibHac/FsSystem/Delta.cs similarity index 99% rename from src/LibHac/Fs/Delta.cs rename to src/LibHac/FsSystem/Delta.cs index 3a70cdd7..9ca03cef 100644 --- a/src/LibHac/Fs/Delta.cs +++ b/src/LibHac/FsSystem/Delta.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class Delta { diff --git a/src/LibHac/Fs/DirectoryEntry.cs b/src/LibHac/FsSystem/DirectoryEntry.cs similarity index 97% rename from src/LibHac/Fs/DirectoryEntry.cs rename to src/LibHac/FsSystem/DirectoryEntry.cs index 62293fa7..332e4f6d 100644 --- a/src/LibHac/Fs/DirectoryEntry.cs +++ b/src/LibHac/FsSystem/DirectoryEntry.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class DirectoryEntryEx { diff --git a/src/LibHac/Fs/DirectorySaveDataFile.cs b/src/LibHac/FsSystem/DirectorySaveDataFile.cs similarity index 98% rename from src/LibHac/Fs/DirectorySaveDataFile.cs rename to src/LibHac/FsSystem/DirectorySaveDataFile.cs index 2c68ad92..62e384ce 100644 --- a/src/LibHac/Fs/DirectorySaveDataFile.cs +++ b/src/LibHac/FsSystem/DirectorySaveDataFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class DirectorySaveDataFile : FileBase { diff --git a/src/LibHac/Fs/DirectorySaveDataFileSystem.cs b/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs similarity index 99% rename from src/LibHac/Fs/DirectorySaveDataFileSystem.cs rename to src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs index 70d74b54..a782dc2e 100644 --- a/src/LibHac/Fs/DirectorySaveDataFileSystem.cs +++ b/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class DirectorySaveDataFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/DirectoryUtils.cs b/src/LibHac/FsSystem/DirectoryUtils.cs similarity index 99% rename from src/LibHac/Fs/DirectoryUtils.cs rename to src/LibHac/FsSystem/DirectoryUtils.cs index 1ea54ecc..b5bba902 100644 --- a/src/LibHac/Fs/DirectoryUtils.cs +++ b/src/LibHac/FsSystem/DirectoryUtils.cs @@ -1,7 +1,7 @@ using System; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { public static class DirectoryUtils { diff --git a/src/LibHac/Fs/FileBase.cs b/src/LibHac/FsSystem/FileBase.cs similarity index 99% rename from src/LibHac/Fs/FileBase.cs rename to src/LibHac/FsSystem/FileBase.cs index 1beff741..742853c2 100644 --- a/src/LibHac/Fs/FileBase.cs +++ b/src/LibHac/FsSystem/FileBase.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.Fs +namespace LibHac.FsSystem { public abstract class FileBase : IFile { diff --git a/src/LibHac/Fs/FileReader.cs b/src/LibHac/FsSystem/FileReader.cs similarity index 99% rename from src/LibHac/Fs/FileReader.cs rename to src/LibHac/FsSystem/FileReader.cs index 25f54ea9..cf4607b4 100644 --- a/src/LibHac/Fs/FileReader.cs +++ b/src/LibHac/FsSystem/FileReader.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class FileReader { diff --git a/src/LibHac/Fs/FileStorage.cs b/src/LibHac/FsSystem/FileStorage.cs similarity index 97% rename from src/LibHac/Fs/FileStorage.cs rename to src/LibHac/FsSystem/FileStorage.cs index 1b0ae864..21bf43c9 100644 --- a/src/LibHac/Fs/FileStorage.cs +++ b/src/LibHac/FsSystem/FileStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class FileStorage : StorageBase { diff --git a/src/LibHac/Fs/FileSystemExtensions.cs b/src/LibHac/FsSystem/FileSystemExtensions.cs similarity index 99% rename from src/LibHac/Fs/FileSystemExtensions.cs rename to src/LibHac/FsSystem/FileSystemExtensions.cs index 35495263..9ed1571a 100644 --- a/src/LibHac/Fs/FileSystemExtensions.cs +++ b/src/LibHac/FsSystem/FileSystemExtensions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { public static class FileSystemExtensions { diff --git a/src/LibHac/Fs/FileTimeStamp.cs b/src/LibHac/FsSystem/FileTimeStamp.cs similarity index 82% rename from src/LibHac/Fs/FileTimeStamp.cs rename to src/LibHac/FsSystem/FileTimeStamp.cs index 74aff00a..0dbe64eb 100644 --- a/src/LibHac/Fs/FileTimeStamp.cs +++ b/src/LibHac/FsSystem/FileTimeStamp.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs +namespace LibHac.FsSystem { public struct FileTimeStampRaw { diff --git a/src/LibHac/Fs/FsEnums.cs b/src/LibHac/FsSystem/FsEnums.cs similarity index 98% rename from src/LibHac/Fs/FsEnums.cs rename to src/LibHac/FsSystem/FsEnums.cs index 223f36fb..b00cf136 100644 --- a/src/LibHac/Fs/FsEnums.cs +++ b/src/LibHac/FsSystem/FsEnums.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs +namespace LibHac.FsSystem { public enum BisPartitionId { diff --git a/src/LibHac/Fs/FsPath.cs b/src/LibHac/FsSystem/FsPath.cs similarity index 95% rename from src/LibHac/Fs/FsPath.cs rename to src/LibHac/FsSystem/FsPath.cs index 4f10eb67..b40e5b60 100644 --- a/src/LibHac/Fs/FsPath.cs +++ b/src/LibHac/FsSystem/FsPath.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { [DebuggerDisplay("{ToString()}")] [StructLayout(LayoutKind.Explicit, Size = MaxLength + 1)] diff --git a/src/LibHac/Fs/HierarchicalIntegrityVerificationStorage.cs b/src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs similarity index 99% rename from src/LibHac/Fs/HierarchicalIntegrityVerificationStorage.cs rename to src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs index 92001edf..709eca51 100644 --- a/src/LibHac/Fs/HierarchicalIntegrityVerificationStorage.cs +++ b/src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs @@ -4,7 +4,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class HierarchicalIntegrityVerificationStorage : StorageBase { diff --git a/src/LibHac/Fs/IAttributeFileSystem.cs b/src/LibHac/FsSystem/IAttributeFileSystem.cs similarity index 89% rename from src/LibHac/Fs/IAttributeFileSystem.cs rename to src/LibHac/FsSystem/IAttributeFileSystem.cs index e5a4858d..e7688a1b 100644 --- a/src/LibHac/Fs/IAttributeFileSystem.cs +++ b/src/LibHac/FsSystem/IAttributeFileSystem.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs +namespace LibHac.FsSystem { public interface IAttributeFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/IDirectory.cs b/src/LibHac/FsSystem/IDirectory.cs similarity index 98% rename from src/LibHac/Fs/IDirectory.cs rename to src/LibHac/FsSystem/IDirectory.cs index 401d26d7..d9355ec4 100644 --- a/src/LibHac/Fs/IDirectory.cs +++ b/src/LibHac/FsSystem/IDirectory.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { /// /// Provides an interface for enumerating the child entries of a directory. diff --git a/src/LibHac/Fs/IFile.cs b/src/LibHac/FsSystem/IFile.cs similarity index 99% rename from src/LibHac/Fs/IFile.cs rename to src/LibHac/FsSystem/IFile.cs index da2a5644..6e81af02 100644 --- a/src/LibHac/Fs/IFile.cs +++ b/src/LibHac/FsSystem/IFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { /// /// Provides an interface for reading and writing a sequence of bytes. diff --git a/src/LibHac/Fs/IFileSystem.cs b/src/LibHac/FsSystem/IFileSystem.cs similarity index 99% rename from src/LibHac/Fs/IFileSystem.cs rename to src/LibHac/FsSystem/IFileSystem.cs index 3d99bf3c..9ff76341 100644 --- a/src/LibHac/Fs/IFileSystem.cs +++ b/src/LibHac/FsSystem/IFileSystem.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { /// /// Provides an interface for accessing a file system. / is used as the path delimiter. diff --git a/src/LibHac/Fs/IStorage.cs b/src/LibHac/FsSystem/IStorage.cs similarity index 98% rename from src/LibHac/Fs/IStorage.cs rename to src/LibHac/FsSystem/IStorage.cs index 8f0a1b47..6f38528b 100644 --- a/src/LibHac/Fs/IStorage.cs +++ b/src/LibHac/FsSystem/IStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { /// /// Provides an interface for reading and writing a sequence of bytes. diff --git a/src/LibHac/Fs/IndirectStorage.cs b/src/LibHac/FsSystem/IndirectStorage.cs similarity index 99% rename from src/LibHac/Fs/IndirectStorage.cs rename to src/LibHac/FsSystem/IndirectStorage.cs index f49336b0..850b401f 100644 --- a/src/LibHac/Fs/IndirectStorage.cs +++ b/src/LibHac/FsSystem/IndirectStorage.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class IndirectStorage : StorageBase { diff --git a/src/LibHac/Fs/IntegrityVerificationStorage.cs b/src/LibHac/FsSystem/IntegrityVerificationStorage.cs similarity index 99% rename from src/LibHac/Fs/IntegrityVerificationStorage.cs rename to src/LibHac/FsSystem/IntegrityVerificationStorage.cs index 4adbab58..5e7bd8ce 100644 --- a/src/LibHac/Fs/IntegrityVerificationStorage.cs +++ b/src/LibHac/FsSystem/IntegrityVerificationStorage.cs @@ -2,9 +2,9 @@ using System.Buffers; using System.IO; using System.Security.Cryptography; -using LibHac.Fs.Save; +using LibHac.FsSystem.Save; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class IntegrityVerificationStorage : SectorStorage { diff --git a/src/LibHac/Fs/LayeredFileSystem.cs b/src/LibHac/FsSystem/LayeredFileSystem.cs similarity index 99% rename from src/LibHac/Fs/LayeredFileSystem.cs rename to src/LibHac/FsSystem/LayeredFileSystem.cs index 329f7094..47e88d4a 100644 --- a/src/LibHac/Fs/LayeredFileSystem.cs +++ b/src/LibHac/FsSystem/LayeredFileSystem.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class LayeredFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/LayeredFileSystemDirectory.cs b/src/LibHac/FsSystem/LayeredFileSystemDirectory.cs similarity index 98% rename from src/LibHac/Fs/LayeredFileSystemDirectory.cs rename to src/LibHac/FsSystem/LayeredFileSystemDirectory.cs index 9d1e31dc..3c23e239 100644 --- a/src/LibHac/Fs/LayeredFileSystemDirectory.cs +++ b/src/LibHac/FsSystem/LayeredFileSystemDirectory.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class LayeredFileSystemDirectory : IDirectory { diff --git a/src/LibHac/Fs/LocalDirectory.cs b/src/LibHac/FsSystem/LocalDirectory.cs similarity index 99% rename from src/LibHac/Fs/LocalDirectory.cs rename to src/LibHac/FsSystem/LocalDirectory.cs index bbce488d..02f478be 100644 --- a/src/LibHac/Fs/LocalDirectory.cs +++ b/src/LibHac/FsSystem/LocalDirectory.cs @@ -4,7 +4,7 @@ using System.IO; using System.Runtime.CompilerServices; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class LocalDirectory : IDirectory { diff --git a/src/LibHac/Fs/LocalFile.cs b/src/LibHac/FsSystem/LocalFile.cs similarity index 99% rename from src/LibHac/Fs/LocalFile.cs rename to src/LibHac/FsSystem/LocalFile.cs index 4cb9e655..4d7abd4b 100644 --- a/src/LibHac/Fs/LocalFile.cs +++ b/src/LibHac/FsSystem/LocalFile.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class LocalFile : FileBase { diff --git a/src/LibHac/Fs/LocalFileSystem.cs b/src/LibHac/FsSystem/LocalFileSystem.cs similarity index 99% rename from src/LibHac/Fs/LocalFileSystem.cs rename to src/LibHac/FsSystem/LocalFileSystem.cs index 33c4b28b..dea5ba32 100644 --- a/src/LibHac/Fs/LocalFileSystem.cs +++ b/src/LibHac/FsSystem/LocalFileSystem.cs @@ -2,7 +2,7 @@ using System.IO; using System.Security; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class LocalFileSystem : IAttributeFileSystem { diff --git a/src/LibHac/Fs/LocalStorage.cs b/src/LibHac/FsSystem/LocalStorage.cs similarity index 97% rename from src/LibHac/Fs/LocalStorage.cs rename to src/LibHac/FsSystem/LocalStorage.cs index ea5b6e20..7e8d6596 100644 --- a/src/LibHac/Fs/LocalStorage.cs +++ b/src/LibHac/FsSystem/LocalStorage.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class LocalStorage : StorageBase { diff --git a/src/LibHac/Fs/MemoryStorage.cs b/src/LibHac/FsSystem/MemoryStorage.cs similarity index 99% rename from src/LibHac/Fs/MemoryStorage.cs rename to src/LibHac/FsSystem/MemoryStorage.cs index 23c025ff..9b139158 100644 --- a/src/LibHac/Fs/MemoryStorage.cs +++ b/src/LibHac/FsSystem/MemoryStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class MemoryStorage : StorageBase { diff --git a/src/LibHac/Fs/Messages.cs b/src/LibHac/FsSystem/Messages.cs similarity index 95% rename from src/LibHac/Fs/Messages.cs rename to src/LibHac/FsSystem/Messages.cs index c9835942..63b58cae 100644 --- a/src/LibHac/Fs/Messages.cs +++ b/src/LibHac/FsSystem/Messages.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs +namespace LibHac.FsSystem { internal static class Messages { diff --git a/src/LibHac/Fs/NcaUtils/Nca.cs b/src/LibHac/FsSystem/NcaUtils/Nca.cs similarity index 99% rename from src/LibHac/Fs/NcaUtils/Nca.cs rename to src/LibHac/FsSystem/NcaUtils/Nca.cs index ed892d26..9cb388e6 100644 --- a/src/LibHac/Fs/NcaUtils/Nca.cs +++ b/src/LibHac/FsSystem/NcaUtils/Nca.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using LibHac.Fs.RomFs; +using LibHac.FsSystem.RomFs; -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { public class Nca { diff --git a/src/LibHac/Fs/NcaUtils/NcaExtensions.cs b/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs similarity index 99% rename from src/LibHac/Fs/NcaUtils/NcaExtensions.cs rename to src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs index 72cbc384..5138a917 100644 --- a/src/LibHac/Fs/NcaUtils/NcaExtensions.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs @@ -2,7 +2,7 @@ using System.Buffers.Binary; using System.Diagnostics; -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { public static class NcaExtensions { diff --git a/src/LibHac/Fs/NcaUtils/NcaFsHeader.cs b/src/LibHac/FsSystem/NcaUtils/NcaFsHeader.cs similarity index 98% rename from src/LibHac/Fs/NcaUtils/NcaFsHeader.cs rename to src/LibHac/FsSystem/NcaUtils/NcaFsHeader.cs index e9dd9f52..a09bb783 100644 --- a/src/LibHac/Fs/NcaUtils/NcaFsHeader.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaFsHeader.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; // ReSharper disable ImpureMethodCallOnReadonlyValueField -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { public struct NcaFsHeader { diff --git a/src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoIvfc.cs b/src/LibHac/FsSystem/NcaUtils/NcaFsIntegrityInfoIvfc.cs similarity index 98% rename from src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoIvfc.cs rename to src/LibHac/FsSystem/NcaUtils/NcaFsIntegrityInfoIvfc.cs index 5f42be72..5e290c86 100644 --- a/src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoIvfc.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaFsIntegrityInfoIvfc.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { public struct NcaFsIntegrityInfoIvfc { diff --git a/src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoSha256.cs b/src/LibHac/FsSystem/NcaUtils/NcaFsIntegrityInfoSha256.cs similarity index 98% rename from src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoSha256.cs rename to src/LibHac/FsSystem/NcaUtils/NcaFsIntegrityInfoSha256.cs index 785f339d..7a8abd4d 100644 --- a/src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoSha256.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaFsIntegrityInfoSha256.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { public struct NcaFsIntegrityInfoSha256 { diff --git a/src/LibHac/Fs/NcaUtils/NcaFsPatchInfo.cs b/src/LibHac/FsSystem/NcaUtils/NcaFsPatchInfo.cs similarity index 97% rename from src/LibHac/Fs/NcaUtils/NcaFsPatchInfo.cs rename to src/LibHac/FsSystem/NcaUtils/NcaFsPatchInfo.cs index 5e75fba4..ccbbdff3 100644 --- a/src/LibHac/Fs/NcaUtils/NcaFsPatchInfo.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaFsPatchInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { public struct NcaFsPatchInfo { diff --git a/src/LibHac/Fs/NcaUtils/NcaHeader.cs b/src/LibHac/FsSystem/NcaUtils/NcaHeader.cs similarity index 99% rename from src/LibHac/Fs/NcaUtils/NcaHeader.cs rename to src/LibHac/FsSystem/NcaUtils/NcaHeader.cs index d4580f9a..6f19818b 100644 --- a/src/LibHac/Fs/NcaUtils/NcaHeader.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaHeader.cs @@ -3,7 +3,7 @@ using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { public struct NcaHeader { diff --git a/src/LibHac/Fs/NcaUtils/NcaKeyType.cs b/src/LibHac/FsSystem/NcaUtils/NcaKeyType.cs similarity index 76% rename from src/LibHac/Fs/NcaUtils/NcaKeyType.cs rename to src/LibHac/FsSystem/NcaUtils/NcaKeyType.cs index ac9d419e..589732e4 100644 --- a/src/LibHac/Fs/NcaUtils/NcaKeyType.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaKeyType.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { internal enum NcaKeyType { diff --git a/src/LibHac/Fs/NcaUtils/NcaStructs.cs b/src/LibHac/FsSystem/NcaUtils/NcaStructs.cs similarity index 97% rename from src/LibHac/Fs/NcaUtils/NcaStructs.cs rename to src/LibHac/FsSystem/NcaUtils/NcaStructs.cs index f8fdc052..fe4a2977 100644 --- a/src/LibHac/Fs/NcaUtils/NcaStructs.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaStructs.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs.NcaUtils +namespace LibHac.FsSystem.NcaUtils { public class TitleVersion { diff --git a/src/LibHac/Fs/NullFile.cs b/src/LibHac/FsSystem/NullFile.cs similarity index 97% rename from src/LibHac/Fs/NullFile.cs rename to src/LibHac/FsSystem/NullFile.cs index 8c396639..44847aa3 100644 --- a/src/LibHac/Fs/NullFile.cs +++ b/src/LibHac/FsSystem/NullFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class NullFile : FileBase { diff --git a/src/LibHac/Fs/NullStorage.cs b/src/LibHac/FsSystem/NullStorage.cs similarity index 97% rename from src/LibHac/Fs/NullStorage.cs rename to src/LibHac/FsSystem/NullStorage.cs index 5643e70b..a019e898 100644 --- a/src/LibHac/Fs/NullStorage.cs +++ b/src/LibHac/FsSystem/NullStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { /// /// An that returns all zeros when read, and does nothing on write. diff --git a/src/LibHac/Fs/NxFileStream.cs b/src/LibHac/FsSystem/NxFileStream.cs similarity index 98% rename from src/LibHac/Fs/NxFileStream.cs rename to src/LibHac/FsSystem/NxFileStream.cs index fd2a0852..7d6dd02b 100644 --- a/src/LibHac/Fs/NxFileStream.cs +++ b/src/LibHac/FsSystem/NxFileStream.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class NxFileStream : Stream { diff --git a/src/LibHac/Fs/PartitionDirectory.cs b/src/LibHac/FsSystem/PartitionDirectory.cs similarity index 98% rename from src/LibHac/Fs/PartitionDirectory.cs rename to src/LibHac/FsSystem/PartitionDirectory.cs index 4f8feaba..518c1350 100644 --- a/src/LibHac/Fs/PartitionDirectory.cs +++ b/src/LibHac/FsSystem/PartitionDirectory.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class PartitionDirectory : IDirectory { diff --git a/src/LibHac/Fs/PartitionFile.cs b/src/LibHac/FsSystem/PartitionFile.cs similarity index 98% rename from src/LibHac/Fs/PartitionFile.cs rename to src/LibHac/FsSystem/PartitionFile.cs index 1802ea87..62a6c213 100644 --- a/src/LibHac/Fs/PartitionFile.cs +++ b/src/LibHac/FsSystem/PartitionFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class PartitionFile : FileBase { diff --git a/src/LibHac/Fs/PartitionFileSystem.cs b/src/LibHac/FsSystem/PartitionFileSystem.cs similarity index 99% rename from src/LibHac/Fs/PartitionFileSystem.cs rename to src/LibHac/FsSystem/PartitionFileSystem.cs index a8ba92d4..4012cfba 100644 --- a/src/LibHac/Fs/PartitionFileSystem.cs +++ b/src/LibHac/FsSystem/PartitionFileSystem.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Text; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class PartitionFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/PartitionFileSystemBuilder.cs b/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs similarity index 99% rename from src/LibHac/Fs/PartitionFileSystemBuilder.cs rename to src/LibHac/FsSystem/PartitionFileSystemBuilder.cs index 853ae77a..bbe4a0b4 100644 --- a/src/LibHac/Fs/PartitionFileSystemBuilder.cs +++ b/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Security.Cryptography; using System.Text; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class PartitionFileSystemBuilder { diff --git a/src/LibHac/Fs/PathParser.cs b/src/LibHac/FsSystem/PathParser.cs similarity index 99% rename from src/LibHac/Fs/PathParser.cs rename to src/LibHac/FsSystem/PathParser.cs index afe148cf..e6c3f51e 100644 --- a/src/LibHac/Fs/PathParser.cs +++ b/src/LibHac/FsSystem/PathParser.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics; -namespace LibHac.Fs +namespace LibHac.FsSystem { /// /// Enumerates a file or directory path one segment at a time. diff --git a/src/LibHac/Fs/PathTools.cs b/src/LibHac/FsSystem/PathTools.cs similarity index 99% rename from src/LibHac/Fs/PathTools.cs rename to src/LibHac/FsSystem/PathTools.cs index d5ad17f8..bb7cf41a 100644 --- a/src/LibHac/Fs/PathTools.cs +++ b/src/LibHac/FsSystem/PathTools.cs @@ -6,7 +6,7 @@ using System.Runtime.CompilerServices; using System.IO.Enumeration; #endif -namespace LibHac.Fs +namespace LibHac.FsSystem { public static class PathTools { diff --git a/src/LibHac/Fs/ReadOnlyFile.cs b/src/LibHac/FsSystem/ReadOnlyFile.cs similarity index 97% rename from src/LibHac/Fs/ReadOnlyFile.cs rename to src/LibHac/FsSystem/ReadOnlyFile.cs index f98b8b24..c93be5ba 100644 --- a/src/LibHac/Fs/ReadOnlyFile.cs +++ b/src/LibHac/FsSystem/ReadOnlyFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class ReadOnlyFile : FileBase { diff --git a/src/LibHac/Fs/ReadOnlyFileSystem.cs b/src/LibHac/FsSystem/ReadOnlyFileSystem.cs similarity index 99% rename from src/LibHac/Fs/ReadOnlyFileSystem.cs rename to src/LibHac/FsSystem/ReadOnlyFileSystem.cs index a4fc43d7..a3c35b94 100644 --- a/src/LibHac/Fs/ReadOnlyFileSystem.cs +++ b/src/LibHac/FsSystem/ReadOnlyFileSystem.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class ReadOnlyFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/ResultFs.cs b/src/LibHac/FsSystem/ResultFs.cs similarity index 99% rename from src/LibHac/Fs/ResultFs.cs rename to src/LibHac/FsSystem/ResultFs.cs index fcc8eb68..0f064a80 100644 --- a/src/LibHac/Fs/ResultFs.cs +++ b/src/LibHac/FsSystem/ResultFs.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs +namespace LibHac.FsSystem { public class ResultFs { diff --git a/src/LibHac/Fs/ResultRangeFs.cs b/src/LibHac/FsSystem/ResultRangeFs.cs similarity index 97% rename from src/LibHac/Fs/ResultRangeFs.cs rename to src/LibHac/FsSystem/ResultRangeFs.cs index f0289aeb..3ffd032d 100644 --- a/src/LibHac/Fs/ResultRangeFs.cs +++ b/src/LibHac/FsSystem/ResultRangeFs.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs +namespace LibHac.FsSystem { public static class ResultRangeFs { diff --git a/src/LibHac/Fs/RightsId.cs b/src/LibHac/FsSystem/RightsId.cs similarity index 98% rename from src/LibHac/Fs/RightsId.cs rename to src/LibHac/FsSystem/RightsId.cs index 11f0969d..d3ac5836 100644 --- a/src/LibHac/Fs/RightsId.cs +++ b/src/LibHac/FsSystem/RightsId.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { [StructLayout(LayoutKind.Sequential, Size = 0x10)] public struct RightsId : IEquatable, IComparable, IComparable diff --git a/src/LibHac/Fs/RomFs/HierarchicalRomFileTable.cs b/src/LibHac/FsSystem/RomFs/HierarchicalRomFileTable.cs similarity index 99% rename from src/LibHac/Fs/RomFs/HierarchicalRomFileTable.cs rename to src/LibHac/FsSystem/RomFs/HierarchicalRomFileTable.cs index b73b2efd..c6476ec5 100644 --- a/src/LibHac/Fs/RomFs/HierarchicalRomFileTable.cs +++ b/src/LibHac/FsSystem/RomFs/HierarchicalRomFileTable.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace LibHac.Fs.RomFs +namespace LibHac.FsSystem.RomFs { /// /// Represents the file table used by the RomFS format. diff --git a/src/LibHac/Fs/RomFs/RomFsBuilder.cs b/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs similarity index 99% rename from src/LibHac/Fs/RomFs/RomFsBuilder.cs rename to src/LibHac/FsSystem/RomFs/RomFsBuilder.cs index c4ab96d8..3ec7cbb8 100644 --- a/src/LibHac/Fs/RomFs/RomFsBuilder.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace LibHac.Fs.RomFs +namespace LibHac.FsSystem.RomFs { /// /// Builds a RomFS from a collection of files. diff --git a/src/LibHac/Fs/RomFs/RomFsDictionary.cs b/src/LibHac/FsSystem/RomFs/RomFsDictionary.cs similarity index 99% rename from src/LibHac/Fs/RomFs/RomFsDictionary.cs rename to src/LibHac/FsSystem/RomFs/RomFsDictionary.cs index b1a5142f..d93970c9 100644 --- a/src/LibHac/Fs/RomFs/RomFsDictionary.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsDictionary.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.Fs.RomFs +namespace LibHac.FsSystem.RomFs { // todo: Change constraint to "unmanaged" after updating to // a newer SDK https://github.com/dotnet/csharplang/issues/1937 diff --git a/src/LibHac/Fs/RomFs/RomFsDirectory.cs b/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs similarity index 98% rename from src/LibHac/Fs/RomFs/RomFsDirectory.cs rename to src/LibHac/FsSystem/RomFs/RomFsDirectory.cs index 7b39248c..3d0ae58a 100644 --- a/src/LibHac/Fs/RomFs/RomFsDirectory.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs @@ -2,7 +2,7 @@ using System.Text; using LibHac.Common; -namespace LibHac.Fs.RomFs +namespace LibHac.FsSystem.RomFs { public class RomFsDirectory : IDirectory { diff --git a/src/LibHac/Fs/RomFs/RomFsEntries.cs b/src/LibHac/FsSystem/RomFs/RomFsEntries.cs similarity index 97% rename from src/LibHac/Fs/RomFs/RomFsEntries.cs rename to src/LibHac/FsSystem/RomFs/RomFsEntries.cs index 5c12b8cd..8e6a4e7e 100644 --- a/src/LibHac/Fs/RomFs/RomFsEntries.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsEntries.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace LibHac.Fs.RomFs +namespace LibHac.FsSystem.RomFs { internal ref struct RomEntryKey { diff --git a/src/LibHac/Fs/RomFs/RomFsFile.cs b/src/LibHac/FsSystem/RomFs/RomFsFile.cs similarity index 97% rename from src/LibHac/Fs/RomFs/RomFsFile.cs rename to src/LibHac/FsSystem/RomFs/RomFsFile.cs index 5f58a54a..42aa8493 100644 --- a/src/LibHac/Fs/RomFs/RomFsFile.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs.RomFs +namespace LibHac.FsSystem.RomFs { public class RomFsFile : FileBase { diff --git a/src/LibHac/Fs/RomFs/RomFsFileSystem.cs b/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs similarity index 99% rename from src/LibHac/Fs/RomFs/RomFsFileSystem.cs rename to src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs index 4651a177..b2b6f718 100644 --- a/src/LibHac/Fs/RomFs/RomFsFileSystem.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs.RomFs +namespace LibHac.FsSystem.RomFs { public class RomFsFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/Save/AllocationTable.cs b/src/LibHac/FsSystem/Save/AllocationTable.cs similarity index 99% rename from src/LibHac/Fs/Save/AllocationTable.cs rename to src/LibHac/FsSystem/Save/AllocationTable.cs index c43ec471..a09e9deb 100644 --- a/src/LibHac/Fs/Save/AllocationTable.cs +++ b/src/LibHac/FsSystem/Save/AllocationTable.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class AllocationTable { diff --git a/src/LibHac/Fs/Save/AllocationTableIterator.cs b/src/LibHac/FsSystem/Save/AllocationTableIterator.cs similarity index 98% rename from src/LibHac/Fs/Save/AllocationTableIterator.cs rename to src/LibHac/FsSystem/Save/AllocationTableIterator.cs index e97b79e9..886eb5be 100644 --- a/src/LibHac/Fs/Save/AllocationTableIterator.cs +++ b/src/LibHac/FsSystem/Save/AllocationTableIterator.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class AllocationTableIterator { diff --git a/src/LibHac/Fs/Save/AllocationTableStorage.cs b/src/LibHac/FsSystem/Save/AllocationTableStorage.cs similarity index 99% rename from src/LibHac/Fs/Save/AllocationTableStorage.cs rename to src/LibHac/FsSystem/Save/AllocationTableStorage.cs index c15102b1..cf66ff44 100644 --- a/src/LibHac/Fs/Save/AllocationTableStorage.cs +++ b/src/LibHac/FsSystem/Save/AllocationTableStorage.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class AllocationTableStorage : StorageBase { diff --git a/src/LibHac/Fs/Save/DuplexBitmap.cs b/src/LibHac/FsSystem/Save/DuplexBitmap.cs similarity index 97% rename from src/LibHac/Fs/Save/DuplexBitmap.cs rename to src/LibHac/FsSystem/Save/DuplexBitmap.cs index 649ef785..e76d2492 100644 --- a/src/LibHac/Fs/Save/DuplexBitmap.cs +++ b/src/LibHac/FsSystem/Save/DuplexBitmap.cs @@ -2,7 +2,7 @@ using System.Collections; using System.IO; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class DuplexBitmap { diff --git a/src/LibHac/Fs/Save/DuplexStorage.cs b/src/LibHac/FsSystem/Save/DuplexStorage.cs similarity index 99% rename from src/LibHac/Fs/Save/DuplexStorage.cs rename to src/LibHac/FsSystem/Save/DuplexStorage.cs index 874af711..25206542 100644 --- a/src/LibHac/Fs/Save/DuplexStorage.cs +++ b/src/LibHac/FsSystem/Save/DuplexStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class DuplexStorage : StorageBase { diff --git a/src/LibHac/Fs/Save/Header.cs b/src/LibHac/FsSystem/Save/Header.cs similarity index 99% rename from src/LibHac/Fs/Save/Header.cs rename to src/LibHac/FsSystem/Save/Header.cs index a0bc4ef8..7e8b908b 100644 --- a/src/LibHac/Fs/Save/Header.cs +++ b/src/LibHac/FsSystem/Save/Header.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class Header { diff --git a/src/LibHac/Fs/Save/HierarchicalDuplexStorage.cs b/src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs similarity index 98% rename from src/LibHac/Fs/Save/HierarchicalDuplexStorage.cs rename to src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs index 75c6ecc8..0c4c212a 100644 --- a/src/LibHac/Fs/Save/HierarchicalDuplexStorage.cs +++ b/src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class HierarchicalDuplexStorage : StorageBase { diff --git a/src/LibHac/Fs/Save/HierarchicalSaveFileTable.cs b/src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs similarity index 99% rename from src/LibHac/Fs/Save/HierarchicalSaveFileTable.cs rename to src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs index 78555ee3..359bea1b 100644 --- a/src/LibHac/Fs/Save/HierarchicalSaveFileTable.cs +++ b/src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs @@ -2,7 +2,7 @@ using System.IO; using System.Runtime.InteropServices; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class HierarchicalSaveFileTable { diff --git a/src/LibHac/Fs/Save/ISaveDataExtraDataAccessor.cs b/src/LibHac/FsSystem/Save/ISaveDataExtraDataAccessor.cs similarity index 83% rename from src/LibHac/Fs/Save/ISaveDataExtraDataAccessor.cs rename to src/LibHac/FsSystem/Save/ISaveDataExtraDataAccessor.cs index 6b93ffab..707e172a 100644 --- a/src/LibHac/Fs/Save/ISaveDataExtraDataAccessor.cs +++ b/src/LibHac/FsSystem/Save/ISaveDataExtraDataAccessor.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public interface ISaveDataExtraDataAccessor { diff --git a/src/LibHac/Fs/Save/JournalMap.cs b/src/LibHac/FsSystem/Save/JournalMap.cs similarity index 99% rename from src/LibHac/Fs/Save/JournalMap.cs rename to src/LibHac/FsSystem/Save/JournalMap.cs index d49af98c..c03dae94 100644 --- a/src/LibHac/Fs/Save/JournalMap.cs +++ b/src/LibHac/FsSystem/Save/JournalMap.cs @@ -1,6 +1,6 @@ using System.IO; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class JournalMap { diff --git a/src/LibHac/Fs/Save/JournalStorage.cs b/src/LibHac/FsSystem/Save/JournalStorage.cs similarity index 99% rename from src/LibHac/Fs/Save/JournalStorage.cs rename to src/LibHac/FsSystem/Save/JournalStorage.cs index ba4ac0bf..05f162d0 100644 --- a/src/LibHac/Fs/Save/JournalStorage.cs +++ b/src/LibHac/FsSystem/Save/JournalStorage.cs @@ -2,7 +2,7 @@ using System.Collections; using System.IO; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class JournalStorage : StorageBase { diff --git a/src/LibHac/Fs/Save/RemapStorage.cs b/src/LibHac/FsSystem/Save/RemapStorage.cs similarity index 99% rename from src/LibHac/Fs/Save/RemapStorage.cs rename to src/LibHac/FsSystem/Save/RemapStorage.cs index 885691f4..74fee6e4 100644 --- a/src/LibHac/Fs/Save/RemapStorage.cs +++ b/src/LibHac/FsSystem/Save/RemapStorage.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class RemapStorage : StorageBase { diff --git a/src/LibHac/Fs/Save/SaveDataDirectory.cs b/src/LibHac/FsSystem/Save/SaveDataDirectory.cs similarity index 98% rename from src/LibHac/Fs/Save/SaveDataDirectory.cs rename to src/LibHac/FsSystem/Save/SaveDataDirectory.cs index c4a73343..7062a58e 100644 --- a/src/LibHac/Fs/Save/SaveDataDirectory.cs +++ b/src/LibHac/FsSystem/Save/SaveDataDirectory.cs @@ -2,7 +2,7 @@ using System.Text; using LibHac.Common; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class SaveDataDirectory : IDirectory { diff --git a/src/LibHac/Fs/Save/SaveDataFile.cs b/src/LibHac/FsSystem/Save/SaveDataFile.cs similarity index 98% rename from src/LibHac/Fs/Save/SaveDataFile.cs rename to src/LibHac/FsSystem/Save/SaveDataFile.cs index 784350d9..8dc2f3d8 100644 --- a/src/LibHac/Fs/Save/SaveDataFile.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFile.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class SaveDataFile : FileBase { diff --git a/src/LibHac/Fs/Save/SaveDataFileSystem.cs b/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs similarity index 99% rename from src/LibHac/Fs/Save/SaveDataFileSystem.cs rename to src/LibHac/FsSystem/Save/SaveDataFileSystem.cs index e71d1a0c..b2874841 100644 --- a/src/LibHac/Fs/Save/SaveDataFileSystem.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class SaveDataFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/Save/SaveDataFileSystemCore.cs b/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs similarity index 99% rename from src/LibHac/Fs/Save/SaveDataFileSystemCore.cs rename to src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs index c408a325..c0929ec3 100644 --- a/src/LibHac/Fs/Save/SaveDataFileSystemCore.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public class SaveDataFileSystemCore : IFileSystem { diff --git a/src/LibHac/Fs/Save/SaveExtensions.cs b/src/LibHac/FsSystem/Save/SaveExtensions.cs similarity index 93% rename from src/LibHac/Fs/Save/SaveExtensions.cs rename to src/LibHac/FsSystem/Save/SaveExtensions.cs index 6c1ed069..0507f229 100644 --- a/src/LibHac/Fs/Save/SaveExtensions.cs +++ b/src/LibHac/FsSystem/Save/SaveExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { public static class SaveExtensions { diff --git a/src/LibHac/Fs/Save/SaveFsEntry.cs b/src/LibHac/FsSystem/Save/SaveFsEntry.cs similarity index 96% rename from src/LibHac/Fs/Save/SaveFsEntry.cs rename to src/LibHac/FsSystem/Save/SaveFsEntry.cs index 1a4c14a7..49e01214 100644 --- a/src/LibHac/Fs/Save/SaveFsEntry.cs +++ b/src/LibHac/FsSystem/Save/SaveFsEntry.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { internal ref struct SaveEntryKey { diff --git a/src/LibHac/Fs/Save/SaveFsList.cs b/src/LibHac/FsSystem/Save/SaveFsList.cs similarity index 99% rename from src/LibHac/Fs/Save/SaveFsList.cs rename to src/LibHac/FsSystem/Save/SaveFsList.cs index 7870b119..47806a1a 100644 --- a/src/LibHac/Fs/Save/SaveFsList.cs +++ b/src/LibHac/FsSystem/Save/SaveFsList.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { // todo: Change constraint to "unmanaged" after updating to // a newer SDK https://github.com/dotnet/csharplang/issues/1937 diff --git a/src/LibHac/Fs/Save/SaveResults.cs b/src/LibHac/FsSystem/Save/SaveResults.cs similarity index 99% rename from src/LibHac/Fs/Save/SaveResults.cs rename to src/LibHac/FsSystem/Save/SaveResults.cs index 3935db9e..0ec59399 100644 --- a/src/LibHac/Fs/Save/SaveResults.cs +++ b/src/LibHac/FsSystem/Save/SaveResults.cs @@ -1,4 +1,4 @@ -namespace LibHac.Fs.Save +namespace LibHac.FsSystem.Save { internal static class SaveResults { diff --git a/src/LibHac/Fs/SaveDataAttribute.cs b/src/LibHac/FsSystem/SaveDataAttribute.cs similarity index 98% rename from src/LibHac/Fs/SaveDataAttribute.cs rename to src/LibHac/FsSystem/SaveDataAttribute.cs index d37c7ed3..d501602a 100644 --- a/src/LibHac/Fs/SaveDataAttribute.cs +++ b/src/LibHac/FsSystem/SaveDataAttribute.cs @@ -1,9 +1,9 @@ using System; using System.Buffers.Binary; -using LibHac.Fs.Save; +using LibHac.FsSystem.Save; using LibHac.Kvdb; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class SaveDataAttribute : IComparable, IComparable, IEquatable, IExportable { diff --git a/src/LibHac/Fs/SaveDataCreateInfo.cs b/src/LibHac/FsSystem/SaveDataCreateInfo.cs similarity index 86% rename from src/LibHac/Fs/SaveDataCreateInfo.cs rename to src/LibHac/FsSystem/SaveDataCreateInfo.cs index 9dee82af..875bb0e2 100644 --- a/src/LibHac/Fs/SaveDataCreateInfo.cs +++ b/src/LibHac/FsSystem/SaveDataCreateInfo.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace LibHac.Fs +namespace LibHac.FsSystem { [StructLayout(LayoutKind.Explicit, Size = 0x40)] public struct SaveDataCreateInfo diff --git a/src/LibHac/Fs/SaveDataStructs.cs b/src/LibHac/FsSystem/SaveDataStructs.cs similarity index 97% rename from src/LibHac/Fs/SaveDataStructs.cs rename to src/LibHac/FsSystem/SaveDataStructs.cs index b4435b97..ee2a2d7c 100644 --- a/src/LibHac/Fs/SaveDataStructs.cs +++ b/src/LibHac/FsSystem/SaveDataStructs.cs @@ -1,10 +1,10 @@ using System; using System.Runtime.InteropServices; using LibHac.Common; -using LibHac.Fs.Save; +using LibHac.FsSystem.Save; using LibHac.Ncm; -namespace LibHac.Fs +namespace LibHac.FsSystem { [StructLayout(LayoutKind.Explicit, Size = 0x40)] public struct SaveDataAttribute2 diff --git a/src/LibHac/Fs/SaveIndexerStruct.cs b/src/LibHac/FsSystem/SaveIndexerStruct.cs similarity index 98% rename from src/LibHac/Fs/SaveIndexerStruct.cs rename to src/LibHac/FsSystem/SaveIndexerStruct.cs index fedada8f..b51dfa6f 100644 --- a/src/LibHac/Fs/SaveIndexerStruct.cs +++ b/src/LibHac/FsSystem/SaveIndexerStruct.cs @@ -2,7 +2,7 @@ using System.Buffers.Binary; using LibHac.Kvdb; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class SaveIndexerStruct : IExportable { diff --git a/src/LibHac/Fs/SaveMetaCreateInfo.cs b/src/LibHac/FsSystem/SaveMetaCreateInfo.cs similarity index 90% rename from src/LibHac/Fs/SaveMetaCreateInfo.cs rename to src/LibHac/FsSystem/SaveMetaCreateInfo.cs index c22202db..a8677328 100644 --- a/src/LibHac/Fs/SaveMetaCreateInfo.cs +++ b/src/LibHac/FsSystem/SaveMetaCreateInfo.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace LibHac.Fs +namespace LibHac.FsSystem { [StructLayout(LayoutKind.Explicit, Size = 0x10)] public struct SaveMetaCreateInfo diff --git a/src/LibHac/Fs/SectorStorage.cs b/src/LibHac/FsSystem/SectorStorage.cs similarity index 98% rename from src/LibHac/Fs/SectorStorage.cs rename to src/LibHac/FsSystem/SectorStorage.cs index 16ef4898..6246ed9f 100644 --- a/src/LibHac/Fs/SectorStorage.cs +++ b/src/LibHac/FsSystem/SectorStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class SectorStorage : StorageBase { diff --git a/src/LibHac/Fs/StorageBase.cs b/src/LibHac/FsSystem/StorageBase.cs similarity index 98% rename from src/LibHac/Fs/StorageBase.cs rename to src/LibHac/FsSystem/StorageBase.cs index 580479b7..0fada5e8 100644 --- a/src/LibHac/Fs/StorageBase.cs +++ b/src/LibHac/FsSystem/StorageBase.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.Fs +namespace LibHac.FsSystem { public abstract class StorageBase : IStorage { diff --git a/src/LibHac/Fs/StorageExtensions.cs b/src/LibHac/FsSystem/StorageExtensions.cs similarity index 99% rename from src/LibHac/Fs/StorageExtensions.cs rename to src/LibHac/FsSystem/StorageExtensions.cs index a1f64dc7..46ee10e3 100644 --- a/src/LibHac/Fs/StorageExtensions.cs +++ b/src/LibHac/FsSystem/StorageExtensions.cs @@ -3,7 +3,7 @@ using System.Buffers; using System.IO; using System.Runtime.InteropServices; -namespace LibHac.Fs +namespace LibHac.FsSystem { public static class StorageExtensions { diff --git a/src/LibHac/Fs/StorageFile.cs b/src/LibHac/FsSystem/StorageFile.cs similarity index 98% rename from src/LibHac/Fs/StorageFile.cs rename to src/LibHac/FsSystem/StorageFile.cs index 176abdc5..32009c5f 100644 --- a/src/LibHac/Fs/StorageFile.cs +++ b/src/LibHac/FsSystem/StorageFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class StorageFile : FileBase { diff --git a/src/LibHac/Fs/StorageStream.cs b/src/LibHac/FsSystem/StorageStream.cs similarity index 98% rename from src/LibHac/Fs/StorageStream.cs rename to src/LibHac/FsSystem/StorageStream.cs index 85cbef72..265e1edf 100644 --- a/src/LibHac/Fs/StorageStream.cs +++ b/src/LibHac/FsSystem/StorageStream.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class StorageStream : Stream { diff --git a/src/LibHac/Fs/StreamFile.cs b/src/LibHac/FsSystem/StreamFile.cs similarity index 99% rename from src/LibHac/Fs/StreamFile.cs rename to src/LibHac/FsSystem/StreamFile.cs index ba7305db..2103166c 100644 --- a/src/LibHac/Fs/StreamFile.cs +++ b/src/LibHac/FsSystem/StreamFile.cs @@ -5,7 +5,7 @@ using System.IO; using System.Buffers; #endif -namespace LibHac.Fs +namespace LibHac.FsSystem { /// /// Provides an interface for interacting with a diff --git a/src/LibHac/Fs/StreamStorage.cs b/src/LibHac/FsSystem/StreamStorage.cs similarity index 99% rename from src/LibHac/Fs/StreamStorage.cs rename to src/LibHac/FsSystem/StreamStorage.cs index 4784da48..7381f63a 100644 --- a/src/LibHac/Fs/StreamStorage.cs +++ b/src/LibHac/FsSystem/StreamStorage.cs @@ -5,7 +5,7 @@ using System.IO; using System.Buffers; #endif -namespace LibHac.Fs +namespace LibHac.FsSystem { public class StreamStorage : StorageBase { diff --git a/src/LibHac/Fs/SubStorage.cs b/src/LibHac/FsSystem/SubStorage.cs similarity index 99% rename from src/LibHac/Fs/SubStorage.cs rename to src/LibHac/FsSystem/SubStorage.cs index 144b7ab0..82616040 100644 --- a/src/LibHac/Fs/SubStorage.cs +++ b/src/LibHac/FsSystem/SubStorage.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class SubStorage : StorageBase { diff --git a/src/LibHac/Fs/SubdirectoryFileSystem.cs b/src/LibHac/FsSystem/SubdirectoryFileSystem.cs similarity index 99% rename from src/LibHac/Fs/SubdirectoryFileSystem.cs rename to src/LibHac/FsSystem/SubdirectoryFileSystem.cs index b5fabd41..9c2df12f 100644 --- a/src/LibHac/Fs/SubdirectoryFileSystem.cs +++ b/src/LibHac/FsSystem/SubdirectoryFileSystem.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Fs +namespace LibHac.FsSystem { public class SubdirectoryFileSystem : IFileSystem { diff --git a/src/LibHac/Fs/UserId.cs b/src/LibHac/FsSystem/UserId.cs similarity index 98% rename from src/LibHac/Fs/UserId.cs rename to src/LibHac/FsSystem/UserId.cs index 4a14fc46..7332102a 100644 --- a/src/LibHac/Fs/UserId.cs +++ b/src/LibHac/FsSystem/UserId.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using LibHac.Common; -namespace LibHac.Fs +namespace LibHac.FsSystem { [StructLayout(LayoutKind.Sequential, Size = 0x10)] public struct UserId : IEquatable, IComparable, IComparable diff --git a/src/LibHac/Fs/ValueStringBuilder.cs b/src/LibHac/FsSystem/ValueStringBuilder.cs similarity index 99% rename from src/LibHac/Fs/ValueStringBuilder.cs rename to src/LibHac/FsSystem/ValueStringBuilder.cs index 93a1f7da..4765aa4b 100644 --- a/src/LibHac/Fs/ValueStringBuilder.cs +++ b/src/LibHac/FsSystem/ValueStringBuilder.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.Fs +namespace LibHac.FsSystem { internal ref struct ValueStringBuilder { diff --git a/src/LibHac/Horizon.cs b/src/LibHac/Horizon.cs index 370dc5b2..cd9da365 100644 --- a/src/LibHac/Horizon.cs +++ b/src/LibHac/Horizon.cs @@ -1,4 +1,4 @@ -using LibHac.FsClient; +using LibHac.Fs; using LibHac.FsService; using LibHac.FsService.Creators; diff --git a/src/LibHac/Keyset.cs b/src/LibHac/Keyset.cs index d48e625e..e71deaa8 100644 --- a/src/LibHac/Keyset.cs +++ b/src/LibHac/Keyset.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Security.Cryptography; using System.Text; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/LibHac/Kip.cs b/src/LibHac/Kip.cs index f007713d..ac0e6b20 100644 --- a/src/LibHac/Kip.cs +++ b/src/LibHac/Kip.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/LibHac/Ncm/IContentStorage.cs b/src/LibHac/Ncm/IContentStorage.cs index 2cd17ea9..9834f3a0 100644 --- a/src/LibHac/Ncm/IContentStorage.cs +++ b/src/LibHac/Ncm/IContentStorage.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.Ncm { diff --git a/src/LibHac/Nro.cs b/src/LibHac/Nro.cs index c3e301db..1afd9710 100644 --- a/src/LibHac/Nro.cs +++ b/src/LibHac/Nro.cs @@ -1,5 +1,5 @@ using System.IO; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/LibHac/Nso.cs b/src/LibHac/Nso.cs index 53c35063..09e49b96 100644 --- a/src/LibHac/Nso.cs +++ b/src/LibHac/Nso.cs @@ -1,6 +1,6 @@ using System.Collections; using System.IO; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/LibHac/Package1.cs b/src/LibHac/Package1.cs index 0c4efc20..b94f7f8e 100644 --- a/src/LibHac/Package1.cs +++ b/src/LibHac/Package1.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/LibHac/Package2.cs b/src/LibHac/Package2.cs index 943dab71..dee1e26c 100644 --- a/src/LibHac/Package2.cs +++ b/src/LibHac/Package2.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/LibHac/SwitchFs.cs b/src/LibHac/SwitchFs.cs index f87b879a..d6455293 100644 --- a/src/LibHac/SwitchFs.cs +++ b/src/LibHac/SwitchFs.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using LibHac.Fs; -using LibHac.Fs.NcaUtils; -using LibHac.Fs.Save; +using LibHac.FsSystem; +using LibHac.FsSystem.NcaUtils; +using LibHac.FsSystem.Save; using LibHac.Ncm; namespace LibHac diff --git a/src/LibHac/Xci.cs b/src/LibHac/Xci.cs index 9fe8c7f1..4154f43f 100644 --- a/src/LibHac/Xci.cs +++ b/src/LibHac/Xci.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/hactoolnet/AccessLog.cs b/src/hactoolnet/AccessLog.cs index 617e7eaf..789965c6 100644 --- a/src/hactoolnet/AccessLog.cs +++ b/src/hactoolnet/AccessLog.cs @@ -2,7 +2,7 @@ using System.IO; using System.Runtime.CompilerServices; using LibHac; -using LibHac.FsClient; +using LibHac.Fs; namespace hactoolnet { diff --git a/src/hactoolnet/FsUtils.cs b/src/hactoolnet/FsUtils.cs index 9aa361ee..05cfaa33 100644 --- a/src/hactoolnet/FsUtils.cs +++ b/src/hactoolnet/FsUtils.cs @@ -2,7 +2,7 @@ using System.Buffers; using LibHac; using LibHac.Fs; -using LibHac.FsClient; +using LibHac.FsSystem; namespace hactoolnet { diff --git a/src/hactoolnet/Options.cs b/src/hactoolnet/Options.cs index 1a327eaf..c99ac0a8 100644 --- a/src/hactoolnet/Options.cs +++ b/src/hactoolnet/Options.cs @@ -1,5 +1,5 @@ using LibHac; -using LibHac.Fs; +using LibHac.FsSystem; namespace hactoolnet { diff --git a/src/hactoolnet/Print.cs b/src/hactoolnet/Print.cs index 0cea2972..ab5b6348 100644 --- a/src/hactoolnet/Print.cs +++ b/src/hactoolnet/Print.cs @@ -2,8 +2,8 @@ using System.Buffers.Binary; using System.Text; using LibHac; -using LibHac.Fs; -using LibHac.Fs.NcaUtils; +using LibHac.FsSystem; +using LibHac.FsSystem.NcaUtils; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessBench.cs b/src/hactoolnet/ProcessBench.cs index 185006a4..1f889940 100644 --- a/src/hactoolnet/ProcessBench.cs +++ b/src/hactoolnet/ProcessBench.cs @@ -1,6 +1,6 @@ using System.Diagnostics; using LibHac; -using LibHac.Fs; +using LibHac.FsSystem; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessDelta.cs b/src/hactoolnet/ProcessDelta.cs index b03dde02..3ab22e4b 100644 --- a/src/hactoolnet/ProcessDelta.cs +++ b/src/hactoolnet/ProcessDelta.cs @@ -2,8 +2,8 @@ using System.IO; using System.Runtime.InteropServices; using System.Text; -using LibHac.Fs; -using LibHac.Fs.NcaUtils; +using LibHac.FsSystem; +using LibHac.FsSystem.NcaUtils; using static hactoolnet.Print; namespace hactoolnet diff --git a/src/hactoolnet/ProcessFsBuild.cs b/src/hactoolnet/ProcessFsBuild.cs index 05a969f2..b9162cde 100644 --- a/src/hactoolnet/ProcessFsBuild.cs +++ b/src/hactoolnet/ProcessFsBuild.cs @@ -1,6 +1,6 @@ using System.IO; -using LibHac.Fs; -using LibHac.Fs.RomFs; +using LibHac.FsSystem; +using LibHac.FsSystem.RomFs; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessKip.cs b/src/hactoolnet/ProcessKip.cs index b10e4d35..1cbfacbc 100644 --- a/src/hactoolnet/ProcessKip.cs +++ b/src/hactoolnet/ProcessKip.cs @@ -1,6 +1,6 @@ using System.IO; using LibHac; -using LibHac.Fs; +using LibHac.FsSystem; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessNca.cs b/src/hactoolnet/ProcessNca.cs index 5cfc9e65..311b14a1 100644 --- a/src/hactoolnet/ProcessNca.cs +++ b/src/hactoolnet/ProcessNca.cs @@ -3,8 +3,8 @@ using System.Text; using LibHac; using LibHac.Common; using LibHac.Fs; -using LibHac.Fs.NcaUtils; -using LibHac.FsClient; +using LibHac.FsSystem; +using LibHac.FsSystem.NcaUtils; using LibHac.Npdm; using static hactoolnet.Print; diff --git a/src/hactoolnet/ProcessPackage.cs b/src/hactoolnet/ProcessPackage.cs index ee551196..7d2c043d 100644 --- a/src/hactoolnet/ProcessPackage.cs +++ b/src/hactoolnet/ProcessPackage.cs @@ -1,7 +1,7 @@ using System.IO; using System.Text; using LibHac; -using LibHac.Fs; +using LibHac.FsSystem; using static hactoolnet.Print; namespace hactoolnet diff --git a/src/hactoolnet/ProcessPfs.cs b/src/hactoolnet/ProcessPfs.cs index fbabfad7..c450f7ed 100644 --- a/src/hactoolnet/ProcessPfs.cs +++ b/src/hactoolnet/ProcessPfs.cs @@ -2,7 +2,7 @@ using System.Reflection; using System.Text; using LibHac; -using LibHac.Fs; +using LibHac.FsSystem; using static hactoolnet.Print; namespace hactoolnet diff --git a/src/hactoolnet/ProcessRomfs.cs b/src/hactoolnet/ProcessRomfs.cs index 950b757a..86af0c46 100644 --- a/src/hactoolnet/ProcessRomfs.cs +++ b/src/hactoolnet/ProcessRomfs.cs @@ -1,6 +1,6 @@ using System.IO; -using LibHac.Fs; -using LibHac.Fs.RomFs; +using LibHac.FsSystem; +using LibHac.FsSystem.RomFs; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessSave.cs b/src/hactoolnet/ProcessSave.cs index 3bc937c3..4f067a7c 100644 --- a/src/hactoolnet/ProcessSave.cs +++ b/src/hactoolnet/ProcessSave.cs @@ -6,8 +6,8 @@ using System.Text; using LibHac; using LibHac.Common; using LibHac.Fs; -using LibHac.Fs.Save; -using LibHac.FsClient; +using LibHac.FsSystem; +using LibHac.FsSystem.Save; using static hactoolnet.Print; namespace hactoolnet diff --git a/src/hactoolnet/ProcessSwitchFs.cs b/src/hactoolnet/ProcessSwitchFs.cs index 9dfc8ba9..441346f8 100644 --- a/src/hactoolnet/ProcessSwitchFs.cs +++ b/src/hactoolnet/ProcessSwitchFs.cs @@ -4,9 +4,9 @@ using System.IO; using System.Linq; using System.Text; using LibHac; -using LibHac.Fs; -using LibHac.Fs.NcaUtils; -using LibHac.Fs.Save; +using LibHac.FsSystem; +using LibHac.FsSystem.NcaUtils; +using LibHac.FsSystem.Save; #if NETCOREAPP using System.Runtime.InteropServices; diff --git a/src/hactoolnet/ProcessXci.cs b/src/hactoolnet/ProcessXci.cs index 74d9996f..240830b4 100644 --- a/src/hactoolnet/ProcessXci.cs +++ b/src/hactoolnet/ProcessXci.cs @@ -3,8 +3,8 @@ using System.IO; using System.Linq; using System.Text; using LibHac; -using LibHac.Fs; -using LibHac.Fs.NcaUtils; +using LibHac.FsSystem; +using LibHac.FsSystem.NcaUtils; using static hactoolnet.Print; namespace hactoolnet diff --git a/tests/LibHac.Tests/AesXts.cs b/tests/LibHac.Tests/AesXts.cs index b2dd51dd..df7a9629 100644 --- a/tests/LibHac.Tests/AesXts.cs +++ b/tests/LibHac.Tests/AesXts.cs @@ -1,5 +1,5 @@ using System.Linq; -using LibHac.Fs; +using LibHac.FsSystem; using Xunit; namespace LibHac.Tests diff --git a/tests/LibHac.Tests/PathToolsTests.cs b/tests/LibHac.Tests/PathToolsTests.cs index fb3a04d9..ff4330fe 100644 --- a/tests/LibHac.Tests/PathToolsTests.cs +++ b/tests/LibHac.Tests/PathToolsTests.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using LibHac.Fs; +using LibHac.FsSystem; using Xunit; namespace LibHac.Tests diff --git a/tests/LibHac.Tests/RomFsTests.cs b/tests/LibHac.Tests/RomFsTests.cs index bce481ad..5163e8fa 100644 --- a/tests/LibHac.Tests/RomFsTests.cs +++ b/tests/LibHac.Tests/RomFsTests.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Fs.RomFs; +using LibHac.FsSystem.RomFs; using Xunit; namespace LibHac.Tests