imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 13:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

impr: Make ImHex cli work more like other tools

Browse Source
This commit is contained in:
WerWolv
2025-01-28 18:41:25 +01:00
parent b8caf41423
commit 19a9786bbf
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libimhex/source/subcommands/subcommands.cpp
View File

@@ -53,7 +53,7 @@ namespace hex::subcommands {
while (argsIter != args.end()) {
const std::string &arg = *argsIter;
if (arg == "--othercmd") {
if (!currentSubCommandArgs.empty() && arg.starts_with("--")) {
// Save command to run
if (currentSubCommand) {
subCommands.emplace_back(*currentSubCommand, currentSubCommandArgs);
@@ -61,10 +61,10 @@ namespace hex::subcommands {
currentSubCommand = std::nullopt;
currentSubCommandArgs = { };
} else if (currentSubCommand) {
// Add current argument to the current command
currentSubCommandArgs.push_back(arg);
argsIter += 1;
} else {
// Get next subcommand from current argument
currentSubCommand = findSubCommand(arg);
@@ -72,9 +72,9 @@ namespace hex::subcommands {
log::error("No subcommand named '{}' found", arg);
exit(EXIT_FAILURE);
}
}
argsIter += 1;
argsIter += 1;
}
}
// Save last command to run
@@ -83,8 +83,8 @@ namespace hex::subcommands {
}
// Run the subcommands
for (auto &[subcommand, args] : subCommands) {
subcommand.callback(args);
for (auto &[subcommand, subCommandArgs] : subCommands) {
subcommand.callback(subCommandArgs);
}
// Exit the process if it's not the main instance (the commands have been forwarded to another instance)