diff --git a/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs index d25367be..9c706a84 100644 --- a/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs +++ b/src/LibHac/FsSrv/FsCreator/SaveDataFileSystemCreator.cs @@ -6,7 +6,7 @@ using LibHac.Diag; using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; -using LibHac.FsSystem.Save; +using LibHac.Tools.FsSystem.Save; using LibHac.Util; using OpenType = LibHac.FsSrv.SaveDataOpenTypeSetFileStorage.OpenType; @@ -123,4 +123,4 @@ public class SaveDataFileSystemCreator : ISaveDataFileSystemCreator { throw new NotImplementedException(); } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/BufferedStorage.cs b/src/LibHac/FsSystem/BufferedStorage.cs similarity index 96% rename from src/LibHac/FsSystem/Save/BufferedStorage.cs rename to src/LibHac/FsSystem/BufferedStorage.cs index b7ba1d1a..e7db9bbd 100644 --- a/src/LibHac/FsSystem/Save/BufferedStorage.cs +++ b/src/LibHac/FsSystem/BufferedStorage.cs @@ -10,7 +10,7 @@ using LibHac.Util; using Buffer = LibHac.Mem.Buffer; using CacheHandle = System.Int64; -namespace LibHac.FsSystem.Save; +namespace LibHac.FsSystem; /// /// An that provides buffered access to a base . @@ -21,7 +21,7 @@ public class BufferedStorage : IStorage private const int InvalidIndex = -1; /// - /// Caches a single block of data for a + /// Caches a single block of data for a /// private struct Cache : IDisposable { @@ -101,7 +101,7 @@ public class BufferedStorage : IStorage } /// - /// Decrements the ref-count and adds the to its 's + /// Decrements the ref-count and adds the to its 's /// fetch list if the has no more references, and registering the buffer with /// the if not dirty. /// @@ -186,7 +186,7 @@ public class BufferedStorage : IStorage /// /// Increments the ref-count and removes the from its - /// 's fetch list if needed. + /// 's fetch list if needed. /// public void Unlink() { @@ -557,7 +557,7 @@ public class BufferedStorage : IStorage } /// - /// Allows iteration over the in a . + /// Allows iteration over the in a . /// Several options exist for which Caches to iterate. /// private ref struct SharedCache @@ -584,11 +584,11 @@ public class BufferedStorage : IStorage } /// - /// Moves to the next that contains data from the specified range. + /// Moves to the next that contains data from the specified range. /// /// The start offset of the range. /// The size of the range. - /// if a from the + /// if a from the /// specified range was found. if no matching Caches exist, /// or if all matching Caches have already been iterated. public bool AcquireNextOverlappedCache(long offset, long size) @@ -643,9 +643,9 @@ public class BufferedStorage : IStorage } /// - /// Moves to the next dirty . + /// Moves to the next dirty . /// - /// if a dirty was found. + /// if a dirty was found. /// if no dirty Caches exist, /// or if all dirty Caches have already been iterated. public bool AcquireNextDirtyCache() @@ -686,9 +686,9 @@ public class BufferedStorage : IStorage } /// - /// Moves to the next valid . + /// Moves to the next valid . /// - /// if a valid was found. + /// if a valid was found. /// if no valid Caches exist, /// or if all valid Caches have already been iterated. public bool AcquireNextValidCache() @@ -729,10 +729,10 @@ public class BufferedStorage : IStorage } /// - /// Moves to a that can be used for + /// Moves to a that can be used for /// fetching a new block from the base . /// - /// if a was acquired. + /// if a was acquired. /// Otherwise, . public bool AcquireFetchableCache() { @@ -758,9 +758,9 @@ public class BufferedStorage : IStorage } /// - /// Reads from the current 's buffer. + /// Reads from the current 's buffer. /// The provided must be inside the block of - /// data held by the . + /// data held by the . /// /// The offset in the base to be read from. /// The buffer in which to place the read data. @@ -772,8 +772,8 @@ public class BufferedStorage : IStorage /// /// Buffers data to be written to the base when the current - /// is flushed. The provided - /// must be contained by the block of data held by the . + /// is flushed. The provided + /// must be contained by the block of data held by the . /// /// The offset in the base to be written to. /// The buffer containing the data to be written. @@ -784,7 +784,7 @@ public class BufferedStorage : IStorage } /// - /// If the current is dirty, + /// If the current is dirty, /// flushes its data to the base . /// /// The of the operation. @@ -795,7 +795,7 @@ public class BufferedStorage : IStorage } /// - /// Invalidates the data in the current . + /// Invalidates the data in the current . /// Any dirty data will be discarded. /// public void Invalidate() @@ -805,11 +805,11 @@ public class BufferedStorage : IStorage } /// - /// Checks if the current covers any of the specified range. + /// Checks if the current covers any of the specified range. /// /// The start offset of the range to check. /// The size of the range to check. - /// if the current 's range + /// if the current 's range /// covers any of the input range. Otherwise, . public bool Hits(long offset, long size) { @@ -818,7 +818,7 @@ public class BufferedStorage : IStorage } /// - /// Releases the current to return to the fetch list. + /// Releases the current to return to the fetch list. /// private void Release() { @@ -839,8 +839,8 @@ public class BufferedStorage : IStorage } /// - /// Provides exclusive access to a - /// entry in a . + /// Provides exclusive access to a + /// entry in a . /// private ref struct UniqueCache { @@ -856,7 +856,7 @@ public class BufferedStorage : IStorage } /// - /// Disposes the , releasing any held . + /// Disposes the , releasing any held . /// public void Dispose() { @@ -870,7 +870,7 @@ public class BufferedStorage : IStorage } /// - /// Attempts to gain exclusive access to the held by + /// Attempts to gain exclusive access to the held by /// and prepare it to read a new block from the base . /// /// The to gain exclusive access to. @@ -894,7 +894,7 @@ public class BufferedStorage : IStorage /// /// Reads the storage block containing the specified offset into the - /// 's buffer, and sets the Cache to that offset. + /// 's buffer, and sets the Cache to that offset. /// /// An offset in the block to fetch. /// : The operation was successful.
@@ -907,7 +907,7 @@ public class BufferedStorage : IStorage } /// - /// Fills the 's buffer from an input buffer containing a block of data + /// Fills the 's buffer from an input buffer containing a block of data /// read from the base , and sets the Cache to that offset. /// /// The start offset of the block in the base @@ -1709,4 +1709,4 @@ public class BufferedStorage : IStorage return Result.Success; } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/IntegrityVerificationStorage.cs b/src/LibHac/FsSystem/IntegrityVerificationStorage.cs index c3129884..0a2fdfc0 100644 --- a/src/LibHac/FsSystem/IntegrityVerificationStorage.cs +++ b/src/LibHac/FsSystem/IntegrityVerificationStorage.cs @@ -3,7 +3,7 @@ using System.Buffers; using System.IO; using LibHac.Crypto; using LibHac.Fs; -using LibHac.FsSystem.Save; +using LibHac.Tools.FsSystem.Save; namespace LibHac.FsSystem; @@ -250,4 +250,4 @@ public enum IntegrityCheckLevel /// An will be thrown if an integrity check fails. /// ErrorOnInvalid -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/SaveDataFileSystemCacheRegisterBase.cs b/src/LibHac/FsSystem/SaveDataFileSystemCacheRegisterBase.cs index a54cbf26..f8d6254b 100644 --- a/src/LibHac/FsSystem/SaveDataFileSystemCacheRegisterBase.cs +++ b/src/LibHac/FsSystem/SaveDataFileSystemCacheRegisterBase.cs @@ -4,7 +4,7 @@ using LibHac.Common; using LibHac.Diag; using LibHac.Fs; using LibHac.Fs.Fsa; -using LibHac.FsSystem.Save; +using LibHac.Tools.FsSystem.Save; namespace LibHac.FsSystem; @@ -145,4 +145,4 @@ public class SaveDataFileSystemCacheRegisterBase : IFileSystem where T : IFil { return _baseFileSystem.Get.GetTotalSpaceSize(out totalSpace, path); } -} +} \ No newline at end of file diff --git a/src/LibHac/Tools/Fs/SwitchFs.cs b/src/LibHac/Tools/Fs/SwitchFs.cs index 062b44d0..4957407f 100644 --- a/src/LibHac/Tools/Fs/SwitchFs.cs +++ b/src/LibHac/Tools/Fs/SwitchFs.cs @@ -9,9 +9,9 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; -using LibHac.FsSystem.Save; using LibHac.Ncm; using LibHac.Ns; +using LibHac.Tools.FsSystem.Save; using LibHac.Tools.Ncm; using LibHac.Util; diff --git a/src/LibHac/FsSystem/Save/AllocationTable.cs b/src/LibHac/Tools/FsSystem/Save/AllocationTable.cs similarity index 99% rename from src/LibHac/FsSystem/Save/AllocationTable.cs rename to src/LibHac/Tools/FsSystem/Save/AllocationTable.cs index 8bcdba4f..07f1dcaa 100644 --- a/src/LibHac/FsSystem/Save/AllocationTable.cs +++ b/src/LibHac/Tools/FsSystem/Save/AllocationTable.cs @@ -3,8 +3,9 @@ using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class AllocationTable { @@ -550,4 +551,4 @@ public class AllocationTableHeader DirectoryTableBlock = reader.ReadInt32(); FileTableBlock = reader.ReadInt32(); } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/AllocationTableIterator.cs b/src/LibHac/Tools/FsSystem/Save/AllocationTableIterator.cs similarity index 97% rename from src/LibHac/FsSystem/Save/AllocationTableIterator.cs rename to src/LibHac/Tools/FsSystem/Save/AllocationTableIterator.cs index dee510aa..f7997f33 100644 --- a/src/LibHac/FsSystem/Save/AllocationTableIterator.cs +++ b/src/LibHac/Tools/FsSystem/Save/AllocationTableIterator.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class AllocationTableIterator { @@ -75,4 +75,4 @@ public class AllocationTableIterator } } } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/AllocationTableStorage.cs b/src/LibHac/Tools/FsSystem/Save/AllocationTableStorage.cs similarity index 99% rename from src/LibHac/FsSystem/Save/AllocationTableStorage.cs rename to src/LibHac/Tools/FsSystem/Save/AllocationTableStorage.cs index a893c2db..76cf371a 100644 --- a/src/LibHac/FsSystem/Save/AllocationTableStorage.cs +++ b/src/LibHac/Tools/FsSystem/Save/AllocationTableStorage.cs @@ -3,7 +3,7 @@ using System.IO; using LibHac.Fs; using LibHac.Util; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class AllocationTableStorage : IStorage { @@ -147,4 +147,4 @@ public class AllocationTableStorage : IStorage return Result.Success; } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/DuplexBitmap.cs b/src/LibHac/Tools/FsSystem/Save/DuplexBitmap.cs similarity index 93% rename from src/LibHac/FsSystem/Save/DuplexBitmap.cs rename to src/LibHac/Tools/FsSystem/Save/DuplexBitmap.cs index a0fde23a..2a08a0f5 100644 --- a/src/LibHac/FsSystem/Save/DuplexBitmap.cs +++ b/src/LibHac/Tools/FsSystem/Save/DuplexBitmap.cs @@ -2,8 +2,9 @@ using System.Collections; using System.IO; using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class DuplexBitmap { @@ -38,4 +39,4 @@ public class DuplexBitmap } } } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/DuplexStorage.cs b/src/LibHac/Tools/FsSystem/Save/DuplexStorage.cs similarity index 98% rename from src/LibHac/FsSystem/Save/DuplexStorage.cs rename to src/LibHac/Tools/FsSystem/Save/DuplexStorage.cs index 298fd72d..1ca7a7b7 100644 --- a/src/LibHac/FsSystem/Save/DuplexStorage.cs +++ b/src/LibHac/Tools/FsSystem/Save/DuplexStorage.cs @@ -1,7 +1,8 @@ using System; using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class DuplexStorage : IStorage { @@ -123,4 +124,4 @@ public class DuplexStorage : IStorage dataToClear.Slice(i * BlockSize, BlockSize).Fill(SaveDataFileSystem.TrimFillValue); } } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/Header.cs b/src/LibHac/Tools/FsSystem/Save/Header.cs similarity index 99% rename from src/LibHac/FsSystem/Save/Header.cs rename to src/LibHac/Tools/FsSystem/Save/Header.cs index e92517f2..eac1b7f6 100644 --- a/src/LibHac/FsSystem/Save/Header.cs +++ b/src/LibHac/Tools/FsSystem/Save/Header.cs @@ -3,8 +3,9 @@ using System.IO; using LibHac.Common.Keys; using LibHac.Crypto; using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class Header { @@ -284,4 +285,4 @@ public class ExtraData return new Guid(b); } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs b/src/LibHac/Tools/FsSystem/Save/HierarchicalDuplexStorage.cs similarity index 97% rename from src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs rename to src/LibHac/Tools/FsSystem/Save/HierarchicalDuplexStorage.cs index b4bb8e0d..1a7850d2 100644 --- a/src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs +++ b/src/LibHac/Tools/FsSystem/Save/HierarchicalDuplexStorage.cs @@ -1,7 +1,7 @@ using System; using LibHac.Fs; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class HierarchicalDuplexStorage : IStorage { @@ -74,4 +74,4 @@ public class DuplexFsLayerInfo public IStorage DataA { get; set; } public IStorage DataB { get; set; } public DuplexInfo Info { get; set; } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs b/src/LibHac/Tools/FsSystem/Save/HierarchicalSaveFileTable.cs similarity index 99% rename from src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs rename to src/LibHac/Tools/FsSystem/Save/HierarchicalSaveFileTable.cs index 7d8910d5..9293eb49 100644 --- a/src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs +++ b/src/LibHac/Tools/FsSystem/Save/HierarchicalSaveFileTable.cs @@ -3,9 +3,10 @@ using System.IO; using System.Runtime.InteropServices; using LibHac.Common; using LibHac.Fs; +using LibHac.FsSystem; using LibHac.Util; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class HierarchicalSaveFileTable { @@ -408,4 +409,4 @@ public class HierarchicalSaveFileTable public int NextSibling; public T Value; } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/JournalMap.cs b/src/LibHac/Tools/FsSystem/Save/JournalMap.cs similarity index 98% rename from src/LibHac/FsSystem/Save/JournalMap.cs rename to src/LibHac/Tools/FsSystem/Save/JournalMap.cs index 1bfa0baf..d77d19f1 100644 --- a/src/LibHac/FsSystem/Save/JournalMap.cs +++ b/src/LibHac/Tools/FsSystem/Save/JournalMap.cs @@ -1,8 +1,9 @@ using System.IO; using LibHac.Fs; +using LibHac.FsSystem; using LibHac.Util; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class JournalMap { @@ -99,4 +100,4 @@ public class JournalMapParams public IStorage PhysicalBlockBitmap { get; set; } public IStorage VirtualBlockBitmap { get; set; } public IStorage FreeBlockBitmap { get; set; } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/JournalStorage.cs b/src/LibHac/Tools/FsSystem/Save/JournalStorage.cs similarity index 98% rename from src/LibHac/FsSystem/Save/JournalStorage.cs rename to src/LibHac/Tools/FsSystem/Save/JournalStorage.cs index a773908e..1f389e92 100644 --- a/src/LibHac/FsSystem/Save/JournalStorage.cs +++ b/src/LibHac/Tools/FsSystem/Save/JournalStorage.cs @@ -2,8 +2,9 @@ using System.Collections; using System.IO; using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class JournalStorage : IStorage { @@ -161,4 +162,4 @@ public class JournalMapEntry { public int PhysicalIndex { get; set; } public int VirtualIndex { get; set; } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/RemapStorage.cs b/src/LibHac/Tools/FsSystem/Save/RemapStorage.cs similarity index 99% rename from src/LibHac/FsSystem/Save/RemapStorage.cs rename to src/LibHac/Tools/FsSystem/Save/RemapStorage.cs index d97477f0..eaad938d 100644 --- a/src/LibHac/FsSystem/Save/RemapStorage.cs +++ b/src/LibHac/Tools/FsSystem/Save/RemapStorage.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; using LibHac.Fs; +using LibHac.FsSystem; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class RemapStorage : IStorage { @@ -270,4 +271,4 @@ public class RemapSegment public List Entries { get; } = new List(); public long Offset { get; internal set; } public long Length { get; internal set; } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/SaveDataDirectory.cs b/src/LibHac/Tools/FsSystem/Save/SaveDataDirectory.cs similarity index 98% rename from src/LibHac/FsSystem/Save/SaveDataDirectory.cs rename to src/LibHac/Tools/FsSystem/Save/SaveDataDirectory.cs index dde1a017..adf8f9dd 100644 --- a/src/LibHac/FsSystem/Save/SaveDataDirectory.cs +++ b/src/LibHac/Tools/FsSystem/Save/SaveDataDirectory.cs @@ -4,7 +4,7 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.Util; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class SaveDataDirectory : IDirectory { @@ -85,4 +85,4 @@ public class SaveDataDirectory : IDirectory return Result.Success; } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/SaveDataFile.cs b/src/LibHac/Tools/FsSystem/Save/SaveDataFile.cs similarity index 98% rename from src/LibHac/FsSystem/Save/SaveDataFile.cs rename to src/LibHac/Tools/FsSystem/Save/SaveDataFile.cs index 85cacd27..fd8793cd 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFile.cs +++ b/src/LibHac/Tools/FsSystem/Save/SaveDataFile.cs @@ -4,7 +4,7 @@ using LibHac.Common; using LibHac.Fs; using LibHac.Fs.Fsa; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class SaveDataFile : IFile { @@ -104,4 +104,4 @@ public class SaveDataFile : IFile { return ResultFs.NotImplemented.Log(); } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs b/src/LibHac/Tools/FsSystem/Save/SaveDataFileSystem.cs similarity index 99% rename from src/LibHac/FsSystem/Save/SaveDataFileSystem.cs rename to src/LibHac/Tools/FsSystem/Save/SaveDataFileSystem.cs index 765a5da9..1e5e46e2 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs +++ b/src/LibHac/Tools/FsSystem/Save/SaveDataFileSystem.cs @@ -5,9 +5,10 @@ using LibHac.Common.Keys; using LibHac.Crypto; using LibHac.Fs; using LibHac.Fs.Fsa; +using LibHac.FsSystem; using Path = LibHac.Fs.Path; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class SaveDataFileSystem : IFileSystem { @@ -331,4 +332,4 @@ public class SaveDataFileSystem : IFileSystem base.Dispose(); } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs b/src/LibHac/Tools/FsSystem/Save/SaveDataFileSystemCore.cs similarity index 99% rename from src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs rename to src/LibHac/Tools/FsSystem/Save/SaveDataFileSystemCore.cs index 25c24550..b24b0f17 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs +++ b/src/LibHac/Tools/FsSystem/Save/SaveDataFileSystemCore.cs @@ -2,10 +2,11 @@ using LibHac.Common; using LibHac.Fs; using LibHac.Fs.Fsa; +using LibHac.FsSystem; using LibHac.Util; using Path = LibHac.Fs.Path; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public class SaveDataFileSystemCore : IFileSystem { @@ -283,4 +284,4 @@ public class SaveHeader BlockCount = reader.ReadInt64(); BlockSize = reader.ReadInt64(); } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/SaveExtensions.cs b/src/LibHac/Tools/FsSystem/Save/SaveExtensions.cs similarity index 91% rename from src/LibHac/FsSystem/Save/SaveExtensions.cs rename to src/LibHac/Tools/FsSystem/Save/SaveExtensions.cs index e490b260..518c1af2 100644 --- a/src/LibHac/FsSystem/Save/SaveExtensions.cs +++ b/src/LibHac/Tools/FsSystem/Save/SaveExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; public static class SaveExtensions { @@ -13,4 +13,4 @@ public static class SaveExtensions yield return (iterator.PhysicalBlock, iterator.CurrentSegmentSize); } while (iterator.MoveNext()); } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/SaveFsEntry.cs b/src/LibHac/Tools/FsSystem/Save/SaveFsEntry.cs similarity index 95% rename from src/LibHac/FsSystem/Save/SaveFsEntry.cs rename to src/LibHac/Tools/FsSystem/Save/SaveFsEntry.cs index 35a614fe..1c0dd924 100644 --- a/src/LibHac/FsSystem/Save/SaveFsEntry.cs +++ b/src/LibHac/Tools/FsSystem/Save/SaveFsEntry.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; internal ref struct SaveEntryKey { @@ -33,4 +33,4 @@ public struct SaveFindPosition public int NextDirectory; /// The ID of the next file to be enumerated. public int NextFile; -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/SaveFsList.cs b/src/LibHac/Tools/FsSystem/Save/SaveFsList.cs similarity index 99% rename from src/LibHac/FsSystem/Save/SaveFsList.cs rename to src/LibHac/Tools/FsSystem/Save/SaveFsList.cs index 454ac336..2654a90c 100644 --- a/src/LibHac/FsSystem/Save/SaveFsList.cs +++ b/src/LibHac/Tools/FsSystem/Save/SaveFsList.cs @@ -7,7 +7,7 @@ using LibHac.Common; using LibHac.Fs; using LibHac.Util; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; // todo: Change constraint to "unmanaged" after updating to // a newer SDK https://github.com/dotnet/csharplang/issues/1937 @@ -376,4 +376,4 @@ internal class SaveFsList where T : struct [StructLayout(LayoutKind.Sequential, Size = 0x40)] private struct NameDummy { } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Save/SaveResults.cs b/src/LibHac/Tools/FsSystem/Save/SaveResults.cs similarity index 98% rename from src/LibHac/FsSystem/Save/SaveResults.cs rename to src/LibHac/Tools/FsSystem/Save/SaveResults.cs index afbd0695..1d82acce 100644 --- a/src/LibHac/FsSystem/Save/SaveResults.cs +++ b/src/LibHac/Tools/FsSystem/Save/SaveResults.cs @@ -1,6 +1,6 @@ using LibHac.Fs; -namespace LibHac.FsSystem.Save; +namespace LibHac.Tools.FsSystem.Save; internal static class SaveResults { @@ -125,4 +125,4 @@ internal static class SaveResults return result; } -} +} \ No newline at end of file diff --git a/src/hactoolnet/ProcessSave.cs b/src/hactoolnet/ProcessSave.cs index 7cd19efd..7bcf63d4 100644 --- a/src/hactoolnet/ProcessSave.cs +++ b/src/hactoolnet/ProcessSave.cs @@ -10,7 +10,7 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.Fs.Impl; using LibHac.FsSystem; -using LibHac.FsSystem.Save; +using LibHac.Tools.FsSystem.Save; using static hactoolnet.Print; using Path = System.IO.Path; @@ -353,4 +353,4 @@ internal static class ProcessSave return sb.ToString(); } -} +} \ No newline at end of file diff --git a/src/hactoolnet/ProcessSwitchFs.cs b/src/hactoolnet/ProcessSwitchFs.cs index 656a9bb6..54e50bd0 100644 --- a/src/hactoolnet/ProcessSwitchFs.cs +++ b/src/hactoolnet/ProcessSwitchFs.cs @@ -9,9 +9,9 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; -using LibHac.FsSystem.Save; using LibHac.Ns; using LibHac.Tools.Fs; +using LibHac.Tools.FsSystem.Save; using Path = System.IO.Path; namespace hactoolnet; diff --git a/tests/LibHac.Tests/FsSystem/BufferedStorageTests.cs b/tests/LibHac.Tests/FsSystem/BufferedStorageTests.cs index ba36b2ad..487b6a47 100644 --- a/tests/LibHac.Tests/FsSystem/BufferedStorageTests.cs +++ b/tests/LibHac.Tests/FsSystem/BufferedStorageTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using LibHac.Fs; using LibHac.FsSystem; -using LibHac.FsSystem.Save; using LibHac.Tests.Fs; using Xunit; @@ -224,4 +223,4 @@ public class BufferedStorageTests var tester = new StorageTester(testerConfig); tester.Run(0x100); } -} +} \ No newline at end of file