From 651c8e090dd2a0370163ce7528714f8c4dea8758 Mon Sep 17 00:00:00 2001 From: jakcron Date: Fri, 1 Oct 2021 20:48:44 +0800 Subject: [PATCH] Add connections for NacpProcess. --- src/AssetProcess.cpp | 8 ++++---- src/AssetProcess.h | 2 +- src/main.cpp | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/AssetProcess.cpp b/src/AssetProcess.cpp index 06873d6..dfa9658 100644 --- a/src/AssetProcess.cpp +++ b/src/AssetProcess.cpp @@ -95,11 +95,11 @@ void nstool::AssetProcess::processSections() writeSubStreamToFile(mFile, mHdr.getNacpInfo().offset, mHdr.getNacpInfo().size, mNacpExtractPath.get()); } - //mNacp.setInputFile(std::make_shared(mFile, mHdr.getNacpInfo().offset, mHdr.getNacpInfo().size)); - //mNacp.setCliOutputMode(mCliOutputMode); - //mNacp.setVerifyMode(mVerify); + mNacp.setInputFile(std::make_shared(mFile, mHdr.getNacpInfo().offset, mHdr.getNacpInfo().size)); + mNacp.setCliOutputMode(mCliOutputMode); + mNacp.setVerifyMode(mVerify); - //mNacp.process(); + mNacp.process(); } if (mHdr.getRomfsInfo().size > 0) diff --git a/src/AssetProcess.h b/src/AssetProcess.h index a2ce24b..f81aa39 100644 --- a/src/AssetProcess.h +++ b/src/AssetProcess.h @@ -36,7 +36,7 @@ private: tc::Optional mNacpExtractPath; nn::hac::AssetHeader mHdr; - //NacpProcess mNacp; + NacpProcess mNacp; //RomfsProcess mRomfs; void importHeader(); diff --git a/src/main.cpp b/src/main.cpp index 4a86c61..15f0d70 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,7 +11,7 @@ #include "CnmtProcess.h" //#include "NsoProcess.h" //#include "NroProcess.h" -//#include "NacpProcess.h" +#include "NacpProcess.h" //#include "IniProcess.h" //#include "KipProcess.h" //#include "PkiCertProcess.h" @@ -162,6 +162,7 @@ int umain(const std::vector& args, const std::vector& obj.process(); } + */ else if (set.infile.filetype == nstool::Settings::FILE_TYPE_NACP) { nstool::NacpProcess obj; @@ -172,6 +173,7 @@ int umain(const std::vector& args, const std::vector& obj.process(); } + /* else if (set.infile.filetype == nstool::Settings::FILE_TYPE_INI) { nstool::IniProcess obj;