From 7681429c97d8d136d8202c87473ea06431297ceb Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Sat, 18 Dec 2021 19:34:44 -0700 Subject: [PATCH] Move NxFileStream, Delta --- src/LibHac/FsSystem/FileSystemExtensions.cs | 3 ++- src/LibHac/{ => Tools}/FsSystem/Delta.cs | 5 +++-- src/LibHac/{ => Tools}/FsSystem/NxFileStream.cs | 5 +++-- src/hactoolnet/ProcessDelta.cs | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) rename src/LibHac/{ => Tools}/FsSystem/Delta.cs (98%) rename src/LibHac/{ => Tools}/FsSystem/NxFileStream.cs (97%) diff --git a/src/LibHac/FsSystem/FileSystemExtensions.cs b/src/LibHac/FsSystem/FileSystemExtensions.cs index f254bca1..63886595 100644 --- a/src/LibHac/FsSystem/FileSystemExtensions.cs +++ b/src/LibHac/FsSystem/FileSystemExtensions.cs @@ -6,6 +6,7 @@ using System.Runtime.CompilerServices; using LibHac.Common; using LibHac.Fs; using LibHac.Fs.Fsa; +using LibHac.Tools.FsSystem; using LibHac.Util; using Path = LibHac.Fs.Path; @@ -391,4 +392,4 @@ public enum SearchOptions Default = 0, RecurseSubdirectories = 1 << 0, CaseInsensitive = 1 << 1 -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/Delta.cs b/src/LibHac/Tools/FsSystem/Delta.cs similarity index 98% rename from src/LibHac/FsSystem/Delta.cs rename to src/LibHac/Tools/FsSystem/Delta.cs index 5150120a..07d783aa 100644 --- a/src/LibHac/FsSystem/Delta.cs +++ b/src/LibHac/Tools/FsSystem/Delta.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.IO; using LibHac.Fs; using LibHac.Fs.Fsa; +using LibHac.FsSystem; -namespace LibHac.FsSystem; +namespace LibHac.Tools.FsSystem; public class Delta { @@ -160,4 +161,4 @@ public class DeltaHeader HeaderSize = reader.ReadInt64(); BodySize = reader.ReadInt64(); } -} +} \ No newline at end of file diff --git a/src/LibHac/FsSystem/NxFileStream.cs b/src/LibHac/Tools/FsSystem/NxFileStream.cs similarity index 97% rename from src/LibHac/FsSystem/NxFileStream.cs rename to src/LibHac/Tools/FsSystem/NxFileStream.cs index f2188d37..c72ec9df 100644 --- a/src/LibHac/FsSystem/NxFileStream.cs +++ b/src/LibHac/Tools/FsSystem/NxFileStream.cs @@ -2,8 +2,9 @@ using System.IO; using LibHac.Fs; using LibHac.Fs.Fsa; +using LibHac.FsSystem; -namespace LibHac.FsSystem; +namespace LibHac.Tools.FsSystem; public class NxFileStream : Stream { @@ -79,4 +80,4 @@ public class NxFileStream : Stream if (!LeaveOpen) BaseFile?.Dispose(); base.Dispose(disposing); } -} +} \ No newline at end of file diff --git a/src/hactoolnet/ProcessDelta.cs b/src/hactoolnet/ProcessDelta.cs index 1e234c85..83586a0b 100644 --- a/src/hactoolnet/ProcessDelta.cs +++ b/src/hactoolnet/ProcessDelta.cs @@ -7,6 +7,7 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; +using LibHac.Tools.FsSystem; using static hactoolnet.Print; namespace hactoolnet; @@ -84,4 +85,4 @@ internal static class ProcessDelta return sb.ToString(); } -} +} \ No newline at end of file