mirrors/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool.git synced 2024-12-22 10:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revise help text again

Browse source
This commit is contained in:
jakcron 2021-11-09 20:23:20 +08:00
parent 187cbca7e3
commit 1b27126a91
2 changed files with 48 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
README.md
View file

@ -32,30 +32,31 @@ Usage: nstool [options... ] <file>
-v, --verbose Verbose output. -v, --verbose Verbose output.
PFS0/HFS0 (PartitionFs), RomFs, NSP (Nintendo Submission Package) PFS0/HFS0 (PartitionFs), RomFs, NSP (Nintendo Submission Package)
nstool [--listfs] [--fsdir [<virtual path>] <out path>] <file> nstool [--fstree] [-x [<virtual path>] <out path>] <file>
--listfs Print file system. --fstree Print filesystem tree.
-x, --fsdir Extract file system to directory. -x, --extract Extract a file or directory to local filesystem.
XCI (GameCard Image) XCI (GameCard Image)
nstool [--listfs] [--fsdir [<virtual path>] <out path>] [--update <dir> --logo <dir> --normal <dir> --secure <dir>] <.xci file> nstool [--fstree] [-x [<virtual path>] <out path>] <.xci file>
--listfs Print file system. --fstree Print filesystem tree.
-x, --fsdir Extract file system to directory. -x, --extract Extract a file or directory to local filesystem.
--update Extract "update" partition to directory. (Alias for "-x /update <out path>") --update Extract "update" partition to directory. (Alias for "-x /update <out path>")
--logo Extract "logo" partition to directory. (Alias for "-x /logo <out path>") --logo Extract "logo" partition to directory. (Alias for "-x /logo <out path>")
--normal Extract "normal" partition to directory. (Alias for "-x /normal <out path>") --normal Extract "normal" partition to directory. (Alias for "-x /normal <out path>")
--secure Extract "secure" partition to directory. (Alias for "-x /secure <out path>") --secure Extract "secure" partition to directory. (Alias for "-x /secure <out path>")
NCA (Nintendo Content Archive) NCA (Nintendo Content Archive)
nstool [--listfs] [--bodykey <key> --titlekey <key>] [--fsdir [<virtual path>] <out path>] [--part0 <dir> ...] <.nca file> nstool [--fstree] [-x [<virtual path>] <out path>] [--bodykey <key> --titlekey <key> -tik <tik path>] <.nca file>
--listfs Print file system. --fstree Print filesystem tree.
-x, --fsdir Extract file system to directory. -x, --extract Extract a file or directory to local filesystem.
--titlekey Specify title key extracted from ticket. --titlekey Specify title key extracted from ticket.
--bodykey Specify body encryption key.
--tik Specify ticket to source title key. --tik Specify ticket to source title key.
--cert Specify certificate chain to verify ticket. --cert Specify certificate chain to verify ticket.
--part0 Extract "partition 0" to directory. (Alias for "-x /0 <out path>") --part0 Extract partition "0" to directory. (Alias for "-x /0 <out path>")
--part1 Extract "partition 1" to directory. (Alias for "-x /1 <out path>") --part1 Extract partition "1" to directory. (Alias for "-x /1 <out path>")
--part2 Extract "partition 2" to directory. (Alias for "-x /2 <out path>") --part2 Extract partition "2" to directory. (Alias for "-x /2 <out path>")
--part3 Extract "partition 3" to directory. (Alias for "-x /3 <out path>") --part3 Extract partition "3" to directory. (Alias for "-x /3 <out path>")
NSO (Nintendo Shared Object), NRO (Nintendo Relocatable Object) NSO (Nintendo Shared Object), NRO (Nintendo Relocatable Object)
nstool [--listapi --listsym] [--insttype <inst. type>] <file> nstool [--listapi --listsym] [--insttype <inst. type>] <file>
@ -68,11 +69,11 @@ Usage: nstool [options... ] <file>
--kipdir Extract embedded Inital Programs to directory. --kipdir Extract embedded Inital Programs to directory.
ASET (Homebrew Asset Blob) ASET (Homebrew Asset Blob)
nstool [--listfs] [--icon <file> --nacp <file> --fsdir <dir>] <file> nstool [--fstree] [-x [<virtual path>] <out path>] [--icon <file> --nacp <file>] <file>
--listfs Print filesystem in embedded RomFS partition. --fstree Print RomFS filesystem tree.
-x, --extract Extract a file or directory from RomFS to local filesystem.
--icon Extract icon partition to file. --icon Extract icon partition to file.
--nacp Extract NACP partition to file. --nacp Extract NACP partition to file.
-x, --fsdir Extract RomFS partition to directory.
``` ```
# External Keys # External Keys

51
src/Settings.cpp
View file

