Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 16:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Using openDatabaseFile in Merge.

Browse Source
This commit is contained in:
Louis-Bertrand Varin 2017-03-12 13:56:30 -04:00 committed by Louis-Bertrand Varin
parent 993f90cb2c
commit 780e23301b
1 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/cli/Merge.cpp
View File

@ -21,13 +21,11 @@
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFile>
#include <QSaveFile> #include <QSaveFile>
#include <QStringList> #include <QStringList>
#include <QTextStream> #include <QTextStream>
#include "core/Database.h" #include "core/Database.h"
#include "format/KeePass2Reader.h"
#include "format/KeePass2Writer.h" #include "format/KeePass2Writer.h"
#include "keys/CompositeKey.h" #include "keys/CompositeKey.h"
@ -71,50 +69,21 @@ int Merge::execute(int argc, char** argv)
} }
QString databaseFilename1 = args.at(0); Database* db1 = Database::openDatabaseFile(args.at(0), key1);
QFile dbFile1(databaseFilename1); if (db1 == nullptr) {
if (!dbFile1.exists()) {
qCritical("File %s does not exist.", qPrintable(databaseFilename1));
return EXIT_FAILURE;
}
if (!dbFile1.open(QIODevice::ReadOnly)) {
qCritical("Unable to open file %s.", qPrintable(databaseFilename1));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
KeePass2Reader reader1; Database* db2 = Database::openDatabaseFile(args.at(1), key2);
Database* db1 = reader1.readDatabase(&dbFile1, key1); if (db2 == nullptr) {
if (reader1.hasError()) {
qCritical("Error while parsing the database:\n%s\n", qPrintable(reader1.errorString()));
return EXIT_FAILURE;
}
QString databaseFilename2 = args.at(1);
QFile dbFile2(databaseFilename2);
if (!dbFile2.exists()) {
qCritical("File %s does not exist.", qPrintable(databaseFilename2));
return EXIT_FAILURE;
}
if (!dbFile2.open(QIODevice::ReadOnly)) {
qCritical("Unable to open file %s.", qPrintable(databaseFilename2));
return EXIT_FAILURE;
}
KeePass2Reader reader2;
Database* db2 = reader2.readDatabase(&dbFile2, key2);
if (reader2.hasError()) {
qCritical("Error while parsing the database:\n%s\n", qPrintable(reader2.errorString()));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
db1->merge(db2); db1->merge(db2);
QSaveFile saveFile(databaseFilename1); QSaveFile saveFile(args.at(0));
if (!saveFile.open(QIODevice::WriteOnly)) { if (!saveFile.open(QIODevice::WriteOnly)) {
qCritical("Unable to open file %s for writing.", qPrintable(databaseFilename1)); qCritical("Unable to open file %s for writing.", qPrintable(args.at(0)));
return EXIT_FAILURE; return EXIT_FAILURE;
} }