mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switched to IStorage

Browse source 
Fixed issue with NAND's inplementation of GetFileSystemEntries
This commit is contained in:
shadowninja108 2018-12-08 20:04:21 -07:00
parent d61088b72f
commit 3a1bafa009
6 changed files with 67 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/LibHac.Nand/Nand.cs
View file

@ -12,6 +12,7 @@ namespace LibHac.Nand
{ {
private GuidPartitionInfo ProdInfo { get; } private GuidPartitionInfo ProdInfo { get; }
private GuidPartitionInfo ProdInfoF { get; } private GuidPartitionInfo ProdInfoF { get; }
private GuidPartitionInfo[] Package2 { get; }
private GuidPartitionInfo Safe { get; } private GuidPartitionInfo Safe { get; }
private GuidPartitionInfo System { get; } private GuidPartitionInfo System { get; }
private GuidPartitionInfo User { get; } private GuidPartitionInfo User { get; }
@ -23,6 +24,16 @@ namespace LibHac.Nand
GuidPartitionInfo[] partitions = disc.Partitions.Select(x => (GuidPartitionInfo)x).ToArray(); GuidPartitionInfo[] partitions = disc.Partitions.Select(x => (GuidPartitionInfo)x).ToArray();
ProdInfo = partitions.FirstOrDefault(x => x.Name == "PRODINFO"); ProdInfo = partitions.FirstOrDefault(x => x.Name == "PRODINFO");
ProdInfoF = partitions.FirstOrDefault(x => x.Name == "PRODINFOF"); ProdInfoF = partitions.FirstOrDefault(x => x.Name == "PRODINFOF");
Package2 = new GuidPartitionInfo[]
{
partitions.FirstOrDefault(x => x.Name == "BCPKG2-1-Normal-Main"),
partitions.FirstOrDefault(x => x.Name == "BCPKG2-2-Normal-Sub"),
partitions.FirstOrDefault(x => x.Name == "BCPKG2-3-SafeMode-Main"),
partitions.FirstOrDefault(x => x.Name == "BCPKG2-4-SafeMode-Sub"),
partitions.FirstOrDefault(x => x.Name == "BCPKG2-5-Repair-Main"),
partitions.FirstOrDefault(x => x.Name == "BCPKG2-6-Repair-Sub")
};
Safe = partitions.FirstOrDefault(x => x.Name == "SAFE"); Safe = partitions.FirstOrDefault(x => x.Name == "SAFE");
System = partitions.FirstOrDefault(x => x.Name == "SYSTEM"); System = partitions.FirstOrDefault(x => x.Name == "SYSTEM");
User = partitions.FirstOrDefault(x => x.Name == "USER"); User = partitions.FirstOrDefault(x => x.Name == "USER");
@ -46,6 +57,11 @@ namespace LibHac.Nand
return new NandPartition(fat); return new NandPartition(fat);
} }
public IStorage OpenPackage2(int index)
{
return Package2[index].Open().AsStorage();
}
public NandPartition OpenSafePartition() public NandPartition OpenSafePartition()
{ {
IStorage encStorage = Safe.Open().AsStorage(); IStorage encStorage = Safe.Open().AsStorage();

21
src/LibHac.Nand/NandPartition.cs
View file

@ -2,6 +2,7 @@
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using DiscUtils.Fat; using DiscUtils.Fat;
using LibHac.IO;
namespace LibHac.Nand namespace LibHac.Nand
{ {
@ -9,7 +10,7 @@ namespace LibHac.Nand
{ {
public FatFileSystem Fs { get; } public FatFileSystem Fs { get; }
public override string PathSeperator => "/"; public override string PathSeperator => "\\";
public override IDirectory RootDirectory => new IDirectory(this, ""); public override IDirectory RootDirectory => new IDirectory(this, "");
public NandPartition(FatFileSystem fileSystem) public NandPartition(FatFileSystem fileSystem)
@ -27,14 +28,14 @@ namespace LibHac.Nand
return Fs.DirectoryExists(directory.Path); return Fs.DirectoryExists(directory.Path);
} }
public new virtual Stream OpenFile(IFile file, FileMode mode) public new virtual IStorage OpenFile(IFile file, FileMode mode)
{ {
return Fs.OpenFile(file.Path, mode); return Fs.OpenFile(file.Path, mode).AsStorage();
} }
public override Stream OpenFile(IFile file, FileMode mode, FileAccess access) public override IStorage OpenFile(IFile file, FileMode mode, FileAccess access)
{ {
return Fs.OpenFile(file.Path, mode, access); return Fs.OpenFile(file.Path, mode, access).AsStorage();
} }
public new virtual IFileSytemEntry[] GetFileSystemEntries(IDirectory directory, string searchPattern) public new virtual IFileSytemEntry[] GetFileSystemEntries(IDirectory directory, string searchPattern)
@ -46,12 +47,12 @@ namespace LibHac.Nand
{ {
string[] files = Fs.GetFiles(directory.Path, searchPattern, searchOption); string[] files = Fs.GetFiles(directory.Path, searchPattern, searchOption);
string[] dirs = Fs.GetDirectories(directory.Path, searchPattern, searchOption); string[] dirs = Fs.GetDirectories(directory.Path, searchPattern, searchOption);
IFileSytemEntry[] entries = new IFileSytemEntry[files.Length + dirs.Length]; List<IFileSytemEntry> entries = new List<IFileSytemEntry>();
for (int i = 0; i < files.Length; i++)
entries[i] = new IFile(this, files[i]);
for (int i = 0; i < dirs.Length; i++) for (int i = 0; i < dirs.Length; i++)
entries[i] = new IDirectory(this, files[i]); entries.Add(new IDirectory(this, dirs[i]));
return entries; for (int i = 0; i < files.Length; i++)
entries.Add(new IFile(this, files[i]));
return entries.ToArray();
} }
public string GetFullPath(string path) public string GetFullPath(string path)

54
src/LibHac/FileSystem/IFileSystem.cs
View file

@ -1,4 +1,5 @@
using System.IO; using LibHac.IO;
using System.IO;
namespace LibHac namespace LibHac
{ {
@ -11,11 +12,11 @@ namespace LibHac
public abstract bool FileExists(IFile path); public abstract bool FileExists(IFile path);
public abstract bool DirectoryExists(IDirectory path); public abstract bool DirectoryExists(IDirectory path);
public Stream OpenFile(IFile file, FileMode mode) public IStorage OpenFile(IFile file, FileMode mode)
{ {
return OpenFile(file, mode, FileAccess.ReadWrite); return OpenFile(file, mode, FileAccess.ReadWrite);
} }
public abstract Stream OpenFile(IFile file, FileMode mode, FileAccess access); public abstract IStorage OpenFile(IFile file, FileMode mode, FileAccess access);
public IFileSytemEntry[] GetFileSystemEntries(IDirectory directory, string searchPattern) public IFileSytemEntry[] GetFileSystemEntries(IDirectory directory, string searchPattern)
{ {
@ -46,30 +47,33 @@ namespace LibHac
} }
public interface IFileSytemEntry public abstract class IFileSytemEntry
{ {
IFileSystem FileSystem { get; } public abstract IFileSystem FileSystem { get; }
string Path { get; } public abstract string Path { get; }
bool Exists { get; } public abstract bool Exists { get; }
}
public class IDirectory : IFileSytemEntry
{
public IFileSystem FileSystem { get; }
public string Path { get; }
public IDirectory Parent public IDirectory Parent
{ {
get get
{ {
int index = Path.LastIndexOf(FileSystem.PathSeperator); int index = Path.LastIndexOf(FileSystem.PathSeperator);
return FileSystem.GetDirectory(Path.Substring(0, index)); if(index > 0)
return FileSystem.GetDirectory(Path.Substring(0, index));
return null;
} }
} }
}
public class IDirectory : IFileSytemEntry
{
public override IFileSystem FileSystem { get; }
public override string Path { get; }
public override bool Exists => FileSystem.DirectoryExists(this);
public IFile[] Files => FileSystem.GetFiles(this); public IFile[] Files => FileSystem.GetFiles(this);
public IDirectory[] Directories => FileSystem.GetDirectories(this); public IDirectory[] Directories => FileSystem.GetDirectories(this);
public bool Exists => FileSystem.DirectoryExists(this);
public IDirectory(IFileSystem filesystem, string path) public IDirectory(IFileSystem filesystem, string path)
{ {
@ -100,36 +104,26 @@ namespace LibHac
public class IFile : IFileSytemEntry public class IFile : IFileSytemEntry
{ {
public IFileSystem FileSystem { get; } public override IFileSystem FileSystem { get; }
public string Path { get; } public override string Path { get; }
public override bool Exists => FileSystem.FileExists(this);
public string Name => System.IO.Path.GetFileNameWithoutExtension(Path); public string Name => System.IO.Path.GetFileNameWithoutExtension(Path);
public string Extension => System.IO.Path.GetExtension(Path); public string Extension => System.IO.Path.GetExtension(Path);
public string FileName => System.IO.Path.GetFileName(Path); public string FileName => System.IO.Path.GetFileName(Path);
public bool Exists => FileSystem.FileExists(this);
public IDirectory Parent {
get
{
int index = Path.LastIndexOf(FileSystem.PathSeperator);
return FileSystem.GetDirectory(Path.Substring(0, index));
}
}
public IFile(IFileSystem filesystem, string path) public IFile(IFileSystem filesystem, string path)
{ {
FileSystem = filesystem; FileSystem = filesystem;
Path = path; Path = path;
} }
public Stream Open(FileMode mode) public IStorage Open(FileMode mode)
{ {
return FileSystem.OpenFile(this, mode); return FileSystem.OpenFile(this, mode);
} }
public Stream Open(FileMode mode, FileAccess access) public IStorage Open(FileMode mode, FileAccess access)
{ {
return FileSystem.OpenFile(this, mode, access); return FileSystem.OpenFile(this, mode, access);
} }

7
src/LibHac/FileSystem/LocalFileSystem.cs
View file

@ -1,4 +1,5 @@
using System; using LibHac.IO;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -26,9 +27,9 @@ namespace LibHac
return Directory.Exists(Path.Combine(Root, directory.Path)); return Directory.Exists(Path.Combine(Root, directory.Path));
} }
public override Stream OpenFile(IFile file, FileMode mode, FileAccess access) public override IStorage OpenFile(IFile file, FileMode mode, FileAccess access)
{ {
return new FileStream(GetFullPath(file), mode, access); return new FileStream(GetFullPath(file), mode, access).AsStorage();
} }
public override IFileSytemEntry[] GetFileSystemEntries(IDirectory path, string searchPattern, SearchOption searchOption) public override IFileSytemEntry[] GetFileSystemEntries(IDirectory path, string searchPattern, SearchOption searchOption)

14
src/LibHac/Pfs0Builder.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic; using LibHac.IO;
using System.Collections.Generic;
using System.IO; using System.IO;
namespace LibHac namespace LibHac
@ -8,13 +9,13 @@ namespace LibHac
private List<Entry> Entries { get; } = new List<Entry>(); private List<Entry> Entries { get; } = new List<Entry>();
private long DataLength { get; set; } private long DataLength { get; set; }
public void AddFile(string filename, Stream stream) public void AddFile(string filename, IStorage storage)
{ {
var entry = new Entry var entry = new Entry
{ {
Name = filename, Name = filename,
Stream = stream, Storage = storage,
Length = stream.Length, Length = storage.Length,
Offset = DataLength Offset = DataLength
}; };
@ -57,8 +58,7 @@ namespace LibHac
foreach (Entry entry in Entries) foreach (Entry entry in Entries)
{ {
logger?.LogMessage(entry.Name); logger?.LogMessage(entry.Name);
entry.Stream.Position = 0; entry.Storage.CopyTo(output.AsStorage(), logger);
entry.Stream.CopyStream(output, entry.Length, logger);
} }
logger?.SetTotal(0); logger?.SetTotal(0);
} }
@ -66,7 +66,7 @@ namespace LibHac
private class Entry private class Entry
{ {
public string Name; public string Name;
public Stream Stream; public IStorage Storage;
public long Length; public long Length;
public long Offset; public long Offset;
public int StringOffset; public int StringOffset;

11
src/LibHac/SwitchFs.cs
View file

@ -128,7 +128,7 @@ namespace LibHac
try try
{ {
IStorage storage = Fs.OpenFile(file, FileMode.Open).AsStorage(); IStorage storage = Fs.OpenFile(file, FileMode.Open);
string sdPath = Util.GetRelativePath(file.Path, SaveDir.Path).Replace("\\", "/"); string sdPath = Util.GetRelativePath(file.Path, SaveDir.Path).Replace("\\", "/");
var nax0 = new Nax0(Keyset, storage, sdPath, false); var nax0 = new Nax0(Keyset, storage, sdPath, false);
@ -256,9 +256,8 @@ namespace LibHac
{ {
IFile file = (IFile)nca; IFile file = (IFile)nca;
if (file.Name != "00") if (file.Name != "00")
{ return file.Open(FileMode.Open, FileAccess.Read);
return file.Open(FileMode.Open, FileAccess.Read).AsStorage();
}
files.Add(file); files.Add(file);
} }
else if (typeof(IDirectory).IsAssignableFrom(nca.GetType())) else if (typeof(IDirectory).IsAssignableFrom(nca.GetType()))
@ -277,10 +276,10 @@ namespace LibHac
throw new FileNotFoundException("Could not find the input file or directory"); throw new FileNotFoundException("Could not find the input file or directory");
if (files.Count == 1) if (files.Count == 1)
return files[0].Open(FileMode.Open, FileAccess.Read).AsStorage(); return files[0].Open(FileMode.Open, FileAccess.Read);
foreach (IFile file in files) foreach (IFile file in files)
storages.Add(file.Open( FileMode.Open, FileAccess.Read).AsStorage()); storages.Add(file.Open( FileMode.Open, FileAccess.Read));
if (storages.Count == 0) return null; //todo if (storages.Count == 0) return null; //todo