DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-02 16:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change -x/--extract option handling to be as a deprecated option.

Browse Source
This commit is contained in:
jakcron
2022-03-14 17:11:25 +08:00
parent 4ded736c72
commit b73d95ef89
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctrtool/src/Settings.cpp
+3 -3
View File
@@ -407,6 +407,7 @@ void ctrtool::SettingsInitializer::parse_args(const std::vector<std::string>& ar
opts.registerUnrecognisedOptionHandler(std::shared_ptr<UnkOptionHandler>(new UnkOptionHandler(mModuleLabel))); opts.registerUnrecognisedOptionHandler(std::shared_ptr<UnkOptionHandler>(new UnkOptionHandler(mModuleLabel)));
// register handler for deprecated options DeprecatedOptionHandler // register handler for deprecated options DeprecatedOptionHandler
opts.registerOptionHandler(std::shared_ptr<DeprecatedOptionHandler>(new DeprecatedOptionHandler("Extract flag is redundant.", {"-x", "--extract"})));
opts.registerOptionHandler(std::shared_ptr<DeprecatedOptionHandler>(new DeprecatedOptionHandler("Generic AES/RSA keys are initialised internally.", {"-k", "--keyset"}))); opts.registerOptionHandler(std::shared_ptr<DeprecatedOptionHandler>(new DeprecatedOptionHandler("Generic AES/RSA keys are initialised internally.", {"-k", "--keyset"})));
opts.registerOptionHandler(std::shared_ptr<DeprecatedOptionHandler>(new DeprecatedOptionHandler("", {"--unitsize"}))); opts.registerOptionHandler(std::shared_ptr<DeprecatedOptionHandler>(new DeprecatedOptionHandler("", {"--unitsize"})));
opts.registerOptionHandler(std::shared_ptr<DeprecatedOptionHandler>(new DeprecatedOptionHandler("All common keys are initialised internally.", {"--commonkey"}))); opts.registerOptionHandler(std::shared_ptr<DeprecatedOptionHandler>(new DeprecatedOptionHandler("All common keys are initialised internally.", {"--commonkey"})));
@@ -416,7 +417,6 @@ void ctrtool::SettingsInitializer::parse_args(const std::vector<std::string>& ar
// get option flags // get option flags
opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.info, {"-i", "--info"}))); opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.info, {"-i", "--info"})));
opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.info, {"-x", "--extract"})));
opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.plain, {"-p", "--plain"}))); opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.plain, {"-p", "--plain"})));
opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.raw, {"-r", "--raw"}))); opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.raw, {"-r", "--raw"})));
opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.verbose, {"-v", "--verbose"}))); opts.registerOptionHandler(std::shared_ptr<FlagOptionHandler>(new FlagOptionHandler(opt.verbose, {"-v", "--verbose"})));
@@ -595,8 +595,8 @@ void ctrtool::SettingsInitializer::usage_text()
"Options:\n" "Options:\n"
" -i, --info Show file info.\n" " -i, --info Show file info.\n"
" This is the default action.\n" " This is the default action.\n"
" -x, --extract Extract data from file.\n" //" -x, --extract Extract data from file.\n"
" This is also the default action.\n" //" This is also the default action.\n"
" -p, --plain Extract data without decrypting.\n" " -p, --plain Extract data without decrypting.\n"
" -r, --raw Keep raw data, don't unpack.\n" " -r, --raw Keep raw data, don't unpack.\n"
//" -k, --keyset=file Specify keyset file.\n" //" -k, --keyset=file Specify keyset file.\n"
ctrtool/src/Settings.h
-2
View File
@@ -40,7 +40,6 @@ struct Settings
struct Options struct Options
{ {
bool info; bool info;
bool extract;
bool plain; bool plain;
bool raw; bool raw;
bool verbose; bool verbose;
@@ -124,7 +123,6 @@ struct Settings
infile.path = tc::Optional<tc::io::Path>(); infile.path = tc::Optional<tc::io::Path>();
opt.info = true; opt.info = true;
opt.extract = true;
opt.plain = false; opt.plain = false;
opt.raw = false; opt.raw = false;
opt.verbose = false; opt.verbose = false;