Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-01-02 17:20:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring : Introducing Command class for CLI commands (#778)

Browse source
This commit is contained in:
louib 2017-07-17 15:16:53 -04:00 • committed by GitHub
parent 99e3af8ff7
commit 3b23e68540
19 changed files with 356 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/cli/keepassxc-cli.cpp
View file

@ -22,12 +22,7 @@
#include <QStringList>
#include <QTextStream>
#include <cli/Clip.h>
#include <cli/EntropyMeter.h>
#include <cli/Extract.h>
#include <cli/List.h>
#include <cli/Merge.h>
#include <cli/Show.h>
#include <cli/Command.h>
#include "config-keepassx.h"
#include "core/Tools.h"
@ -48,6 +43,7 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
QTextStream out(stdout);
QStringList arguments;
for (int i = 0; i < argc; ++i) {
arguments << QString(argv[i]);
@ -55,16 +51,13 @@ int main(int argc, char** argv)
QCommandLineParser parser;
QString description("KeePassXC command line interface.");
description = description.append(QString("\n\nAvailable commands:"));
description = description.append(QString("\n clip\t\tCopy a password to the clipboard."));
description = description.append(QString("\n extract\tExtract and print the content of a database."));
description = description.append(QString("\n entropy-meter\tCalculate password entropy."));
description = description.append(QString("\n list\t\tList database entries."));
description = description.append(QString("\n merge\t\tMerge two databases."));
description = description.append(QString("\n show\t\tShow a password."));
parser.setApplicationDescription(QCoreApplication::translate("main", qPrintable(description)));
description = description.append(QObject::tr("\n\nAvailable commands:\n"));
for (Command* command : Command::getCommands()) {
description = description.append(command->getDescriptionLine());
}
parser.setApplicationDescription(description);
parser.addPositionalArgument("command", QCoreApplication::translate("main", "Name of the command to execute."));
parser.addPositionalArgument("command", QObject::tr("Name of the command to execute."));
parser.addHelpOption();
parser.addVersionOption();
@ -78,50 +71,16 @@ int main(int argc, char** argv)
app.setApplicationVersion(KEEPASSX_VERSION);
if (parser.isSet("version")) {
// Switch to parser.showVersion() when available (QT 5.4).
QTextStream out(stdout);
out << KEEPASSX_VERSION << "\n";
out.flush();
out << KEEPASSX_VERSION << endl;
return EXIT_SUCCESS;
}
parser.showHelp();
}
QString commandName = parser.positionalArguments().at(0);
Command* command = Command::getCommand(commandName);
int exitCode = EXIT_FAILURE;
if (commandName == "clip") {
// Removing the first cli argument before dispatching.
++argv;
--argc;
argv[0] = const_cast<char*>("keepassxc-cli clip");
exitCode = Clip::execute(argc, argv);
} else if (commandName == "entropy-meter") {
++argv;
--argc;
argv[0] = const_cast<char*>("keepassxc-cli entropy-meter");
exitCode = EntropyMeter::execute(argc, argv);
} else if (commandName == "extract") {
++argv;
--argc;
argv[0] = const_cast<char*>("keepassxc-cli extract");
exitCode = Extract::execute(argc, argv);
} else if (commandName == "list") {
++argv;
--argc;
argv[0] = const_cast<char*>("keepassxc-cli list");
exitCode = List::execute(argc, argv);
} else if (commandName == "merge") {
++argv;
--argc;
argv[0] = const_cast<char*>("keepassxc-cli merge");
exitCode = Merge::execute(argc, argv);
} else if (commandName == "show") {
++argv;
--argc;
argv[0] = const_cast<char*>("keepassxc-cli show");
exitCode = Show::execute(argc, argv);
} else {
if (command == nullptr) {
qCritical("Invalid command %s.", qPrintable(commandName));
QCoreApplication app(argc, argv);
app.setApplicationVersion(KEEPASSX_VERSION);
@ -130,6 +89,8 @@ int main(int argc, char** argv)
parser.showHelp(EXIT_FAILURE);
}
int exitCode = command->execute(argc, argv);
#if defined(WITH_ASAN) && defined(WITH_LSAN)
// do leak check here to prevent massive tail of end-of-process leak errors from third-party libraries
__lsan_do_leak_check();