Move FileSystemExtensions, Messages

src/LibHac/FsSystem/LocalDirectory.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 
 namespace LibHac.FsSystem;
@@ -74,4 +75,4 @@ public class LocalDirectory : IDirectory
         return isDir && (mode & OpenDirectoryMode.Directory) != 0 ||
                !isDir && (mode & OpenDirectoryMode.File) != 0;
     }
-}
+}

src/LibHac/FsSystem/LocalFileSystem.cs

@@ -8,6 +8,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem.Impl;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 using static LibHac.Fs.StringTraits;
 using Path = LibHac.Fs.Path;
@@ -1062,4 +1063,4 @@ public class LocalFileSystem : IAttributeFileSystem
         casedPath = exactPath;
         return Result.Success;
     }
-}
+}

src/LibHac/FsSystem/PartitionFileSystemBuilder.cs

@@ -7,6 +7,7 @@ using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 
 namespace LibHac.FsSystem;
@@ -184,4 +185,4 @@ public class PartitionFileSystemBuilder
         public long HashOffset;
         public byte[] Hash;
     }
-}
+}

src/LibHac/Tools/Fs/FileSystemClientUtils.cs

@@ -5,6 +5,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 
 namespace LibHac.Tools.Fs;
 

src/LibHac/Tools/Fs/Xci.cs

@@ -3,6 +3,7 @@ using LibHac.Common.Keys;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 
 namespace LibHac.Tools.Fs;
 

src/LibHac/Tools/FsSystem/AesXtsFile.cs

@@ -2,7 +2,6 @@
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
 using LibHac.Util;
 
 namespace LibHac.Tools.FsSystem;

src/LibHac/Tools/FsSystem/FileSystemExtensions.cs

@@ -6,11 +6,11 @@ using System.Runtime.CompilerServices;
 using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.Tools.FsSystem;
+using LibHac.FsSystem;
 using LibHac.Util;
 using Path = LibHac.Fs.Path;
 
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 public static class FileSystemExtensions
 {

src/LibHac/Tools/FsSystem/Messages.cs

@@ -1,4 +1,4 @@
-namespace LibHac.FsSystem;
+namespace LibHac.Tools.FsSystem;
 
 internal static class Messages
 {
@@ -7,4 +7,4 @@ internal static class Messages
     public static string DestPathIsSubPath => "The destination directory is a subdirectory of the source directory.";
     public static string DestPathAlreadyExists => "Destination path already exists.";
     public static string PartialPathNotFound => "Could not find a part of the path.";
-}
+}

src/LibHac/Tools/FsSystem/NxFileStream.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
-using LibHac.FsSystem;
 
 namespace LibHac.Tools.FsSystem;
 

src/hactoolnet/FsUtils.cs

@@ -6,6 +6,7 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 using LibHac.Tools.Fs;
+using LibHac.Tools.FsSystem;
 
 namespace hactoolnet;
 

src/hactoolnet/ProcessNca.cs

@@ -7,6 +7,7 @@ using LibHac.Fs.Fsa;
 using LibHac.Fs.Impl;
 using LibHac.FsSystem;
 using LibHac.Npdm;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using static hactoolnet.Print;
 

src/hactoolnet/ProcessPfs.cs

@@ -5,6 +5,7 @@ using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Tools.Es;
 using LibHac.Tools.Fs;
+using LibHac.Tools.FsSystem;
 using LibHac.Util;
 using static hactoolnet.Print;
 

src/hactoolnet/ProcessRomfs.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using LibHac.Fs;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.RomFs;
 
 namespace hactoolnet;

src/hactoolnet/ProcessSave.cs

@@ -9,6 +9,7 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.Fs.Impl;
 using LibHac.FsSystem;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.Save;
 using static hactoolnet.Print;
 using Path = System.IO.Path;

src/hactoolnet/ProcessSwitchFs.cs

@@ -10,6 +10,7 @@ using LibHac.Fs.Fsa;
 using LibHac.FsSystem;
 using LibHac.Ns;
 using LibHac.Tools.Fs;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.Save;
 using Path = System.IO.Path;
 

src/hactoolnet/ProcessXci.cs

@@ -5,6 +5,7 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Tools.Fs;
+using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using static hactoolnet.Print;