mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use QCommandLineParser

Browse source 
* Switch to using QCommandLineParser
* Implement the --same-password option
* extract `getKeyFromLine` function
This commit is contained in:
Louis-Bertrand Varin 2017-01-11 21:00:11 -05:00
parent 2afa1f0dc8
commit a79366f105
1 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

69
utils/merge-databases.cpp
View file

@ -17,6 +17,7 @@
#include <stdio.h> #include <stdio.h>
#include <QCommandLineParser>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFile> #include <QFile>
#include <QSaveFile> #include <QSaveFile>
@ -31,13 +32,49 @@
#include "keys/FileKey.h" #include "keys/FileKey.h"
#include "keys/PasswordKey.h" #include "keys/PasswordKey.h"
/*
* Read a key from a line of input.
* If the line references a valid file
* path, the key is loaded from file.
*/
CompositeKey readKeyFromLine(QString line)
{
CompositeKey key;
if (QFile::exists(line)) {
FileKey fileKey;
fileKey.load(line);
key.addKey(fileKey);
}
else {
PasswordKey password;
password.setPassword(line);
key.addKey(password);
}
return key;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
if (app.arguments().size() != 3) { QCommandLineParser parser;
qCritical("Usage: merge-databases <kdbx file1> <kdbx file2>"); parser.setApplicationDescription(QCoreApplication::translate("main", "Merge 2 KeePassXC database files."));
parser.addPositionalArgument("database1", QCoreApplication::translate("main", "path of the database to merge into."));
parser.addPositionalArgument("database2", QCoreApplication::translate("main", "path of the database to merge from."));
QCommandLineOption samePasswordOption(QStringList() << "s" << "same-password",
QCoreApplication::translate("main", "use the same password for both database files."));
parser.addHelpOption();
parser.addOption(samePasswordOption);
parser.process(app);
const QStringList args = parser.positionalArguments();
if (args.size() != 2) {
parser.showHelp();
return 1; return 1;
} }
@ -48,33 +85,19 @@ int main(int argc, char **argv)
static QTextStream inputTextStream(stdin, QIODevice::ReadOnly); static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
QString line1 = inputTextStream.readLine(); QString line1 = inputTextStream.readLine();
CompositeKey key1; CompositeKey key1 = readKeyFromLine(line1);
if (QFile::exists(line1)) {
FileKey fileKey;
fileKey.load(line1);
key1.addKey(fileKey);
}
else {
PasswordKey password;
password.setPassword(line1);
key1.addKey(password);
}
QString line2 = inputTextStream.readLine();
CompositeKey key2; CompositeKey key2;
if (QFile::exists(line2)) { if (parser.isSet("same-password")) {
FileKey fileKey; key2 = *key1.clone();
fileKey.load(line2);
key2.addKey(fileKey);
} }
else { else {
PasswordKey password; QString line2 = inputTextStream.readLine();
password.setPassword(line2); key2 = readKeyFromLine(line2);
key2.addKey(password);
} }
QString databaseFilename1 = app.arguments().at(1); QString databaseFilename1 = args.at(0);
QFile dbFile1(databaseFilename1); QFile dbFile1(databaseFilename1);
if (!dbFile1.exists()) { if (!dbFile1.exists()) {
qCritical("File %s does not exist.", qPrintable(databaseFilename1)); qCritical("File %s does not exist.", qPrintable(databaseFilename1));
@ -94,7 +117,7 @@ int main(int argc, char **argv)
} }
QString databaseFilename2 = app.arguments().at(2); QString databaseFilename2 = args.at(1);
QFile dbFile2(databaseFilename2); QFile dbFile2(databaseFilename2);
if (!dbFile2.exists()) { if (!dbFile2.exists()) {
qCritical("File %s does not exist.", qPrintable(databaseFilename2)); qCritical("File %s does not exist.", qPrintable(databaseFilename2));