nold/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool synced 2024-11-15 02:06:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[nstool] Change order of XCI partition.

Browse source
This commit is contained in:
jakcron 2018-06-17 21:08:24 +08:00
parent 0c7333fa74
commit b5605ee3e9
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
programs/nstool/source/UserSettings.cpp
View file

@ -49,8 +49,8 @@ void UserSettings::showHelp()
printf(" nstool [--listfs] [--update <dir> --normal <dir> --secure <dir>] <.xci file>\n"); printf(" nstool [--listfs] [--update <dir> --normal <dir> --secure <dir>] <.xci file>\n");
printf(" --listfs Print file system in embedded partitions\n"); printf(" --listfs Print file system in embedded partitions\n");
printf(" --update Extract \"update\" partition to directory\n"); printf(" --update Extract \"update\" partition to directory\n");
printf(" --normal Extract \"normal\" partition to directory\n");
printf(" --logo Extract \"logo\" partition to directory\n"); printf(" --logo Extract \"logo\" partition to directory\n");
printf(" --normal Extract \"normal\" partition to directory\n");
printf(" --secure Extract \"secure\" partition to directory\n"); printf(" --secure Extract \"secure\" partition to directory\n");
printf("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Ninendo Submission Package)\n"); printf("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Ninendo Submission Package)\n");
printf(" nstool [--listfs] [--fsdir <dir>] <file>\n"); printf(" nstool [--listfs] [--fsdir <dir>] <file>\n");
@ -128,6 +128,11 @@ const sOptional<std::string>& UserSettings::getXciUpdatePath() const
return mXciUpdatePath; return mXciUpdatePath;
} }
const sOptional<std::string>& UserSettings::getXciLogoPath() const
{
return mXciLogoPath;
}
const sOptional<std::string>& UserSettings::getXciNormalPath() const const sOptional<std::string>& UserSettings::getXciNormalPath() const
{ {
return mXciNormalPath; return mXciNormalPath;
@ -138,11 +143,6 @@ const sOptional<std::string>& UserSettings::getXciSecurePath() const
return mXciSecurePath; return mXciSecurePath;
} }
const sOptional<std::string>& UserSettings::getXciLogoPath() const
{
return mXciLogoPath;
}
const sOptional<std::string>& UserSettings::getFsPath() const const sOptional<std::string>& UserSettings::getFsPath() const
{ {
return mFsPath; return mFsPath;

6
programs/nstool/source/UserSettings.h
View file

@ -27,9 +27,9 @@ public:
// specialised paths // specialised paths
const sOptional<std::string>& getXciUpdatePath() const; const sOptional<std::string>& getXciUpdatePath() const;
const sOptional<std::string>& getXciLogoPath() const;
const sOptional<std::string>& getXciNormalPath() const; const sOptional<std::string>& getXciNormalPath() const;
const sOptional<std::string>& getXciSecurePath() const; const sOptional<std::string>& getXciSecurePath() const;
const sOptional<std::string>& getXciLogoPath() const;
const sOptional<std::string>& getFsPath() const; const sOptional<std::string>& getFsPath() const;
const sOptional<std::string>& getNcaPart0Path() const; const sOptional<std::string>& getNcaPart0Path() const;
const sOptional<std::string>& getNcaPart1Path() const; const sOptional<std::string>& getNcaPart1Path() const;
@ -53,9 +53,9 @@ private:
sOptional<bool> minimal_output; sOptional<bool> minimal_output;
sOptional<bool> list_fs; sOptional<bool> list_fs;
sOptional<std::string> update_path; sOptional<std::string> update_path;
sOptional<std::string> logo_path;
sOptional<std::string> normal_path; sOptional<std::string> normal_path;
sOptional<std::string> secure_path; sOptional<std::string> secure_path;
sOptional<std::string> logo_path;
sOptional<std::string> fs_path; sOptional<std::string> fs_path;
sOptional<std::string> nca_titlekey; sOptional<std::string> nca_titlekey;
sOptional<std::string> nca_bodykey; sOptional<std::string> nca_bodykey;
@ -78,9 +78,9 @@ private:
bool mListFs; bool mListFs;
sOptional<std::string> mXciUpdatePath; sOptional<std::string> mXciUpdatePath;
sOptional<std::string> mXciLogoPath;
sOptional<std::string> mXciNormalPath; sOptional<std::string> mXciNormalPath;
sOptional<std::string> mXciSecurePath; sOptional<std::string> mXciSecurePath;
sOptional<std::string> mXciLogoPath;
sOptional<std::string> mFsPath; sOptional<std::string> mFsPath;
sOptional<std::string> mNcaPart0Path; sOptional<std::string> mNcaPart0Path;

4
programs/nstool/source/main.cpp
View file

@ -30,12 +30,12 @@ int main(int argc, char** argv)
if (user_set.getXciUpdatePath().isSet) if (user_set.getXciUpdatePath().isSet)
xci.setPartitionForExtract(nx::xci::kUpdatePartitionStr, user_set.getXciUpdatePath().var); xci.setPartitionForExtract(nx::xci::kUpdatePartitionStr, user_set.getXciUpdatePath().var);
if (user_set.getXciLogoPath().isSet)
xci.setPartitionForExtract(nx::xci::kLogoPartitionStr, user_set.getXciLogoPath().var);
if (user_set.getXciNormalPath().isSet) if (user_set.getXciNormalPath().isSet)
xci.setPartitionForExtract(nx::xci::kNormalPartitionStr, user_set.getXciNormalPath().var); xci.setPartitionForExtract(nx::xci::kNormalPartitionStr, user_set.getXciNormalPath().var);
if (user_set.getXciSecurePath().isSet) if (user_set.getXciSecurePath().isSet)
xci.setPartitionForExtract(nx::xci::kSecurePartitionStr, user_set.getXciSecurePath().var); xci.setPartitionForExtract(nx::xci::kSecurePartitionStr, user_set.getXciSecurePath().var);
if (user_set.getXciLogoPath().isSet)
xci.setPartitionForExtract(nx::xci::kLogoPartitionStr, user_set.getXciLogoPath().var);
xci.setListFs(user_set.isListFs()); xci.setListFs(user_set.isListFs());
xci.process(); xci.process();