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

Add LocalStorage class

Browse source
This commit is contained in:
Alex Barney 2019-01-22 15:09:46 -06:00
parent 1d07a98d1e
commit 42044d02ba
11 changed files with 62 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/LibHac/IO/LocalStorage.cs Normal file
View file

@ -0,0 +1,41 @@
using System;
using System.IO;
namespace LibHac.IO
{
public class LocalStorage : StorageBase
{
private string Path { get; }
private FileStream Stream { get; }
private StreamStorage Storage { get; }
public LocalStorage(string path, FileAccess access) : this(path, access, FileMode.Open) { }
public LocalStorage(string path, FileAccess access, FileMode mode)
{
Path = path;
Stream = new FileStream(Path, mode, access);
Storage = new StreamStorage(Stream, false);
ToDispose.Add(Storage);
ToDispose.Add(Stream);
}
protected override void ReadImpl(Span<byte> destination, long offset)
{
Storage.Read(destination, offset);
}
protected override void WriteImpl(ReadOnlySpan<byte> source, long offset)
{
Storage.Write(source, offset);
}
public override void Flush()
{
Storage.Flush();
}
public override long Length => Stream.Length;
}
}

3
src/LibHac/IO/Save/SaveDataFileSystemCore.cs
View file

@ -54,8 +54,7 @@ namespace LibHac.IO.Save
{
if (file.BlockIndex < 0)
{
// todo
return new MemoryStorage(new byte[0]);
return new NullStorage(0);
}
return OpenFatBlock(file.BlockIndex, file.FileSize);

17
src/LibHac/Util.cs
View file

@ -184,23 +184,6 @@ namespace LibHac
return Encoding.UTF8.GetString(reader.ReadBytes(size), 0, size);
}
// todo Maybe make less naive
public static string GetRelativePath(string path, string basePath)
{
var directory = new DirectoryInfo(basePath);
var file = new FileInfo(path);
string fullDirectory = directory.FullName;
string fullFile = file.FullName;
if (!fullFile.StartsWith(fullDirectory))
{
throw new ArgumentException($"{nameof(path)} is not a subpath of {nameof(basePath)}");
}
return fullFile.Substring(fullDirectory.Length + 1);
}
private static bool TryHexToInt(char c, out int value)
{
switch (c)

4
src/hactoolnet/ProcessDelta.cs
View file

@ -15,7 +15,7 @@ namespace hactoolnet
public static void Process(Context ctx)
{
using (IStorage deltaFile = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read).AsStorage(false))
using (IStorage deltaFile = new LocalStorage(ctx.Options.InFile, FileAccess.Read))
{
IStorage deltaStorage = deltaFile;
Span<byte> magic = stackalloc byte[4];
@ -42,7 +42,7 @@ namespace hactoolnet
if (ctx.Options.BaseFile != null)
{
using (IStorage baseFile = new FileStream(ctx.Options.BaseFile, FileMode.Open, FileAccess.Read).AsStorage(false))
using (IStorage baseFile = new LocalStorage(ctx.Options.BaseFile, FileAccess.Read))
{
delta.SetBaseStorage(baseFile);

8
src/hactoolnet/ProcessKip.cs
View file

@ -8,18 +8,18 @@ namespace hactoolnet
{
public static void ProcessKip1(Context ctx)
{
using (var file = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read))
using (var file = new LocalStorage(ctx.Options.InFile, FileAccess.Read))
{
var kip = new Kip(file.AsStorage());
var kip = new Kip(file);
kip.OpenRawFile();
}
}
public static void ProcessIni1(Context ctx)
{
using (var file = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read))
using (var file = new LocalStorage(ctx.Options.InFile, FileAccess.Read))
{
var ini1 = new Ini1(file.AsStorage());
var ini1 = new Ini1(file);
string outDir = ctx.Options.OutDir;

4
src/hactoolnet/ProcessNca.cs
View file

@ -11,7 +11,7 @@ namespace hactoolnet
{
public static void Process(Context ctx)
{
using (IStorage file = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read).AsStorage(false))
using (IStorage file = new LocalStorage(ctx.Options.InFile, FileAccess.Read))
{
var nca = new Nca(ctx.Keyset, file, false);
nca.ValidateMasterHashes();
@ -19,7 +19,7 @@ namespace hactoolnet
if (ctx.Options.BaseNca != null)
{
IStorage baseFile = new FileStream(ctx.Options.BaseNca, FileMode.Open, FileAccess.Read).AsStorage(false);
IStorage baseFile = new LocalStorage(ctx.Options.BaseNca, FileAccess.Read);
var baseNca = new Nca(ctx.Keyset, baseFile, false);
nca.SetBaseNca(baseNca);
}

4
src/hactoolnet/ProcessNsp.cs
View file

@ -11,9 +11,9 @@ namespace hactoolnet
{
public static void Process(Context ctx)
{
using (var file = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read))
using (var file = new LocalStorage(ctx.Options.InFile, FileAccess.Read))
{
var pfs = new PartitionFileSystem(file.AsStorage());
var pfs = new PartitionFileSystem(file);
ctx.Logger.LogMessage(pfs.Print());
if (ctx.Options.OutDir != null)

6
src/hactoolnet/ProcessPackage.cs
View file

@ -10,9 +10,9 @@ namespace hactoolnet
{
public static void ProcessPk11(Context ctx)
{
using (var file = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read))
using (var file = new LocalStorage(ctx.Options.InFile, FileAccess.Read))
{
var package1 = new Package1(ctx.Keyset, file.AsStorage());
var package1 = new Package1(ctx.Keyset, file);
string outDir = ctx.Options.OutDir;
if (outDir != null)
@ -29,7 +29,7 @@ namespace hactoolnet
public static void ProcessPk21(Context ctx)
{
using (var file = new CachedStorage(new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read).AsStorage(), 0x4000, 4, false))
using (var file = new CachedStorage(new LocalStorage(ctx.Options.InFile, FileAccess.Read), 0x4000, 4, false))
{
var package2 = new Package2(ctx.Keyset, file);

4
src/hactoolnet/ProcessRomfs.cs
View file

@ -8,9 +8,9 @@ namespace hactoolnet
{
public static void Process(Context ctx)
{
using (var file = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read))
using (var file = new LocalStorage(ctx.Options.InFile, FileAccess.Read))
{
var romfs = new RomFsFileSystem(file.AsStorage());
var romfs = new RomFsFileSystem(file);
Process(ctx, romfs);
}
}

6
src/hactoolnet/ProcessSave.cs
View file

@ -12,9 +12,9 @@ namespace hactoolnet
{
public static void Process(Context ctx)
{
using (var file = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.ReadWrite))
using (var file = new LocalStorage(ctx.Options.InFile, FileAccess.ReadWrite))
{
var save = new SaveDataFileSystem(ctx.Keyset, file.AsStorage(), ctx.Options.IntegrityLevel, true);
var save = new SaveDataFileSystem(ctx.Keyset, file, ctx.Options.IntegrityLevel, true);
if (ctx.Options.Validate)
{
@ -99,7 +99,7 @@ namespace hactoolnet
string destFilename = ctx.Options.ReplaceFileDest;
if (!destFilename.StartsWith("/")) destFilename = '/' + destFilename;
using (IFile inFile = new FileStream(ctx.Options.ReplaceFileSource, FileMode.Open, FileAccess.Read).AsIFile(OpenMode.ReadWrite))
using (IFile inFile = new LocalFile(ctx.Options.ReplaceFileSource, OpenMode.Read))
{
using (IFile outFile = save.OpenFile(destFilename, OpenMode.ReadWrite))
{

4
src/hactoolnet/ProcessXci.cs
View file

@ -11,9 +11,9 @@ namespace hactoolnet
{
public static void Process(Context ctx)
{
using (var file = new FileStream(ctx.Options.InFile, FileMode.Open, FileAccess.Read))
using (var file = new LocalStorage(ctx.Options.InFile, FileAccess.Read))
{
var xci = new Xci(ctx.Keyset, file.AsStorage());
var xci = new Xci(ctx.Keyset, file);
ctx.Logger.LogMessage(xci.Print());