diff --git a/src/LibHac.Nand/FatFileSystemDirectory.cs b/src/LibHac.Nand/FatFileSystemDirectory.cs index ba00a303..f66affa6 100644 --- a/src/LibHac.Nand/FatFileSystemDirectory.cs +++ b/src/LibHac.Nand/FatFileSystemDirectory.cs @@ -2,10 +2,10 @@ using System.IO; using System.Runtime.CompilerServices; using DiscUtils; -using LibHac.IO; +using LibHac.Fs; -using DirectoryEntry = LibHac.IO.DirectoryEntry; -using IFileSystem = LibHac.IO.IFileSystem; +using DirectoryEntry = LibHac.Fs.DirectoryEntry; +using IFileSystem = LibHac.Fs.IFileSystem; namespace LibHac.Nand { diff --git a/src/LibHac.Nand/FatFileSystemProvider.cs b/src/LibHac.Nand/FatFileSystemProvider.cs index 3c5f9d87..b52a988a 100644 --- a/src/LibHac.Nand/FatFileSystemProvider.cs +++ b/src/LibHac.Nand/FatFileSystemProvider.cs @@ -1,7 +1,7 @@ using System; using System.IO; using DiscUtils.Fat; -using LibHac.IO; +using LibHac.Fs; namespace LibHac.Nand { diff --git a/src/LibHac.Nand/Nand.cs b/src/LibHac.Nand/Nand.cs index 5ef87f82..4892612d 100644 --- a/src/LibHac.Nand/Nand.cs +++ b/src/LibHac.Nand/Nand.cs @@ -4,7 +4,7 @@ using DiscUtils; using DiscUtils.Fat; using DiscUtils.Partitions; using DiscUtils.Streams; -using LibHac.IO; +using LibHac.Fs; namespace LibHac.Nand { diff --git a/src/LibHac/Cnmt.cs b/src/LibHac/Cnmt.cs index 97e553ac..9b0d375e 100644 --- a/src/LibHac/Cnmt.cs +++ b/src/LibHac/Cnmt.cs @@ -1,6 +1,6 @@ using System.IO; using System.Linq; -using LibHac.IO.NcaUtils; +using LibHac.Fs.NcaUtils; namespace LibHac { diff --git a/src/LibHac/Crypto.cs b/src/LibHac/Crypto.cs index 6d7689fd..3ae39d49 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.IO; +using LibHac.Fs; namespace LibHac { diff --git a/src/LibHac/IO/Aes128CtrExStorage.cs b/src/LibHac/Fs/Aes128CtrExStorage.cs similarity index 99% rename from src/LibHac/IO/Aes128CtrExStorage.cs rename to src/LibHac/Fs/Aes128CtrExStorage.cs index 8fc0a371..9dbd3398 100644 --- a/src/LibHac/IO/Aes128CtrExStorage.cs +++ b/src/LibHac/Fs/Aes128CtrExStorage.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace LibHac.IO +namespace LibHac.Fs { public class Aes128CtrExStorage : Aes128CtrStorage { diff --git a/src/LibHac/IO/Aes128CtrStorage.cs b/src/LibHac/Fs/Aes128CtrStorage.cs similarity index 99% rename from src/LibHac/IO/Aes128CtrStorage.cs rename to src/LibHac/Fs/Aes128CtrStorage.cs index f3c1f987..c92467eb 100644 --- a/src/LibHac/IO/Aes128CtrStorage.cs +++ b/src/LibHac/Fs/Aes128CtrStorage.cs @@ -2,7 +2,7 @@ using System.Buffers; using System.Buffers.Binary; -namespace LibHac.IO +namespace LibHac.Fs { public class Aes128CtrStorage : SectorStorage { diff --git a/src/LibHac/IO/Aes128CtrTransform.cs b/src/LibHac/Fs/Aes128CtrTransform.cs similarity index 99% rename from src/LibHac/IO/Aes128CtrTransform.cs rename to src/LibHac/Fs/Aes128CtrTransform.cs index ebe6a3c4..1a430e82 100644 --- a/src/LibHac/IO/Aes128CtrTransform.cs +++ b/src/LibHac/Fs/Aes128CtrTransform.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; using System.Runtime.InteropServices; using System.Security.Cryptography; -namespace LibHac.IO +namespace LibHac.Fs { public class Aes128CtrTransform { diff --git a/src/LibHac/IO/Aes128XtsStorage.cs b/src/LibHac/Fs/Aes128XtsStorage.cs similarity index 99% rename from src/LibHac/IO/Aes128XtsStorage.cs rename to src/LibHac/Fs/Aes128XtsStorage.cs index 6b44e1e4..e4d99161 100644 --- a/src/LibHac/IO/Aes128XtsStorage.cs +++ b/src/LibHac/Fs/Aes128XtsStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class Aes128XtsStorage : SectorStorage { diff --git a/src/LibHac/IO/Aes128XtsTransform.cs b/src/LibHac/Fs/Aes128XtsTransform.cs similarity index 99% rename from src/LibHac/IO/Aes128XtsTransform.cs rename to src/LibHac/Fs/Aes128XtsTransform.cs index 5cdcbf11..53aac4c6 100644 --- a/src/LibHac/IO/Aes128XtsTransform.cs +++ b/src/LibHac/Fs/Aes128XtsTransform.cs @@ -29,7 +29,7 @@ using System.Buffers; using System.Runtime.InteropServices; using System.Security.Cryptography; -namespace LibHac.IO +namespace LibHac.Fs { public class Aes128XtsTransform { diff --git a/src/LibHac/IO/AesXtsDirectory.cs b/src/LibHac/Fs/AesXtsDirectory.cs similarity index 99% rename from src/LibHac/IO/AesXtsDirectory.cs rename to src/LibHac/Fs/AesXtsDirectory.cs index 2d5227c7..99caa17a 100644 --- a/src/LibHac/IO/AesXtsDirectory.cs +++ b/src/LibHac/Fs/AesXtsDirectory.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.IO +namespace LibHac.Fs { public class AesXtsDirectory : IDirectory { diff --git a/src/LibHac/IO/AesXtsFile.cs b/src/LibHac/Fs/AesXtsFile.cs similarity index 99% rename from src/LibHac/IO/AesXtsFile.cs rename to src/LibHac/Fs/AesXtsFile.cs index 2e394f73..62f772b0 100644 --- a/src/LibHac/IO/AesXtsFile.cs +++ b/src/LibHac/Fs/AesXtsFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class AesXtsFile : FileBase { diff --git a/src/LibHac/IO/AesXtsFileHeader.cs b/src/LibHac/Fs/AesXtsFileHeader.cs similarity index 99% rename from src/LibHac/IO/AesXtsFileHeader.cs rename to src/LibHac/Fs/AesXtsFileHeader.cs index 74439cd1..4f020014 100644 --- a/src/LibHac/IO/AesXtsFileHeader.cs +++ b/src/LibHac/Fs/AesXtsFileHeader.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; -namespace LibHac.IO +namespace LibHac.Fs { public class AesXtsFileHeader { diff --git a/src/LibHac/IO/AesXtsFileSystem.cs b/src/LibHac/Fs/AesXtsFileSystem.cs similarity index 99% rename from src/LibHac/IO/AesXtsFileSystem.cs rename to src/LibHac/Fs/AesXtsFileSystem.cs index c20f5262..6b669931 100644 --- a/src/LibHac/IO/AesXtsFileSystem.cs +++ b/src/LibHac/Fs/AesXtsFileSystem.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class AesXtsFileSystem : IFileSystem { diff --git a/src/LibHac/IO/BucketTree.cs b/src/LibHac/Fs/BucketTree.cs similarity index 99% rename from src/LibHac/IO/BucketTree.cs rename to src/LibHac/Fs/BucketTree.cs index c8ee17a0..0c7cdb42 100644 --- a/src/LibHac/IO/BucketTree.cs +++ b/src/LibHac/Fs/BucketTree.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; -namespace LibHac.IO +namespace LibHac.Fs { public class BucketTree where T : BucketTreeEntry, new() { diff --git a/src/LibHac/IO/CachedStorage.cs b/src/LibHac/Fs/CachedStorage.cs similarity index 99% rename from src/LibHac/IO/CachedStorage.cs rename to src/LibHac/Fs/CachedStorage.cs index e2c42ea2..a6e874f3 100644 --- a/src/LibHac/IO/CachedStorage.cs +++ b/src/LibHac/Fs/CachedStorage.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.IO +namespace LibHac.Fs { public class CachedStorage : StorageBase { diff --git a/src/LibHac/IO/ConcatenationDirectory.cs b/src/LibHac/Fs/ConcatenationDirectory.cs similarity index 99% rename from src/LibHac/IO/ConcatenationDirectory.cs rename to src/LibHac/Fs/ConcatenationDirectory.cs index d9a40e12..140f165f 100644 --- a/src/LibHac/IO/ConcatenationDirectory.cs +++ b/src/LibHac/Fs/ConcatenationDirectory.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace LibHac.IO +namespace LibHac.Fs { public class ConcatenationDirectory : IDirectory { diff --git a/src/LibHac/IO/ConcatenationFile.cs b/src/LibHac/Fs/ConcatenationFile.cs similarity index 99% rename from src/LibHac/IO/ConcatenationFile.cs rename to src/LibHac/Fs/ConcatenationFile.cs index 2c4ef3fc..5d8343f6 100644 --- a/src/LibHac/IO/ConcatenationFile.cs +++ b/src/LibHac/Fs/ConcatenationFile.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace LibHac.IO +namespace LibHac.Fs { public class ConcatenationFile : FileBase { diff --git a/src/LibHac/IO/ConcatenationFileSystem.cs b/src/LibHac/Fs/ConcatenationFileSystem.cs similarity index 99% rename from src/LibHac/IO/ConcatenationFileSystem.cs rename to src/LibHac/Fs/ConcatenationFileSystem.cs index c99627d1..bc717ab5 100644 --- a/src/LibHac/IO/ConcatenationFileSystem.cs +++ b/src/LibHac/Fs/ConcatenationFileSystem.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class ConcatenationFileSystem : IFileSystem { diff --git a/src/LibHac/IO/ConcatenationStorage.cs b/src/LibHac/Fs/ConcatenationStorage.cs similarity index 99% rename from src/LibHac/IO/ConcatenationStorage.cs rename to src/LibHac/Fs/ConcatenationStorage.cs index 0a993e20..a6a6978a 100644 --- a/src/LibHac/IO/ConcatenationStorage.cs +++ b/src/LibHac/Fs/ConcatenationStorage.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.IO +namespace LibHac.Fs { public class ConcatenationStorage : StorageBase { diff --git a/src/LibHac/IO/ConcatenationStorageBuilder.cs b/src/LibHac/Fs/ConcatenationStorageBuilder.cs similarity index 98% rename from src/LibHac/IO/ConcatenationStorageBuilder.cs rename to src/LibHac/Fs/ConcatenationStorageBuilder.cs index 4de0f967..3ea5f670 100644 --- a/src/LibHac/IO/ConcatenationStorageBuilder.cs +++ b/src/LibHac/Fs/ConcatenationStorageBuilder.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; -namespace LibHac.IO +namespace LibHac.Fs { public class ConcatenationStorageBuilder { diff --git a/src/LibHac/IO/DeltaFragment.cs b/src/LibHac/Fs/DeltaFragment.cs similarity index 99% rename from src/LibHac/IO/DeltaFragment.cs rename to src/LibHac/Fs/DeltaFragment.cs index 9555e69f..77711ebd 100644 --- a/src/LibHac/IO/DeltaFragment.cs +++ b/src/LibHac/Fs/DeltaFragment.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class DeltaFragment { diff --git a/src/LibHac/IO/DirectoryEntry.cs b/src/LibHac/Fs/DirectoryEntry.cs similarity index 97% rename from src/LibHac/IO/DirectoryEntry.cs rename to src/LibHac/Fs/DirectoryEntry.cs index e4814f49..6ac23cf5 100644 --- a/src/LibHac/IO/DirectoryEntry.cs +++ b/src/LibHac/Fs/DirectoryEntry.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class DirectoryEntry { diff --git a/src/LibHac/IO/FileBase.cs b/src/LibHac/Fs/FileBase.cs similarity index 99% rename from src/LibHac/IO/FileBase.cs rename to src/LibHac/Fs/FileBase.cs index b51260c3..8f6404ad 100644 --- a/src/LibHac/IO/FileBase.cs +++ b/src/LibHac/Fs/FileBase.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.IO +namespace LibHac.Fs { public abstract class FileBase : IFile { diff --git a/src/LibHac/IO/FileReader.cs b/src/LibHac/Fs/FileReader.cs similarity index 99% rename from src/LibHac/IO/FileReader.cs rename to src/LibHac/Fs/FileReader.cs index 8977b960..5a7779f1 100644 --- a/src/LibHac/IO/FileReader.cs +++ b/src/LibHac/Fs/FileReader.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; -namespace LibHac.IO +namespace LibHac.Fs { public class FileReader { diff --git a/src/LibHac/IO/FileStorage.cs b/src/LibHac/Fs/FileStorage.cs similarity index 97% rename from src/LibHac/IO/FileStorage.cs rename to src/LibHac/Fs/FileStorage.cs index 655f12c4..80c8e6bc 100644 --- a/src/LibHac/IO/FileStorage.cs +++ b/src/LibHac/Fs/FileStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class FileStorage : StorageBase { diff --git a/src/LibHac/IO/FileSystemExtensions.cs b/src/LibHac/Fs/FileSystemExtensions.cs similarity index 99% rename from src/LibHac/IO/FileSystemExtensions.cs rename to src/LibHac/Fs/FileSystemExtensions.cs index da982524..a8be37da 100644 --- a/src/LibHac/IO/FileSystemExtensions.cs +++ b/src/LibHac/Fs/FileSystemExtensions.cs @@ -7,7 +7,7 @@ using System.IO; using System.IO.Enumeration; #endif -namespace LibHac.IO +namespace LibHac.Fs { public static class FileSystemExtensions { diff --git a/src/LibHac/IO/FileTimeStamp.cs b/src/LibHac/Fs/FileTimeStamp.cs similarity index 85% rename from src/LibHac/IO/FileTimeStamp.cs rename to src/LibHac/Fs/FileTimeStamp.cs index 60b9fae3..74aff00a 100644 --- a/src/LibHac/IO/FileTimeStamp.cs +++ b/src/LibHac/Fs/FileTimeStamp.cs @@ -1,4 +1,4 @@ -namespace LibHac.IO +namespace LibHac.Fs { public struct FileTimeStampRaw { diff --git a/src/LibHac/IO/HierarchicalIntegrityVerificationStorage.cs b/src/LibHac/Fs/HierarchicalIntegrityVerificationStorage.cs similarity index 99% rename from src/LibHac/IO/HierarchicalIntegrityVerificationStorage.cs rename to src/LibHac/Fs/HierarchicalIntegrityVerificationStorage.cs index fc3e5895..a81f438a 100644 --- a/src/LibHac/IO/HierarchicalIntegrityVerificationStorage.cs +++ b/src/LibHac/Fs/HierarchicalIntegrityVerificationStorage.cs @@ -4,7 +4,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; -namespace LibHac.IO +namespace LibHac.Fs { public class HierarchicalIntegrityVerificationStorage : StorageBase { diff --git a/src/LibHac/IO/IAttributeFileSystem.cs b/src/LibHac/Fs/IAttributeFileSystem.cs similarity index 91% rename from src/LibHac/IO/IAttributeFileSystem.cs rename to src/LibHac/Fs/IAttributeFileSystem.cs index 3c624549..e5a4858d 100644 --- a/src/LibHac/IO/IAttributeFileSystem.cs +++ b/src/LibHac/Fs/IAttributeFileSystem.cs @@ -1,4 +1,4 @@ -namespace LibHac.IO +namespace LibHac.Fs { public interface IAttributeFileSystem : IFileSystem { diff --git a/src/LibHac/IO/IDirectory.cs b/src/LibHac/Fs/IDirectory.cs similarity index 98% rename from src/LibHac/IO/IDirectory.cs rename to src/LibHac/Fs/IDirectory.cs index a22c0ea1..fb214d1a 100644 --- a/src/LibHac/IO/IDirectory.cs +++ b/src/LibHac/Fs/IDirectory.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace LibHac.IO +namespace LibHac.Fs { /// /// Provides an interface for enumerating the child entries of a directory. diff --git a/src/LibHac/IO/IFile.cs b/src/LibHac/Fs/IFile.cs similarity index 99% rename from src/LibHac/IO/IFile.cs rename to src/LibHac/Fs/IFile.cs index 4367479f..d3d34848 100644 --- a/src/LibHac/IO/IFile.cs +++ b/src/LibHac/Fs/IFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { /// /// Provides an interface for reading and writing a sequence of bytes. diff --git a/src/LibHac/IO/IFileSystem.cs b/src/LibHac/Fs/IFileSystem.cs similarity index 99% rename from src/LibHac/IO/IFileSystem.cs rename to src/LibHac/Fs/IFileSystem.cs index 54929a2f..1594808d 100644 --- a/src/LibHac/IO/IFileSystem.cs +++ b/src/LibHac/Fs/IFileSystem.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { /// /// Provides an interface for accessing a file system. / is used as the path delimiter. diff --git a/src/LibHac/IO/IStorage.cs b/src/LibHac/Fs/IStorage.cs similarity index 99% rename from src/LibHac/IO/IStorage.cs rename to src/LibHac/Fs/IStorage.cs index 9f55679c..7008d50c 100644 --- a/src/LibHac/IO/IStorage.cs +++ b/src/LibHac/Fs/IStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { /// /// Provides an interface for reading and writing a sequence of bytes. diff --git a/src/LibHac/IO/IndirectStorage.cs b/src/LibHac/Fs/IndirectStorage.cs similarity index 99% rename from src/LibHac/IO/IndirectStorage.cs rename to src/LibHac/Fs/IndirectStorage.cs index b864797e..1374e453 100644 --- a/src/LibHac/IO/IndirectStorage.cs +++ b/src/LibHac/Fs/IndirectStorage.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace LibHac.IO +namespace LibHac.Fs { public class IndirectStorage : StorageBase { diff --git a/src/LibHac/IO/IntegrityVerificationStorage.cs b/src/LibHac/Fs/IntegrityVerificationStorage.cs similarity index 99% rename from src/LibHac/IO/IntegrityVerificationStorage.cs rename to src/LibHac/Fs/IntegrityVerificationStorage.cs index d5e41cee..a9fb12b4 100644 --- a/src/LibHac/IO/IntegrityVerificationStorage.cs +++ b/src/LibHac/Fs/IntegrityVerificationStorage.cs @@ -2,9 +2,9 @@ using System.Buffers; using System.IO; using System.Security.Cryptography; -using LibHac.IO.Save; +using LibHac.Fs.Save; -namespace LibHac.IO +namespace LibHac.Fs { public class IntegrityVerificationStorage : SectorStorage { diff --git a/src/LibHac/IO/LayeredFileSystem.cs b/src/LibHac/Fs/LayeredFileSystem.cs similarity index 99% rename from src/LibHac/IO/LayeredFileSystem.cs rename to src/LibHac/Fs/LayeredFileSystem.cs index 1562e2bf..f5248729 100644 --- a/src/LibHac/IO/LayeredFileSystem.cs +++ b/src/LibHac/Fs/LayeredFileSystem.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class LayeredFileSystem : IFileSystem { diff --git a/src/LibHac/IO/LayeredFileSystemDirectory.cs b/src/LibHac/Fs/LayeredFileSystemDirectory.cs similarity index 98% rename from src/LibHac/IO/LayeredFileSystemDirectory.cs rename to src/LibHac/Fs/LayeredFileSystemDirectory.cs index 8773ac1f..ee980bc4 100644 --- a/src/LibHac/IO/LayeredFileSystemDirectory.cs +++ b/src/LibHac/Fs/LayeredFileSystemDirectory.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace LibHac.IO +namespace LibHac.Fs { public class LayeredFileSystemDirectory : IDirectory { diff --git a/src/LibHac/IO/LocalDirectory.cs b/src/LibHac/Fs/LocalDirectory.cs similarity index 99% rename from src/LibHac/IO/LocalDirectory.cs rename to src/LibHac/Fs/LocalDirectory.cs index 4723bcfd..7d6c21f1 100644 --- a/src/LibHac/IO/LocalDirectory.cs +++ b/src/LibHac/Fs/LocalDirectory.cs @@ -2,7 +2,7 @@ using System.IO; using System.Runtime.CompilerServices; -namespace LibHac.IO +namespace LibHac.Fs { public class LocalDirectory : IDirectory { diff --git a/src/LibHac/IO/LocalFile.cs b/src/LibHac/Fs/LocalFile.cs similarity index 98% rename from src/LibHac/IO/LocalFile.cs rename to src/LibHac/Fs/LocalFile.cs index b5906499..6ea5d664 100644 --- a/src/LibHac/IO/LocalFile.cs +++ b/src/LibHac/Fs/LocalFile.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class LocalFile : FileBase { diff --git a/src/LibHac/IO/LocalFileSystem.cs b/src/LibHac/Fs/LocalFileSystem.cs similarity index 99% rename from src/LibHac/IO/LocalFileSystem.cs rename to src/LibHac/Fs/LocalFileSystem.cs index 0f2206ca..166faf65 100644 --- a/src/LibHac/IO/LocalFileSystem.cs +++ b/src/LibHac/Fs/LocalFileSystem.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class LocalFileSystem : IAttributeFileSystem { diff --git a/src/LibHac/IO/LocalStorage.cs b/src/LibHac/Fs/LocalStorage.cs similarity index 98% rename from src/LibHac/IO/LocalStorage.cs rename to src/LibHac/Fs/LocalStorage.cs index b874e032..6d990699 100644 --- a/src/LibHac/IO/LocalStorage.cs +++ b/src/LibHac/Fs/LocalStorage.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class LocalStorage : StorageBase { diff --git a/src/LibHac/IO/MemoryStorage.cs b/src/LibHac/Fs/MemoryStorage.cs similarity index 99% rename from src/LibHac/IO/MemoryStorage.cs rename to src/LibHac/Fs/MemoryStorage.cs index 95975b29..b1b17b79 100644 --- a/src/LibHac/IO/MemoryStorage.cs +++ b/src/LibHac/Fs/MemoryStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class MemoryStorage : StorageBase { diff --git a/src/LibHac/IO/Messages.cs b/src/LibHac/Fs/Messages.cs similarity index 95% rename from src/LibHac/IO/Messages.cs rename to src/LibHac/Fs/Messages.cs index f60781ea..c9835942 100644 --- a/src/LibHac/IO/Messages.cs +++ b/src/LibHac/Fs/Messages.cs @@ -1,4 +1,4 @@ -namespace LibHac.IO +namespace LibHac.Fs { internal static class Messages { diff --git a/src/LibHac/IO/NcaUtils/Nca.cs b/src/LibHac/Fs/NcaUtils/Nca.cs similarity index 99% rename from src/LibHac/IO/NcaUtils/Nca.cs rename to src/LibHac/Fs/NcaUtils/Nca.cs index fd591328..420e615e 100644 --- a/src/LibHac/IO/NcaUtils/Nca.cs +++ b/src/LibHac/Fs/NcaUtils/Nca.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using LibHac.IO.RomFs; +using LibHac.Fs.RomFs; -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { public class Nca { diff --git a/src/LibHac/IO/NcaUtils/NcaExtensions.cs b/src/LibHac/Fs/NcaUtils/NcaExtensions.cs similarity index 99% rename from src/LibHac/IO/NcaUtils/NcaExtensions.cs rename to src/LibHac/Fs/NcaUtils/NcaExtensions.cs index eb3ddd15..42f8bb0e 100644 --- a/src/LibHac/IO/NcaUtils/NcaExtensions.cs +++ b/src/LibHac/Fs/NcaUtils/NcaExtensions.cs @@ -2,7 +2,7 @@ using System.Buffers.Binary; using System.Diagnostics; -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { public static class NcaExtensions { diff --git a/src/LibHac/IO/NcaUtils/NcaFsHeader.cs b/src/LibHac/Fs/NcaUtils/NcaFsHeader.cs similarity index 99% rename from src/LibHac/IO/NcaUtils/NcaFsHeader.cs rename to src/LibHac/Fs/NcaUtils/NcaFsHeader.cs index e4dd22f1..e9dd9f52 100644 --- a/src/LibHac/IO/NcaUtils/NcaFsHeader.cs +++ b/src/LibHac/Fs/NcaUtils/NcaFsHeader.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; // ReSharper disable ImpureMethodCallOnReadonlyValueField -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { public struct NcaFsHeader { diff --git a/src/LibHac/IO/NcaUtils/NcaFsIntegrityInfoIvfc.cs b/src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoIvfc.cs similarity index 98% rename from src/LibHac/IO/NcaUtils/NcaFsIntegrityInfoIvfc.cs rename to src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoIvfc.cs index 039cc724..5f42be72 100644 --- a/src/LibHac/IO/NcaUtils/NcaFsIntegrityInfoIvfc.cs +++ b/src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoIvfc.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { public struct NcaFsIntegrityInfoIvfc { diff --git a/src/LibHac/IO/NcaUtils/NcaFsIntegrityInfoSha256.cs b/src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoSha256.cs similarity index 98% rename from src/LibHac/IO/NcaUtils/NcaFsIntegrityInfoSha256.cs rename to src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoSha256.cs index fb26aca4..785f339d 100644 --- a/src/LibHac/IO/NcaUtils/NcaFsIntegrityInfoSha256.cs +++ b/src/LibHac/Fs/NcaUtils/NcaFsIntegrityInfoSha256.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { public struct NcaFsIntegrityInfoSha256 { diff --git a/src/LibHac/IO/NcaUtils/NcaFsPatchInfo.cs b/src/LibHac/Fs/NcaUtils/NcaFsPatchInfo.cs similarity index 98% rename from src/LibHac/IO/NcaUtils/NcaFsPatchInfo.cs rename to src/LibHac/Fs/NcaUtils/NcaFsPatchInfo.cs index 2af4433f..5e75fba4 100644 --- a/src/LibHac/IO/NcaUtils/NcaFsPatchInfo.cs +++ b/src/LibHac/Fs/NcaUtils/NcaFsPatchInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { public struct NcaFsPatchInfo { diff --git a/src/LibHac/IO/NcaUtils/NcaHeader.cs b/src/LibHac/Fs/NcaUtils/NcaHeader.cs similarity index 99% rename from src/LibHac/IO/NcaUtils/NcaHeader.cs rename to src/LibHac/Fs/NcaUtils/NcaHeader.cs index 96a9841f..0466c328 100644 --- a/src/LibHac/IO/NcaUtils/NcaHeader.cs +++ b/src/LibHac/Fs/NcaUtils/NcaHeader.cs @@ -3,7 +3,7 @@ using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { public struct NcaHeader { diff --git a/src/LibHac/IO/NcaUtils/NcaKeyType.cs b/src/LibHac/Fs/NcaUtils/NcaKeyType.cs similarity index 79% rename from src/LibHac/IO/NcaUtils/NcaKeyType.cs rename to src/LibHac/Fs/NcaUtils/NcaKeyType.cs index 11c41a69..ac9d419e 100644 --- a/src/LibHac/IO/NcaUtils/NcaKeyType.cs +++ b/src/LibHac/Fs/NcaUtils/NcaKeyType.cs @@ -1,4 +1,4 @@ -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { internal enum NcaKeyType { diff --git a/src/LibHac/IO/NcaUtils/NcaStructs.cs b/src/LibHac/Fs/NcaUtils/NcaStructs.cs similarity index 98% rename from src/LibHac/IO/NcaUtils/NcaStructs.cs rename to src/LibHac/Fs/NcaUtils/NcaStructs.cs index 45710568..cb583f34 100644 --- a/src/LibHac/IO/NcaUtils/NcaStructs.cs +++ b/src/LibHac/Fs/NcaUtils/NcaStructs.cs @@ -1,4 +1,4 @@ -namespace LibHac.IO.NcaUtils +namespace LibHac.Fs.NcaUtils { public class TitleVersion { diff --git a/src/LibHac/IO/NullFile.cs b/src/LibHac/Fs/NullFile.cs similarity index 97% rename from src/LibHac/IO/NullFile.cs rename to src/LibHac/Fs/NullFile.cs index c2f3337e..f45d9f3f 100644 --- a/src/LibHac/IO/NullFile.cs +++ b/src/LibHac/Fs/NullFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class NullFile : FileBase { diff --git a/src/LibHac/IO/NullStorage.cs b/src/LibHac/Fs/NullStorage.cs similarity index 97% rename from src/LibHac/IO/NullStorage.cs rename to src/LibHac/Fs/NullStorage.cs index b31bfa26..83c6dbfe 100644 --- a/src/LibHac/IO/NullStorage.cs +++ b/src/LibHac/Fs/NullStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { /// /// An that returns all zeros when read, and does nothing on write. diff --git a/src/LibHac/IO/NxFileStream.cs b/src/LibHac/Fs/NxFileStream.cs similarity index 99% rename from src/LibHac/IO/NxFileStream.cs rename to src/LibHac/Fs/NxFileStream.cs index 9e6406a8..5720e81e 100644 --- a/src/LibHac/IO/NxFileStream.cs +++ b/src/LibHac/Fs/NxFileStream.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class NxFileStream : Stream { diff --git a/src/LibHac/IO/PartitionDirectory.cs b/src/LibHac/Fs/PartitionDirectory.cs similarity index 98% rename from src/LibHac/IO/PartitionDirectory.cs rename to src/LibHac/Fs/PartitionDirectory.cs index 45240391..99dc6102 100644 --- a/src/LibHac/IO/PartitionDirectory.cs +++ b/src/LibHac/Fs/PartitionDirectory.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class PartitionDirectory : IDirectory { diff --git a/src/LibHac/IO/PartitionFile.cs b/src/LibHac/Fs/PartitionFile.cs similarity index 98% rename from src/LibHac/IO/PartitionFile.cs rename to src/LibHac/Fs/PartitionFile.cs index fa1a5083..a84bf375 100644 --- a/src/LibHac/IO/PartitionFile.cs +++ b/src/LibHac/Fs/PartitionFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class PartitionFile : FileBase { diff --git a/src/LibHac/IO/PartitionFileSystem.cs b/src/LibHac/Fs/PartitionFileSystem.cs similarity index 99% rename from src/LibHac/IO/PartitionFileSystem.cs rename to src/LibHac/Fs/PartitionFileSystem.cs index 239bc8b3..42967074 100644 --- a/src/LibHac/IO/PartitionFileSystem.cs +++ b/src/LibHac/Fs/PartitionFileSystem.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Text; -namespace LibHac.IO +namespace LibHac.Fs { public class PartitionFileSystem : IFileSystem { diff --git a/src/LibHac/IO/PartitionFileSystemBuilder.cs b/src/LibHac/Fs/PartitionFileSystemBuilder.cs similarity index 99% rename from src/LibHac/IO/PartitionFileSystemBuilder.cs rename to src/LibHac/Fs/PartitionFileSystemBuilder.cs index cec52bc2..62fdd00b 100644 --- a/src/LibHac/IO/PartitionFileSystemBuilder.cs +++ b/src/LibHac/Fs/PartitionFileSystemBuilder.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Security.Cryptography; using System.Text; -namespace LibHac.IO +namespace LibHac.Fs { public class PartitionFileSystemBuilder { diff --git a/src/LibHac/IO/PathParser.cs b/src/LibHac/Fs/PathParser.cs similarity index 99% rename from src/LibHac/IO/PathParser.cs rename to src/LibHac/Fs/PathParser.cs index a081fa27..afe148cf 100644 --- a/src/LibHac/IO/PathParser.cs +++ b/src/LibHac/Fs/PathParser.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics; -namespace LibHac.IO +namespace LibHac.Fs { /// /// Enumerates a file or directory path one segment at a time. diff --git a/src/LibHac/IO/PathTools.cs b/src/LibHac/Fs/PathTools.cs similarity index 99% rename from src/LibHac/IO/PathTools.cs rename to src/LibHac/Fs/PathTools.cs index 73d368de..840cfb1c 100644 --- a/src/LibHac/IO/PathTools.cs +++ b/src/LibHac/Fs/PathTools.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; -namespace LibHac.IO +namespace LibHac.Fs { public static class PathTools { diff --git a/src/LibHac/IO/RomFs/HierarchicalRomFileTable.cs b/src/LibHac/Fs/RomFs/HierarchicalRomFileTable.cs similarity index 99% rename from src/LibHac/IO/RomFs/HierarchicalRomFileTable.cs rename to src/LibHac/Fs/RomFs/HierarchicalRomFileTable.cs index 3ca47d0c..a9b7f033 100644 --- a/src/LibHac/IO/RomFs/HierarchicalRomFileTable.cs +++ b/src/LibHac/Fs/RomFs/HierarchicalRomFileTable.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace LibHac.IO.RomFs +namespace LibHac.Fs.RomFs { /// /// Represents the file table used by the RomFS format. diff --git a/src/LibHac/IO/RomFs/RomFsBuilder.cs b/src/LibHac/Fs/RomFs/RomFsBuilder.cs similarity index 99% rename from src/LibHac/IO/RomFs/RomFsBuilder.cs rename to src/LibHac/Fs/RomFs/RomFsBuilder.cs index 328be117..caeed1c0 100644 --- a/src/LibHac/IO/RomFs/RomFsBuilder.cs +++ b/src/LibHac/Fs/RomFs/RomFsBuilder.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace LibHac.IO.RomFs +namespace LibHac.Fs.RomFs { /// /// Builds a RomFS from a collection of files. diff --git a/src/LibHac/IO/RomFs/RomFsDictionary.cs b/src/LibHac/Fs/RomFs/RomFsDictionary.cs similarity index 99% rename from src/LibHac/IO/RomFs/RomFsDictionary.cs rename to src/LibHac/Fs/RomFs/RomFsDictionary.cs index 6326ee4b..0b414e1e 100644 --- a/src/LibHac/IO/RomFs/RomFsDictionary.cs +++ b/src/LibHac/Fs/RomFs/RomFsDictionary.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.IO.RomFs +namespace LibHac.Fs.RomFs { internal class RomFsDictionary where T : unmanaged { diff --git a/src/LibHac/IO/RomFs/RomFsDirectory.cs b/src/LibHac/Fs/RomFs/RomFsDirectory.cs similarity index 98% rename from src/LibHac/IO/RomFs/RomFsDirectory.cs rename to src/LibHac/Fs/RomFs/RomFsDirectory.cs index a7b745c9..90ca4d98 100644 --- a/src/LibHac/IO/RomFs/RomFsDirectory.cs +++ b/src/LibHac/Fs/RomFs/RomFsDirectory.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace LibHac.IO.RomFs +namespace LibHac.Fs.RomFs { public class RomFsDirectory : IDirectory { diff --git a/src/LibHac/IO/RomFs/RomFsEntries.cs b/src/LibHac/Fs/RomFs/RomFsEntries.cs similarity index 98% rename from src/LibHac/IO/RomFs/RomFsEntries.cs rename to src/LibHac/Fs/RomFs/RomFsEntries.cs index 9d97e495..3bdd1c56 100644 --- a/src/LibHac/IO/RomFs/RomFsEntries.cs +++ b/src/LibHac/Fs/RomFs/RomFsEntries.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace LibHac.IO.RomFs +namespace LibHac.Fs.RomFs { internal ref struct RomEntryKey { diff --git a/src/LibHac/IO/RomFs/RomFsFile.cs b/src/LibHac/Fs/RomFs/RomFsFile.cs similarity index 97% rename from src/LibHac/IO/RomFs/RomFsFile.cs rename to src/LibHac/Fs/RomFs/RomFsFile.cs index 73a445fc..419fe834 100644 --- a/src/LibHac/IO/RomFs/RomFsFile.cs +++ b/src/LibHac/Fs/RomFs/RomFsFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO.RomFs +namespace LibHac.Fs.RomFs { public class RomFsFile : FileBase { diff --git a/src/LibHac/IO/RomFs/RomFsFileSystem.cs b/src/LibHac/Fs/RomFs/RomFsFileSystem.cs similarity index 99% rename from src/LibHac/IO/RomFs/RomFsFileSystem.cs rename to src/LibHac/Fs/RomFs/RomFsFileSystem.cs index 9addfbdd..4086f770 100644 --- a/src/LibHac/IO/RomFs/RomFsFileSystem.cs +++ b/src/LibHac/Fs/RomFs/RomFsFileSystem.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO.RomFs +namespace LibHac.Fs.RomFs { public class RomFsFileSystem : IFileSystem { diff --git a/src/LibHac/IO/Save/AllocationTable.cs b/src/LibHac/Fs/Save/AllocationTable.cs similarity index 99% rename from src/LibHac/IO/Save/AllocationTable.cs rename to src/LibHac/Fs/Save/AllocationTable.cs index a10a5b80..c5e47e38 100644 --- a/src/LibHac/IO/Save/AllocationTable.cs +++ b/src/LibHac/Fs/Save/AllocationTable.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class AllocationTable { diff --git a/src/LibHac/IO/Save/AllocationTableIterator.cs b/src/LibHac/Fs/Save/AllocationTableIterator.cs similarity index 98% rename from src/LibHac/IO/Save/AllocationTableIterator.cs rename to src/LibHac/Fs/Save/AllocationTableIterator.cs index a7c8511b..e97b79e9 100644 --- a/src/LibHac/IO/Save/AllocationTableIterator.cs +++ b/src/LibHac/Fs/Save/AllocationTableIterator.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class AllocationTableIterator { diff --git a/src/LibHac/IO/Save/AllocationTableStorage.cs b/src/LibHac/Fs/Save/AllocationTableStorage.cs similarity index 99% rename from src/LibHac/IO/Save/AllocationTableStorage.cs rename to src/LibHac/Fs/Save/AllocationTableStorage.cs index 172539bc..d210bd10 100644 --- a/src/LibHac/IO/Save/AllocationTableStorage.cs +++ b/src/LibHac/Fs/Save/AllocationTableStorage.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class AllocationTableStorage : StorageBase { diff --git a/src/LibHac/IO/Save/DuplexBitmap.cs b/src/LibHac/Fs/Save/DuplexBitmap.cs similarity index 97% rename from src/LibHac/IO/Save/DuplexBitmap.cs rename to src/LibHac/Fs/Save/DuplexBitmap.cs index 19dc6929..649ef785 100644 --- a/src/LibHac/IO/Save/DuplexBitmap.cs +++ b/src/LibHac/Fs/Save/DuplexBitmap.cs @@ -2,7 +2,7 @@ using System.Collections; using System.IO; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class DuplexBitmap { diff --git a/src/LibHac/IO/Save/DuplexStorage.cs b/src/LibHac/Fs/Save/DuplexStorage.cs similarity index 99% rename from src/LibHac/IO/Save/DuplexStorage.cs rename to src/LibHac/Fs/Save/DuplexStorage.cs index 2f0e8968..890a519c 100644 --- a/src/LibHac/IO/Save/DuplexStorage.cs +++ b/src/LibHac/Fs/Save/DuplexStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class DuplexStorage : StorageBase { diff --git a/src/LibHac/IO/Save/Header.cs b/src/LibHac/Fs/Save/Header.cs similarity index 99% rename from src/LibHac/IO/Save/Header.cs rename to src/LibHac/Fs/Save/Header.cs index a90bdf3e..d6d06a67 100644 --- a/src/LibHac/IO/Save/Header.cs +++ b/src/LibHac/Fs/Save/Header.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class Header { diff --git a/src/LibHac/IO/Save/HierarchicalDuplexStorage.cs b/src/LibHac/Fs/Save/HierarchicalDuplexStorage.cs similarity index 98% rename from src/LibHac/IO/Save/HierarchicalDuplexStorage.cs rename to src/LibHac/Fs/Save/HierarchicalDuplexStorage.cs index d1230fcd..df24abd4 100644 --- a/src/LibHac/IO/Save/HierarchicalDuplexStorage.cs +++ b/src/LibHac/Fs/Save/HierarchicalDuplexStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class HierarchicalDuplexStorage : StorageBase { diff --git a/src/LibHac/IO/Save/HierarchicalSaveFileTable.cs b/src/LibHac/Fs/Save/HierarchicalSaveFileTable.cs similarity index 99% rename from src/LibHac/IO/Save/HierarchicalSaveFileTable.cs rename to src/LibHac/Fs/Save/HierarchicalSaveFileTable.cs index 5440ad82..fe63c34d 100644 --- a/src/LibHac/IO/Save/HierarchicalSaveFileTable.cs +++ b/src/LibHac/Fs/Save/HierarchicalSaveFileTable.cs @@ -2,7 +2,7 @@ using System.IO; using System.Runtime.InteropServices; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class HierarchicalSaveFileTable { diff --git a/src/LibHac/IO/Save/JournalMap.cs b/src/LibHac/Fs/Save/JournalMap.cs similarity index 99% rename from src/LibHac/IO/Save/JournalMap.cs rename to src/LibHac/Fs/Save/JournalMap.cs index fc89bcdc..d49af98c 100644 --- a/src/LibHac/IO/Save/JournalMap.cs +++ b/src/LibHac/Fs/Save/JournalMap.cs @@ -1,6 +1,6 @@ using System.IO; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class JournalMap { diff --git a/src/LibHac/IO/Save/JournalStorage.cs b/src/LibHac/Fs/Save/JournalStorage.cs similarity index 99% rename from src/LibHac/IO/Save/JournalStorage.cs rename to src/LibHac/Fs/Save/JournalStorage.cs index a29fdc26..91e4f809 100644 --- a/src/LibHac/IO/Save/JournalStorage.cs +++ b/src/LibHac/Fs/Save/JournalStorage.cs @@ -2,7 +2,7 @@ using System.Collections; using System.IO; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class JournalStorage : StorageBase { diff --git a/src/LibHac/IO/Save/RemapStorage.cs b/src/LibHac/Fs/Save/RemapStorage.cs similarity index 99% rename from src/LibHac/IO/Save/RemapStorage.cs rename to src/LibHac/Fs/Save/RemapStorage.cs index 12374c3d..d1de2442 100644 --- a/src/LibHac/IO/Save/RemapStorage.cs +++ b/src/LibHac/Fs/Save/RemapStorage.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class RemapStorage : StorageBase { diff --git a/src/LibHac/IO/Save/SaveDataDirectory.cs b/src/LibHac/Fs/Save/SaveDataDirectory.cs similarity index 98% rename from src/LibHac/IO/Save/SaveDataDirectory.cs rename to src/LibHac/Fs/Save/SaveDataDirectory.cs index 074fb59b..6784ef08 100644 --- a/src/LibHac/IO/Save/SaveDataDirectory.cs +++ b/src/LibHac/Fs/Save/SaveDataDirectory.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class SaveDataDirectory : IDirectory { diff --git a/src/LibHac/IO/Save/SaveDataFile.cs b/src/LibHac/Fs/Save/SaveDataFile.cs similarity index 98% rename from src/LibHac/IO/Save/SaveDataFile.cs rename to src/LibHac/Fs/Save/SaveDataFile.cs index 24ce1e1a..4dd23161 100644 --- a/src/LibHac/IO/Save/SaveDataFile.cs +++ b/src/LibHac/Fs/Save/SaveDataFile.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class SaveDataFile : FileBase { diff --git a/src/LibHac/IO/Save/SaveDataFileSystem.cs b/src/LibHac/Fs/Save/SaveDataFileSystem.cs similarity index 99% rename from src/LibHac/IO/Save/SaveDataFileSystem.cs rename to src/LibHac/Fs/Save/SaveDataFileSystem.cs index 223d70be..08163694 100644 --- a/src/LibHac/IO/Save/SaveDataFileSystem.cs +++ b/src/LibHac/Fs/Save/SaveDataFileSystem.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class SaveDataFileSystem : IFileSystem { diff --git a/src/LibHac/IO/Save/SaveDataFileSystemCore.cs b/src/LibHac/Fs/Save/SaveDataFileSystemCore.cs similarity index 99% rename from src/LibHac/IO/Save/SaveDataFileSystemCore.cs rename to src/LibHac/Fs/Save/SaveDataFileSystemCore.cs index 9f4e8b69..48e25eb3 100644 --- a/src/LibHac/IO/Save/SaveDataFileSystemCore.cs +++ b/src/LibHac/Fs/Save/SaveDataFileSystemCore.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public class SaveDataFileSystemCore : IFileSystem { diff --git a/src/LibHac/IO/Save/SaveExtensions.cs b/src/LibHac/Fs/Save/SaveExtensions.cs similarity index 94% rename from src/LibHac/IO/Save/SaveExtensions.cs rename to src/LibHac/Fs/Save/SaveExtensions.cs index 64d114f8..6c1ed069 100644 --- a/src/LibHac/IO/Save/SaveExtensions.cs +++ b/src/LibHac/Fs/Save/SaveExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { public static class SaveExtensions { diff --git a/src/LibHac/IO/Save/SaveFsEntries.cs b/src/LibHac/Fs/Save/SaveFsEntries.cs similarity index 97% rename from src/LibHac/IO/Save/SaveFsEntries.cs rename to src/LibHac/Fs/Save/SaveFsEntries.cs index 625e5ba5..1a4c14a7 100644 --- a/src/LibHac/IO/Save/SaveFsEntries.cs +++ b/src/LibHac/Fs/Save/SaveFsEntries.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { internal ref struct SaveEntryKey { diff --git a/src/LibHac/IO/Save/SaveFsEntry.cs b/src/LibHac/Fs/Save/SaveFsEntry.cs similarity index 99% rename from src/LibHac/IO/Save/SaveFsEntry.cs rename to src/LibHac/Fs/Save/SaveFsEntry.cs index 2e8401e3..085b3897 100644 --- a/src/LibHac/IO/Save/SaveFsEntry.cs +++ b/src/LibHac/Fs/Save/SaveFsEntry.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.IO; using System.Text; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { [DebuggerDisplay("{" + nameof(FullPath) + "}")] public abstract class SaveFsEntry diff --git a/src/LibHac/IO/Save/SaveFsList.cs b/src/LibHac/Fs/Save/SaveFsList.cs similarity index 99% rename from src/LibHac/IO/Save/SaveFsList.cs rename to src/LibHac/Fs/Save/SaveFsList.cs index ea2c3883..668bb669 100644 --- a/src/LibHac/IO/Save/SaveFsList.cs +++ b/src/LibHac/Fs/Save/SaveFsList.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.IO.Save +namespace LibHac.Fs.Save { internal class SaveFsList where T : struct { diff --git a/src/LibHac/IO/SectorStorage.cs b/src/LibHac/Fs/SectorStorage.cs similarity index 98% rename from src/LibHac/IO/SectorStorage.cs rename to src/LibHac/Fs/SectorStorage.cs index 4db475a0..7e3efee7 100644 --- a/src/LibHac/IO/SectorStorage.cs +++ b/src/LibHac/Fs/SectorStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class SectorStorage : StorageBase { diff --git a/src/LibHac/IO/StorageBase.cs b/src/LibHac/Fs/StorageBase.cs similarity index 99% rename from src/LibHac/IO/StorageBase.cs rename to src/LibHac/Fs/StorageBase.cs index 04195b3b..ab36a1c7 100644 --- a/src/LibHac/IO/StorageBase.cs +++ b/src/LibHac/Fs/StorageBase.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace LibHac.IO +namespace LibHac.Fs { public abstract class StorageBase : IStorage { diff --git a/src/LibHac/IO/StorageExtensions.cs b/src/LibHac/Fs/StorageExtensions.cs similarity index 99% rename from src/LibHac/IO/StorageExtensions.cs rename to src/LibHac/Fs/StorageExtensions.cs index 3adae66e..6b6050cb 100644 --- a/src/LibHac/IO/StorageExtensions.cs +++ b/src/LibHac/Fs/StorageExtensions.cs @@ -3,7 +3,7 @@ using System.Buffers; using System.IO; using System.Runtime.InteropServices; -namespace LibHac.IO +namespace LibHac.Fs { public static class StorageExtensions { diff --git a/src/LibHac/IO/StorageFile.cs b/src/LibHac/Fs/StorageFile.cs similarity index 98% rename from src/LibHac/IO/StorageFile.cs rename to src/LibHac/Fs/StorageFile.cs index af325a31..8462e53a 100644 --- a/src/LibHac/IO/StorageFile.cs +++ b/src/LibHac/Fs/StorageFile.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class StorageFile : FileBase { diff --git a/src/LibHac/IO/StorageStream.cs b/src/LibHac/Fs/StorageStream.cs similarity index 99% rename from src/LibHac/IO/StorageStream.cs rename to src/LibHac/Fs/StorageStream.cs index da0bfdd2..bbd3d6e9 100644 --- a/src/LibHac/IO/StorageStream.cs +++ b/src/LibHac/Fs/StorageStream.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class StorageStream : Stream { diff --git a/src/LibHac/IO/StreamFile.cs b/src/LibHac/Fs/StreamFile.cs similarity index 99% rename from src/LibHac/IO/StreamFile.cs rename to src/LibHac/Fs/StreamFile.cs index bf241356..42129f79 100644 --- a/src/LibHac/IO/StreamFile.cs +++ b/src/LibHac/Fs/StreamFile.cs @@ -5,7 +5,7 @@ using System.IO; using System.Buffers; #endif -namespace LibHac.IO +namespace LibHac.Fs { /// /// Provides an interface for interacting with a diff --git a/src/LibHac/IO/StreamStorage.cs b/src/LibHac/Fs/StreamStorage.cs similarity index 99% rename from src/LibHac/IO/StreamStorage.cs rename to src/LibHac/Fs/StreamStorage.cs index 81596b4d..154caa51 100644 --- a/src/LibHac/IO/StreamStorage.cs +++ b/src/LibHac/Fs/StreamStorage.cs @@ -5,7 +5,7 @@ using System.IO; using System.Buffers; #endif -namespace LibHac.IO +namespace LibHac.Fs { public class StreamStorage : StorageBase { diff --git a/src/LibHac/IO/SubStorage.cs b/src/LibHac/Fs/SubStorage.cs similarity index 99% rename from src/LibHac/IO/SubStorage.cs rename to src/LibHac/Fs/SubStorage.cs index 4d9c254a..710cce14 100644 --- a/src/LibHac/IO/SubStorage.cs +++ b/src/LibHac/Fs/SubStorage.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.IO +namespace LibHac.Fs { public class SubStorage : StorageBase { diff --git a/src/LibHac/IO/SubdirectoryFileSystem.cs b/src/LibHac/Fs/SubdirectoryFileSystem.cs similarity index 99% rename from src/LibHac/IO/SubdirectoryFileSystem.cs rename to src/LibHac/Fs/SubdirectoryFileSystem.cs index 03ae9f39..26037ffb 100644 --- a/src/LibHac/IO/SubdirectoryFileSystem.cs +++ b/src/LibHac/Fs/SubdirectoryFileSystem.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.IO +namespace LibHac.Fs { public class SubdirectoryFileSystem : IFileSystem { diff --git a/src/LibHac/IO/SubdirectoryFileSystemDirectory.cs b/src/LibHac/Fs/SubdirectoryFileSystemDirectory.cs similarity index 97% rename from src/LibHac/IO/SubdirectoryFileSystemDirectory.cs rename to src/LibHac/Fs/SubdirectoryFileSystemDirectory.cs index 55422183..bafcafc7 100644 --- a/src/LibHac/IO/SubdirectoryFileSystemDirectory.cs +++ b/src/LibHac/Fs/SubdirectoryFileSystemDirectory.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace LibHac.IO +namespace LibHac.Fs { public class SubdirectoryFileSystemDirectory : IDirectory { diff --git a/src/LibHac/IO/ValueStringBuilder.cs b/src/LibHac/Fs/ValueStringBuilder.cs similarity index 99% rename from src/LibHac/IO/ValueStringBuilder.cs rename to src/LibHac/Fs/ValueStringBuilder.cs index 68adedd6..93a1f7da 100644 --- a/src/LibHac/IO/ValueStringBuilder.cs +++ b/src/LibHac/Fs/ValueStringBuilder.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace LibHac.IO +namespace LibHac.Fs { internal ref struct ValueStringBuilder { diff --git a/src/LibHac/Keyset.cs b/src/LibHac/Keyset.cs index 9b21266f..698f7337 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.IO; +using LibHac.Fs; namespace LibHac { diff --git a/src/LibHac/Kip.cs b/src/LibHac/Kip.cs index 05a7d8e1..0c154694 100644 --- a/src/LibHac/Kip.cs +++ b/src/LibHac/Kip.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using LibHac.IO; +using LibHac.Fs; namespace LibHac { diff --git a/src/LibHac/Nro.cs b/src/LibHac/Nro.cs index 0fd7b5df..2e09ea80 100644 --- a/src/LibHac/Nro.cs +++ b/src/LibHac/Nro.cs @@ -1,5 +1,5 @@ using System.IO; -using LibHac.IO; +using LibHac.Fs; namespace LibHac { diff --git a/src/LibHac/Nso.cs b/src/LibHac/Nso.cs index 6765af25..d60a76ca 100644 --- a/src/LibHac/Nso.cs +++ b/src/LibHac/Nso.cs @@ -1,6 +1,6 @@ using System.Collections; using System.IO; -using LibHac.IO; +using LibHac.Fs; namespace LibHac { diff --git a/src/LibHac/Package1.cs b/src/LibHac/Package1.cs index 205d6ede..6f57cf98 100644 --- a/src/LibHac/Package1.cs +++ b/src/LibHac/Package1.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using LibHac.IO; +using LibHac.Fs; namespace LibHac { diff --git a/src/LibHac/Package2.cs b/src/LibHac/Package2.cs index a8cad4f0..9714bc25 100644 --- a/src/LibHac/Package2.cs +++ b/src/LibHac/Package2.cs @@ -1,6 +1,6 @@ using System; using System.IO; -using LibHac.IO; +using LibHac.Fs; namespace LibHac { diff --git a/src/LibHac/SwitchFs.cs b/src/LibHac/SwitchFs.cs index 2203feb4..d38d818b 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.IO; -using LibHac.IO.NcaUtils; -using LibHac.IO.Save; +using LibHac.Fs; +using LibHac.Fs.NcaUtils; +using LibHac.Fs.Save; namespace LibHac { diff --git a/src/LibHac/Xci.cs b/src/LibHac/Xci.cs index 72f55f13..3587f12f 100644 --- a/src/LibHac/Xci.cs +++ b/src/LibHac/Xci.cs @@ -1,4 +1,4 @@ -using LibHac.IO; +using LibHac.Fs; namespace LibHac { diff --git a/src/NandReader/Program.cs b/src/NandReader/Program.cs index f7cd5f3c..ec6cbdf1 100644 --- a/src/NandReader/Program.cs +++ b/src/NandReader/Program.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; using System.IO; using LibHac; -using LibHac.IO; -using LibHac.IO.Save; +using LibHac.Fs; +using LibHac.Fs.Save; using LibHac.Nand; namespace NandReader diff --git a/src/NandReaderGui/ViewModel/NandViewModel.cs b/src/NandReaderGui/ViewModel/NandViewModel.cs index 275b2671..8a9d9a7d 100644 --- a/src/NandReaderGui/ViewModel/NandViewModel.cs +++ b/src/NandReaderGui/ViewModel/NandViewModel.cs @@ -6,8 +6,8 @@ using System.Windows.Input; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using LibHac; -using LibHac.IO; -using LibHac.IO.Save; +using LibHac.Fs; +using LibHac.Fs.Save; using LibHac.Nand; namespace NandReaderGui.ViewModel diff --git a/src/hactoolnet/Options.cs b/src/hactoolnet/Options.cs index 353c5253..e1765ed6 100644 --- a/src/hactoolnet/Options.cs +++ b/src/hactoolnet/Options.cs @@ -1,5 +1,5 @@ using LibHac; -using LibHac.IO; +using LibHac.Fs; namespace hactoolnet { diff --git a/src/hactoolnet/Print.cs b/src/hactoolnet/Print.cs index 68d0022a..0cea2972 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.IO; -using LibHac.IO.NcaUtils; +using LibHac.Fs; +using LibHac.Fs.NcaUtils; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessBench.cs b/src/hactoolnet/ProcessBench.cs index 5c32fef5..b68776a2 100644 --- a/src/hactoolnet/ProcessBench.cs +++ b/src/hactoolnet/ProcessBench.cs @@ -1,6 +1,6 @@ using System.Diagnostics; using LibHac; -using LibHac.IO; +using LibHac.Fs; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessDelta.cs b/src/hactoolnet/ProcessDelta.cs index 31ec547f..0c966a34 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.IO; -using LibHac.IO.NcaUtils; +using LibHac.Fs; +using LibHac.Fs.NcaUtils; using static hactoolnet.Print; namespace hactoolnet diff --git a/src/hactoolnet/ProcessFsBuild.cs b/src/hactoolnet/ProcessFsBuild.cs index 85f9fe9c..5d0d06ab 100644 --- a/src/hactoolnet/ProcessFsBuild.cs +++ b/src/hactoolnet/ProcessFsBuild.cs @@ -1,6 +1,6 @@ using System.IO; -using LibHac.IO; -using LibHac.IO.RomFs; +using LibHac.Fs; +using LibHac.Fs.RomFs; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessKip.cs b/src/hactoolnet/ProcessKip.cs index 854eab60..b10e4d35 100644 --- a/src/hactoolnet/ProcessKip.cs +++ b/src/hactoolnet/ProcessKip.cs @@ -1,6 +1,6 @@ using System.IO; using LibHac; -using LibHac.IO; +using LibHac.Fs; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessNca.cs b/src/hactoolnet/ProcessNca.cs index 8e65b5ce..8c59aa6f 100644 --- a/src/hactoolnet/ProcessNca.cs +++ b/src/hactoolnet/ProcessNca.cs @@ -1,8 +1,8 @@ using System.IO; using System.Text; using LibHac; -using LibHac.IO; -using LibHac.IO.NcaUtils; +using LibHac.Fs; +using LibHac.Fs.NcaUtils; using LibHac.Npdm; using static hactoolnet.Print; diff --git a/src/hactoolnet/ProcessPackage.cs b/src/hactoolnet/ProcessPackage.cs index 5669bdce..ee551196 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.IO; +using LibHac.Fs; using static hactoolnet.Print; namespace hactoolnet diff --git a/src/hactoolnet/ProcessPfs.cs b/src/hactoolnet/ProcessPfs.cs index 46f75321..d36c2fec 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.IO; +using LibHac.Fs; using static hactoolnet.Print; namespace hactoolnet diff --git a/src/hactoolnet/ProcessRomfs.cs b/src/hactoolnet/ProcessRomfs.cs index 95b55c4b..cf53df5a 100644 --- a/src/hactoolnet/ProcessRomfs.cs +++ b/src/hactoolnet/ProcessRomfs.cs @@ -1,6 +1,6 @@ using System.IO; -using LibHac.IO; -using LibHac.IO.RomFs; +using LibHac.Fs; +using LibHac.Fs.RomFs; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessSave.cs b/src/hactoolnet/ProcessSave.cs index 5d9488fa..b3d4a576 100644 --- a/src/hactoolnet/ProcessSave.cs +++ b/src/hactoolnet/ProcessSave.cs @@ -4,8 +4,8 @@ using System.IO; using System.Linq; using System.Text; using LibHac; -using LibHac.IO; -using LibHac.IO.Save; +using LibHac.Fs; +using LibHac.Fs.Save; using static hactoolnet.Print; namespace hactoolnet diff --git a/src/hactoolnet/ProcessSwitchFs.cs b/src/hactoolnet/ProcessSwitchFs.cs index a7b57cf8..ddac6b66 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.IO; -using LibHac.IO.NcaUtils; -using LibHac.IO.Save; +using LibHac.Fs; +using LibHac.Fs.NcaUtils; +using LibHac.Fs.Save; namespace hactoolnet { diff --git a/src/hactoolnet/ProcessXci.cs b/src/hactoolnet/ProcessXci.cs index 43e3638e..cbddcfdb 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.IO; -using LibHac.IO.NcaUtils; +using LibHac.Fs; +using LibHac.Fs.NcaUtils; using static hactoolnet.Print; namespace hactoolnet diff --git a/tests/LibHac.Tests/AesXts.cs b/tests/LibHac.Tests/AesXts.cs index 1cbe4406..b2dd51dd 100644 --- a/tests/LibHac.Tests/AesXts.cs +++ b/tests/LibHac.Tests/AesXts.cs @@ -1,5 +1,5 @@ using System.Linq; -using LibHac.IO; +using LibHac.Fs; using Xunit; namespace LibHac.Tests diff --git a/tests/LibHac.Tests/PathToolsTests.cs b/tests/LibHac.Tests/PathToolsTests.cs index 7b9cc63a..636ac904 100644 --- a/tests/LibHac.Tests/PathToolsTests.cs +++ b/tests/LibHac.Tests/PathToolsTests.cs @@ -1,5 +1,5 @@ using System; -using LibHac.IO; +using LibHac.Fs; using Xunit; namespace LibHac.Tests diff --git a/tests/LibHac.Tests/RomFsTests.cs b/tests/LibHac.Tests/RomFsTests.cs index dbbd5ec0..05310b2e 100644 --- a/tests/LibHac.Tests/RomFsTests.cs +++ b/tests/LibHac.Tests/RomFsTests.cs @@ -1,5 +1,5 @@ using System; -using LibHac.IO.RomFs; +using LibHac.Fs.RomFs; using Xunit; namespace LibHac.Tests