@ -407,7 +407,17 @@ public:
std::string custom_path_str; std::string custom_path_str;
tc::io::PathUtil::pathToUnixUTF8(mCustomPath, custom_path_str); tc::io::PathUtil::pathToUnixUTF8(mCustomPath, custom_path_str);
fmt::print("[WARNING] \"{:s} {:s}\" is deprecated. Consider using \"-x {:s} {:s}\" instead.\n", option, params[0], custom_path_str, params[0]); fmt::print("[WARNING] \"{:s} {:s}\" is deprecated. ", option, params[0]);
// if custom path is root path, use the shortened version of -x
if (mCustomPath == tc::io::Path("/"))
{
fmt::print("Consider using \"-x {:s}\" instead.\n", params[0]);
}
else
{
fmt::print("Consider using \"-x {:s} {:s}\" instead.\n", custom_path_str, params[0]);
}
mJobs.push_back({mCustomPath, tc::io::Path(params[0])}); mJobs.push_back({mCustomPath, tc::io::Path(params[0])});
} }
@ -550,8 +560,9 @@ void nstool::SettingsInitializer::parse_args(const std::vector<std::string>& arg
opts.registerOptionHandler(std::shared_ptr<InstructionTypeOptionHandler>(new InstructionTypeOptionHandler(code.is_64bit_instruction, { "--insttype" }))); opts.registerOptionHandler(std::shared_ptr<InstructionTypeOptionHandler>(new InstructionTypeOptionHandler(code.is_64bit_instruction, { "--insttype" })));
// fs options // fs options
opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(fs.show_fs_tree, { "--listfs" }))); opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(fs.show_fs_tree, { "--fstree", "--listfs" })));
opts.registerOptionHandler(std::shared_ptr<ExtractDataPathOptionHandler>(new ExtractDataPathOptionHandler(fs.extract_jobs, { "--fsdir", "-x", "--extract" }))); opts.registerOptionHandler(std::shared_ptr<ExtractDataPathOptionHandler>(new ExtractDataPathOptionHandler(fs.extract_jobs, { "-x", "--extract" })));
opts.registerOptionHandler(std::shared_ptr<CustomExtractDataPathOptionHandler>(new CustomExtractDataPathOptionHandler(fs.extract_jobs, { "--fsdir" }, tc::io::Path("/"))));
// xci options // xci options
opts.registerOptionHandler(std::shared_ptr<CustomExtractDataPathOptionHandler>(new CustomExtractDataPathOptionHandler(fs.extract_jobs, { "--update" }, tc::io::Path("/update/")))); opts.registerOptionHandler(std::shared_ptr<CustomExtractDataPathOptionHandler>(new CustomExtractDataPathOptionHandler(fs.extract_jobs, { "--update" }, tc::io::Path("/update/"))));
@ -706,29 +717,29 @@ void nstool::SettingsInitializer::usage_text() const
fmt::print(" --showlayout Show layout metadata.\n"); fmt::print(" --showlayout Show layout metadata.\n");
fmt::print(" -v, --verbose Verbose output.\n"); fmt::print(" -v, --verbose Verbose output.\n");
fmt::print("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Nintendo Submission Package)\n"); fmt::print("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Nintendo Submission Package)\n");
fmt::print(" {:s} [--listfs] [--fsdir [<virtual path>] <out path>] <file>\n", BIN_NAME); fmt::print(" {:s} [--fstree] [-x [<virtual path>] <out path>] <file>\n", BIN_NAME);
fmt::print(" --listfs Print file system.\n"); fmt::print(" --fstree Print filesystem tree.\n");
fmt::print(" -x, --fsdir Extract file system to directory.\n"); fmt::print(" -x, --extract Extract a file or directory to local filesystem.\n");
fmt::print("\n XCI (GameCard Image)\n"); fmt::print("\n XCI (GameCard Image)\n");
fmt::print(" {:s} [--listfs] [--fsdir [<virtual path>] <out path>] [--update <dir> --logo <dir> --normal <dir> --secure <dir>] <.xci file>\n", BIN_NAME); fmt::print(" {:s} [--fstree] [-x [<virtual path>] <out path>] <.xci file>\n", BIN_NAME);
fmt::print(" --listfs Print file system.\n"); fmt::print(" --fstree Print filesystem tree.\n");
fmt::print(" -x, --fsdir Extract file system to directory.\n"); fmt::print(" -x, --extract Extract a file or directory to local filesystem.\n");
fmt::print(" --update Extract \"update\" partition to directory. (Alias for \"-x /update <out path>\")\n"); fmt::print(" --update Extract \"update\" partition to directory. (Alias for \"-x /update <out path>\")\n");
fmt::print(" --logo Extract \"logo\" partition to directory. (Alias for \"-x /logo <out path>\")\n"); fmt::print(" --logo Extract \"logo\" partition to directory. (Alias for \"-x /logo <out path>\")\n");
fmt::print(" --normal Extract \"normal\" partition to directory. (Alias for \"-x /normal <out path>\")\n"); fmt::print(" --normal Extract \"normal\" partition to directory. (Alias for \"-x /normal <out path>\")\n");
fmt::print(" --secure Extract \"secure\" partition to directory. (Alias for \"-x /secure <out path>\")\n"); fmt::print(" --secure Extract \"secure\" partition to directory. (Alias for \"-x /secure <out path>\")\n");
fmt::print("\n NCA (Nintendo Content Archive)\n"); fmt::print("\n NCA (Nintendo Content Archive)\n");
fmt::print(" {:s} [--listfs] [--bodykey <key> --titlekey <key>] [--fsdir [<virtual path>] <out path>] [--part0 <dir> ...] <.nca file>\n", BIN_NAME); fmt::print(" {:s} [--fstree] [-x [<virtual path>] <out path>] [--bodykey <key> --titlekey <key> -tik <tik path>] <.nca file>\n", BIN_NAME);
fmt::print(" --listfs Print file system.\n"); fmt::print(" --fstree Print filesystem tree.\n");
fmt::print(" -x, --fsdir Extract file system to directory.\n"); fmt::print(" -x, --extract Extract a file or directory to local filesystem.\n");
fmt::print(" --titlekey Specify title key extracted from ticket.\n"); fmt::print(" --titlekey Specify title key extracted from ticket.\n");
//fmt::print(" --bodykey Specify body encryption key.\n"); fmt::print(" --bodykey Specify body encryption key.\n");
fmt::print(" --tik Specify ticket to source title key.\n"); fmt::print(" --tik Specify ticket to source title key.\n");
fmt::print(" --cert Specify certificate chain to verify ticket.\n"); fmt::print(" --cert Specify certificate chain to verify ticket.\n");
fmt::print(" --part0 Extract \"partition 0\" to directory. (Alias for \"-x /0 <out path>\")\n"); fmt::print(" --part0 Extract partition \"0\" to directory. (Alias for \"-x /0 <out path>\")\n");
fmt::print(" --part1 Extract \"partition 1\" to directory. (Alias for \"-x /1 <out path>\")\n"); fmt::print(" --part1 Extract partition \"1\" to directory. (Alias for \"-x /1 <out path>\")\n");
fmt::print(" --part2 Extract \"partition 2\" to directory. (Alias for \"-x /2 <out path>\")\n"); fmt::print(" --part2 Extract partition \"2\" to directory. (Alias for \"-x /2 <out path>\")\n");
fmt::print(" --part3 Extract \"partition 3\" to directory. (Alias for \"-x /3 <out path>\")\n"); fmt::print(" --part3 Extract partition \"3\" to directory. (Alias for \"-x /3 <out path>\")\n");
fmt::print("\n NSO (Nintendo Shared Object), NRO (Nintendo Relocatable Object)\n"); fmt::print("\n NSO (Nintendo Shared Object), NRO (Nintendo Relocatable Object)\n");
fmt::print(" {:s} [--listapi --listsym] [--insttype <inst. type>] <file>\n", BIN_NAME); fmt::print(" {:s} [--listapi --listsym] [--insttype <inst. type>] <file>\n", BIN_NAME);
fmt::print(" --listapi Print SDK API List.\n"); fmt::print(" --listapi Print SDK API List.\n");
@ -738,11 +749,11 @@ void nstool::SettingsInitializer::usage_text() const
fmt::print(" {:s} [--kipdir <dir>] <file>\n", BIN_NAME); fmt::print(" {:s} [--kipdir <dir>] <file>\n", BIN_NAME);
fmt::print(" --kipdir Extract embedded Inital Programs to directory.\n"); fmt::print(" --kipdir Extract embedded Inital Programs to directory.\n");
fmt::print("\n ASET (Homebrew Asset Blob)\n"); fmt::print("\n ASET (Homebrew Asset Blob)\n");
fmt::print(" {:s} [--listfs] [--icon <file> --nacp <file> --fsdir <dir>] <file>\n", BIN_NAME); fmt::print(" {:s} [--fstree] [-x [<virtual path>] <out path>] [--icon <file> --nacp <file>] <file>\n", BIN_NAME);
fmt::print(" --listfs Print filesystem in embedded RomFS partition.\n"); fmt::print(" --fstree Print RomFS filesystem tree.\n");
fmt::print(" -x, --extract Extract a file or directory from RomFS to local filesystem.\n");
fmt::print(" --icon Extract icon partition to file.\n"); fmt::print(" --icon Extract icon partition to file.\n");
fmt::print(" --nacp Extract NACP partition to file.\n"); fmt::print(" --nacp Extract NACP partition to file.\n");
fmt::print(" -x, --fsdir Extract RomFS partition to directory.\n");
} }
void nstool::SettingsInitializer::dump_keys() const void nstool::SettingsInitializer::dump_keys() const