jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cli commands, translations and codestyle

Browse Source
This commit is contained in:
thez3ro
2018-02-06 01:17:36 +01:00
parent 6723f4215a
commit 1bfbb9242c
30 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/cli/Generate.cpp
View File

@@ -27,15 +27,15 @@
Generate::Generate()
{
this->name = QString("generate");
this->description = QObject::tr("Generate a new random password.");
name = QString("generate");
description = QObject::tr("Generate a new random password.");
}
Generate::~Generate()
{
}
int Generate::execute(QStringList arguments)
int Generate::execute(const QStringList& arguments)
{
QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
QTextStream outputTextStream(stdout, QIODevice::WriteOnly);
@@ -47,10 +47,10 @@ int Generate::execute(QStringList arguments)
QObject::tr("length"));
parser.addOption(len);
QCommandLineOption lower(QStringList() << "l",
QObject::tr("Use lowercase in the generated password."));
QObject::tr("Use lowercase characters in the generated password."));
parser.addOption(lower);
QCommandLineOption upper(QStringList() << "u",
QObject::tr("Use uppercase in the generated password."));
QObject::tr("Use uppercase characters in the generated password."));
parser.addOption(upper);
QCommandLineOption numeric(QStringList() << "n",
QObject::tr("Use numbers in the generated password."));
@@ -59,12 +59,12 @@ int Generate::execute(QStringList arguments)
QObject::tr("Use special characters in the generated password."));
parser.addOption(special);
QCommandLineOption extended(QStringList() << "e",
QObject::tr("Use extended ascii in the generated password."));
QObject::tr("Use extended ASCII in the generated password."));
parser.addOption(extended);
parser.process(arguments);
const QStringList args = parser.positionalArguments();
if (args.size() != 0) {
if (!args.isEmpty()) {
outputTextStream << parser.helpText().replace("keepassxc-cli", "keepassxc-cli generate");
return EXIT_FAILURE;
}
@@ -97,6 +97,7 @@ int Generate::execute(QStringList arguments)
}
passwordGenerator.setCharClasses(classes);
passwordGenerator.setFlags(PasswordGenerator::DefaultFlags);
if (!passwordGenerator.isValid()) {
outputTextStream << parser.helpText().replace("keepassxc-cli", "keepassxc-cli generate");