From ae649182ce1039b1d245a91ce32df92794beb89c Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Sat, 13 Oct 2018 15:12:10 -0500 Subject: [PATCH] Rename "Savefile" namespace to "Save" --- LibHac/{Savefile => Save}/AllocationTable.cs | 2 +- LibHac/{Savefile => Save}/AllocationTableIterator.cs | 2 +- LibHac/{Savefile => Save}/AllocationTableStream.cs | 2 +- LibHac/{Savefile => Save}/DuplexBitmap.cs | 2 +- LibHac/{Savefile => Save}/DuplexFs.cs | 2 +- LibHac/{Savefile => Save}/FsEntry.cs | 2 +- LibHac/{Savefile => Save}/Header.cs | 2 +- LibHac/{Savefile => Save}/Journal.cs | 2 +- LibHac/{Savefile => Save}/LayeredDuplexFs.cs | 2 +- LibHac/{Savefile => Save}/RemapStream.cs | 2 +- LibHac/{Savefile => Save}/Savefile.cs | 2 +- LibHac/SwitchFs.cs | 7 ++++--- NandReader/Program.cs | 2 +- NandReaderGui/ViewModel/NandViewModel.cs | 2 +- hactoolnet/ProcessSave.cs | 2 +- hactoolnet/ProcessSwitchFs.cs | 2 +- 16 files changed, 19 insertions(+), 18 deletions(-) rename LibHac/{Savefile => Save}/AllocationTable.cs (97%) rename LibHac/{Savefile => Save}/AllocationTableIterator.cs (99%) rename LibHac/{Savefile => Save}/AllocationTableStream.cs (99%) rename LibHac/{Savefile => Save}/DuplexBitmap.cs (97%) rename LibHac/{Savefile => Save}/DuplexFs.cs (99%) rename LibHac/{Savefile => Save}/FsEntry.cs (99%) rename LibHac/{Savefile => Save}/Header.cs (99%) rename LibHac/{Savefile => Save}/Journal.cs (99%) rename LibHac/{Savefile => Save}/LayeredDuplexFs.cs (98%) rename LibHac/{Savefile => Save}/RemapStream.cs (99%) rename LibHac/{Savefile => Save}/Savefile.cs (99%) diff --git a/LibHac/Savefile/AllocationTable.cs b/LibHac/Save/AllocationTable.cs similarity index 97% rename from LibHac/Savefile/AllocationTable.cs rename to LibHac/Save/AllocationTable.cs index 910c4513..4bd42f21 100644 --- a/LibHac/Savefile/AllocationTable.cs +++ b/LibHac/Save/AllocationTable.cs @@ -1,6 +1,6 @@ using System.IO; -namespace LibHac.Savefile +namespace LibHac.Save { public class AllocationTable { diff --git a/LibHac/Savefile/AllocationTableIterator.cs b/LibHac/Save/AllocationTableIterator.cs similarity index 99% rename from LibHac/Savefile/AllocationTableIterator.cs rename to LibHac/Save/AllocationTableIterator.cs index 8bd477aa..5065f5d8 100644 --- a/LibHac/Savefile/AllocationTableIterator.cs +++ b/LibHac/Save/AllocationTableIterator.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Savefile +namespace LibHac.Save { public class AllocationTableIterator { diff --git a/LibHac/Savefile/AllocationTableStream.cs b/LibHac/Save/AllocationTableStream.cs similarity index 99% rename from LibHac/Savefile/AllocationTableStream.cs rename to LibHac/Save/AllocationTableStream.cs index 5e7ac86f..c8bcdf8c 100644 --- a/LibHac/Savefile/AllocationTableStream.cs +++ b/LibHac/Save/AllocationTableStream.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Savefile +namespace LibHac.Save { public class AllocationTableStream : Stream { diff --git a/LibHac/Savefile/DuplexBitmap.cs b/LibHac/Save/DuplexBitmap.cs similarity index 97% rename from LibHac/Savefile/DuplexBitmap.cs rename to LibHac/Save/DuplexBitmap.cs index 03fc2f54..cb691c7b 100644 --- a/LibHac/Savefile/DuplexBitmap.cs +++ b/LibHac/Save/DuplexBitmap.cs @@ -2,7 +2,7 @@ using System.Collections; using System.IO; -namespace LibHac.Savefile +namespace LibHac.Save { public class DuplexBitmap { diff --git a/LibHac/Savefile/DuplexFs.cs b/LibHac/Save/DuplexFs.cs similarity index 99% rename from LibHac/Savefile/DuplexFs.cs rename to LibHac/Save/DuplexFs.cs index eae08cd1..86282822 100644 --- a/LibHac/Savefile/DuplexFs.cs +++ b/LibHac/Save/DuplexFs.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Savefile +namespace LibHac.Save { public class DuplexFs : Stream { diff --git a/LibHac/Savefile/FsEntry.cs b/LibHac/Save/FsEntry.cs similarity index 99% rename from LibHac/Savefile/FsEntry.cs rename to LibHac/Save/FsEntry.cs index ab9ab87e..95147123 100644 --- a/LibHac/Savefile/FsEntry.cs +++ b/LibHac/Save/FsEntry.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.IO; using System.Text; -namespace LibHac.Savefile +namespace LibHac.Save { [DebuggerDisplay("{" + nameof(FullPath) + "}")] public abstract class FsEntry diff --git a/LibHac/Savefile/Header.cs b/LibHac/Save/Header.cs similarity index 99% rename from LibHac/Savefile/Header.cs rename to LibHac/Save/Header.cs index 60b8fe1c..e3f9fda6 100644 --- a/LibHac/Savefile/Header.cs +++ b/LibHac/Save/Header.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Savefile +namespace LibHac.Save { public class Header { diff --git a/LibHac/Savefile/Journal.cs b/LibHac/Save/Journal.cs similarity index 99% rename from LibHac/Savefile/Journal.cs rename to LibHac/Save/Journal.cs index ad511206..23c8dea3 100644 --- a/LibHac/Savefile/Journal.cs +++ b/LibHac/Save/Journal.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace LibHac.Savefile +namespace LibHac.Save { public class JournalStream : Stream { diff --git a/LibHac/Savefile/LayeredDuplexFs.cs b/LibHac/Save/LayeredDuplexFs.cs similarity index 98% rename from LibHac/Savefile/LayeredDuplexFs.cs rename to LibHac/Save/LayeredDuplexFs.cs index 124082f1..7042eb0f 100644 --- a/LibHac/Savefile/LayeredDuplexFs.cs +++ b/LibHac/Save/LayeredDuplexFs.cs @@ -1,6 +1,6 @@ using System.IO; -namespace LibHac.Savefile +namespace LibHac.Save { public class LayeredDuplexFs : Stream { diff --git a/LibHac/Savefile/RemapStream.cs b/LibHac/Save/RemapStream.cs similarity index 99% rename from LibHac/Savefile/RemapStream.cs rename to LibHac/Save/RemapStream.cs index f0f5e735..e1adab68 100644 --- a/LibHac/Savefile/RemapStream.cs +++ b/LibHac/Save/RemapStream.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace LibHac.Savefile +namespace LibHac.Save { public class RemapStream : Stream { diff --git a/LibHac/Savefile/Savefile.cs b/LibHac/Save/Savefile.cs similarity index 99% rename from LibHac/Savefile/Savefile.cs rename to LibHac/Save/Savefile.cs index cee44595..f5347391 100644 --- a/LibHac/Savefile/Savefile.cs +++ b/LibHac/Save/Savefile.cs @@ -4,7 +4,7 @@ using System.Security.Cryptography; using System.Text; using LibHac.Streams; -namespace LibHac.Savefile +namespace LibHac.Save { public class Savefile { diff --git a/LibHac/SwitchFs.cs b/LibHac/SwitchFs.cs index 967aa14e..196c2379 100644 --- a/LibHac/SwitchFs.cs +++ b/LibHac/SwitchFs.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Text; +using LibHac.Save; using LibHac.Streams; namespace LibHac @@ -16,7 +17,7 @@ namespace LibHac public string SaveDir { get; } public Dictionary Ncas { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); - public Dictionary Saves { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); + public Dictionary Saves { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); public Dictionary Titles { get; } = new Dictionary(); public Dictionary Applications { get; } = new Dictionary(); @@ -117,7 +118,7 @@ namespace LibHac foreach (string file in files) { - Savefile.Savefile save = null; + Savefile save = null; string saveName = Path.GetFileNameWithoutExtension(file); try @@ -126,7 +127,7 @@ namespace LibHac string sdPath = "/" + Util.GetRelativePath(file, SaveDir).Replace('\\', '/'); var nax0 = new Nax0(Keyset, stream, sdPath, false); - save = new Savefile.Savefile(Keyset, nax0.Stream, IntegrityCheckLevel.None); + save = new Savefile(Keyset, nax0.Stream, IntegrityCheckLevel.None); } catch (Exception ex) { diff --git a/NandReader/Program.cs b/NandReader/Program.cs index 4718535d..8fd0fc9e 100644 --- a/NandReader/Program.cs +++ b/NandReader/Program.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.IO; using LibHac; using LibHac.Nand; -using LibHac.Savefile; +using LibHac.Save; namespace NandReader { diff --git a/NandReaderGui/ViewModel/NandViewModel.cs b/NandReaderGui/ViewModel/NandViewModel.cs index feddd0ad..1f99cf2d 100644 --- a/NandReaderGui/ViewModel/NandViewModel.cs +++ b/NandReaderGui/ViewModel/NandViewModel.cs @@ -7,7 +7,7 @@ using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using LibHac; using LibHac.Nand; -using LibHac.Savefile; +using LibHac.Save; using LibHac.Streams; namespace NandReaderGui.ViewModel diff --git a/hactoolnet/ProcessSave.cs b/hactoolnet/ProcessSave.cs index 060f3c3c..10d103b5 100644 --- a/hactoolnet/ProcessSave.cs +++ b/hactoolnet/ProcessSave.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Text; using LibHac; -using LibHac.Savefile; +using LibHac.Save; using static hactoolnet.Print; namespace hactoolnet diff --git a/hactoolnet/ProcessSwitchFs.cs b/hactoolnet/ProcessSwitchFs.cs index fe2e89cd..a346bee5 100644 --- a/hactoolnet/ProcessSwitchFs.cs +++ b/hactoolnet/ProcessSwitchFs.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Text; using LibHac; -using LibHac.Savefile; +using LibHac.Save; namespace hactoolnet {