mirror/keepassxc
0
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-20 12:22:16 +02:00
Code

Using saveToFile in Merge command.

Browse Source
This commit is contained in:
Louis-Bertrand Varin 2017-06-14 20:00:09 -04:00
parent f3f6f6a493
commit 46f7d97176
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cli/Merge.cpp
View File

@ -22,12 +22,10 @@
#include <QApplication> #include <QApplication>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QCoreApplication> #include <QCoreApplication>
#include <QSaveFile>
#include <QStringList> #include <QStringList>
#include <QTextStream> #include <QTextStream>
#include "core/Database.h" #include "core/Database.h"
#include "format/KeePass2Writer.h"
#include "gui/UnlockDatabaseDialog.h" #include "gui/UnlockDatabaseDialog.h"
int Merge::execute(int argc, char** argv) int Merge::execute(int argc, char** argv)
@ -95,26 +93,13 @@ int Merge::execute(int argc, char** argv)
} }
db1->merge(db2); db1->merge(db2);
QString errorMessage = db1->saveToFile(args.at(0));
QSaveFile saveFile(args.at(0)); if (!errorMessage.isEmpty()) {
if (!saveFile.open(QIODevice::WriteOnly)) { qCritical("Unable to save database to file : %s", qPrintable(errorMessage));
qCritical("Unable to open file %s for writing.", qPrintable(args.at(0)));
return EXIT_FAILURE;
}
KeePass2Writer writer;
writer.writeDatabase(&saveFile, db1);
if (writer.hasError()) {
qCritical("Error while updating the database:\n%s\n", qPrintable(writer.errorString()));
return EXIT_FAILURE;
}
if (!saveFile.commit()) {
qCritical("Error while updating the database:\n%s\n", qPrintable(writer.errorString()));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
out << "Successfully merged the database files.\n"; out << "Successfully merged the database files.\n";
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }