Exclude ard and arh files from Xb2FileSystem

Author: Thealexbarney

XbTool/XbTool/Tasks.cs

@@ -446,8 +446,9 @@ private static void SdPrintTest(Options options)
             if (options.Input == null) throw new NullReferenceException("No input path was specified.");
             if (options.Output == null) throw new NullReferenceException("No output path was specified.");
 
-            IFileSystem a = Xb2.FS.Create.CreateFileSystem(options.Input);
-            File.WriteAllLines(options.Output, a.EnumerateEntries().Select(x => x.FullPath));
+            IFileSystem fs = new Xb2FileSystem(options.Input);
+            File.WriteAllLines(options.Output,
+                fs.EnumerateEntries().Where(x => x.Type == DirectoryEntryType.File).Select(x => x.FullPath));
         }
     }
 }

XbTool/XbTool/Xb2/ArchiveFileSystem.cs

@@ -105,6 +105,8 @@ public IDirectory OpenDirectory(string path, OpenDirectoryMode mode)
 
         public IFile OpenFile(string path, OpenMode mode)
         {
+            path = PathTools.Normalize(path);
+
             if (!FileTable.TryOpenFile(path, out RomFileInfo romFileInfo))
             {
                 throw new FileNotFoundException();

XbTool/XbTool/Xb2/Xb2Directory.cs

@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Linq;
+using LibHac.IO;
+
+namespace XbTool.Xb2
+{
+    public class Xb2Directory : IDirectory
+    {
+        private IDirectory BaseDirectory { get; }
+
+        public IFileSystem ParentFileSystem { get; }
+        public string FullPath { get; }
+        public OpenDirectoryMode Mode { get; }
+
+        public Xb2Directory(IFileSystem fs, IDirectory baseDirectory)
+        {
+            BaseDirectory = baseDirectory;
+            ParentFileSystem = fs;
+            FullPath = baseDirectory.FullPath;
+            Mode = baseDirectory.Mode;
+        }
+
+        public IEnumerable<DirectoryEntry> Read()
+        {
+            return BaseDirectory.Read().Where(x => !Xb2FileSystem.IsArchiveFile(x.Name));
+        }
+
+        public int GetEntryCount()
+        {
+            return Read().Count();
+        }
+    }
+}

XbTool/XbTool/Xb2/FS/Create.cs XbTool/XbTool/Xb2/Xb2FileSystem.cs

@@ -5,11 +5,13 @@
 using LibHac;
 using LibHac.IO;
 
-namespace XbTool.Xb2.FS
+namespace XbTool.Xb2
 {
-    public class Create
+    public class Xb2FileSystem : IFileSystem
     {
-        public static IFileSystem CreateFileSystem(string sdPath)
+        private IFileSystem BaseFs { get; }
+
+        public Xb2FileSystem(string sdPath)
         {
             SwitchFs sdFs = OpenSdCard(sdPath);
             Application xb2App = sdFs.Applications[0x0100E95004038000];
@@ -39,10 +41,63 @@ public static IFileSystem CreateFileSystem(string sdPath)
                 }
             }
 
-            return new LayeredFileSystem(fsList);
+            fsList.Reverse();
+            BaseFs = new LayeredFileSystem(fsList);
+        }
+
+        public IDirectory OpenDirectory(string path, OpenDirectoryMode mode)
+        {
+            path = PathTools.Normalize(path);
+
+            IDirectory baseDir = BaseFs.OpenDirectory(path, mode);
+
+            return new Xb2Directory(this, baseDir);
+        }
+
+        public IFile OpenFile(string path, OpenMode mode)
+        {
+            path = PathTools.Normalize(path);
+
+            if(IsArchiveFile(path)) throw new FileNotFoundException();
+
+            return BaseFs.OpenFile(path, mode);
+        }
+
+        public bool DirectoryExists(string path)
+        {
+            path = PathTools.Normalize(path);
+
+            if (IsArchiveFile(path)) return false;
+
+            return BaseFs.DirectoryExists(path);
         }
 
-        public static SwitchFs OpenSdCard(string path, IProgressReport logger = null)
+        public bool FileExists(string path)
+        {
+            path = PathTools.Normalize(path);
+
+            if (IsArchiveFile(path)) return false;
+
+            return BaseFs.FileExists(path);
+        }
+
+        public DirectoryEntryType GetEntryType(string path)
+        {
+            path = PathTools.Normalize(path);
+
+            if (IsArchiveFile(path)) throw new FileNotFoundException();
+
+            return BaseFs.GetEntryType(path);
+        }
+
+        internal static bool IsArchiveFile(string path)
+        {
+            string extension = Path.GetExtension(path);
+
+            return extension == ".ard" || extension == ".arh";
+        }
+
+        private static SwitchFs OpenSdCard(string path, IProgressReport logger = null)
         {
             SwitchFs switchFs;
             Keyset keyset = OpenKeyset();
@@ -77,5 +132,14 @@ private static Keyset OpenKeyset()
 
             return ExternalKeys.ReadKeyFile(homeKeyFile, homeTitleKeyFile, homeConsoleKeyFile);
         }
+
+        public void Commit(){}
+
+        public void CreateDirectory(string path) => throw new NotSupportedException();
+        public void CreateFile(string path, long size, CreateFileOptions options) => throw new NotSupportedException();
+        public void DeleteDirectory(string path) => throw new NotSupportedException();
+        public void DeleteFile(string path) => throw new NotSupportedException();
+        public void RenameDirectory(string srcPath, string dstPath) => throw new NotSupportedException();
+        public void RenameFile(string srcPath, string dstPath) => throw new NotSupportedException();
     }
 }