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

Improve finding a title's main RomFS

Browse source
This commit is contained in:
Alex Barney 2018-07-05 21:37:46 -05:00
parent c4efec762f
commit 57103c0e0b
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
hactoolnet/Program.cs
View file

@ -16,17 +16,17 @@ namespace hactoolnet
ctx.Options = CliParser.Parse(args); ctx.Options = CliParser.Parse(args);
if (ctx.Options == null) return; if (ctx.Options == null) return;
using (var logger = new ProgressBar())
{
ctx.Logger = logger;
OpenKeyset(ctx);
if (ctx.Options.RunCustom) if (ctx.Options.RunCustom)
{ {
CustomTask(ctx); CustomTask(ctx);
return; return;
} }
using (var logger = new ProgressBar())
{
ctx.Logger = logger;
OpenKeyset(ctx);
switch (ctx.Options.InFileType) switch (ctx.Options.InFileType)
{ {
case FileType.Nca: case FileType.Nca:
@ -120,13 +120,21 @@ namespace hactoolnet
return; return;
} }
if (title.ProgramNca == null) if (title.MainNca == null)
{ {
ctx.Logger.LogMessage($"Could not find main program data for title {id:X16}"); ctx.Logger.LogMessage($"Could not find main data for title {id:X16}");
return; return;
} }
var romfs = new Romfs(title.ProgramNca.OpenSection(1, false)); var section = title.MainNca.Sections.FirstOrDefault(x => x.Type == SectionType.Romfs);
if (section == null)
{
ctx.Logger.LogMessage($"Main NCA for title {id:X16} has no Rom FS section");
return;
}
var romfs = new Romfs(title.MainNca.OpenSection(section.SectionNum, false));
romfs.Extract(ctx.Options.RomfsOutDir, ctx.Logger); romfs.Extract(ctx.Options.RomfsOutDir, ctx.Logger);
} }
@ -189,7 +197,7 @@ namespace hactoolnet
{ {
var sdfs = LoadSdFs(args); var sdfs = LoadSdFs(args);
var title = sdfs.Titles[0x0100E95004038000]; var title = sdfs.Titles[0x0100E95004038000];
var nca = title.ProgramNca; var nca = title.MainNca;
var romfsStream = nca.OpenSection(1, false); var romfsStream = nca.OpenSection(1, false);
var romfs = new Romfs(romfsStream); var romfs = new Romfs(romfsStream);
var file = romfs.OpenFile("/stream/voice/us/127/127390101.nop"); var file = romfs.OpenFile("/stream/voice/us/127/127390101.nop");

2
libhac/NcaStructs.cs
View file

@ -275,7 +275,7 @@ namespace libhac
Control, Control,
Manual, Manual,
Data, Data,
Unknown AocData
} }
public enum DistributionType public enum DistributionType

5
libhac/SdFs.cs
View file

@ -111,7 +111,8 @@ namespace libhac
switch (content.Type) switch (content.Type)
{ {
case CnmtContentType.Program: case CnmtContentType.Program:
title.ProgramNca = contentNca; case CnmtContentType.Data:
title.MainNca = contentNca;
break; break;
case CnmtContentType.Control: case CnmtContentType.Control:
title.ControlNca = contentNca; title.ControlNca = contentNca;
@ -227,7 +228,7 @@ namespace libhac
public string Name { get; internal set; } public string Name { get; internal set; }
public Nacp Control { get; internal set; } public Nacp Control { get; internal set; }
public Nca MetaNca { get; internal set; } public Nca MetaNca { get; internal set; }
public Nca ProgramNca { get; internal set; } public Nca MainNca { get; internal set; }
public Nca ControlNca { get; internal set; } public Nca ControlNca { get; internal set; }
public long GetSize() public long GetSize()