Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-08 18:58:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix database save calls in CLI due to backup path

Browse Source
This commit is contained in:
Jonathan White 2021-11-07 17:52:23 -05:00
parent 84ff6a13f9
commit 6f5bbf7ad1
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/Add.cpp
View File

@ -121,7 +121,7 @@ int Add::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<Q
} }
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, QString(), &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl; err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/AddGroup.cpp
View File

@ -63,7 +63,7 @@ int AddGroup::executeWithDatabase(QSharedPointer<Database> database, QSharedPoin
newGroup->setParent(parentGroup); newGroup->setParent(parentGroup);
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, QString(), &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl; err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/AttachmentImport.cpp
View File

@ -75,7 +75,7 @@ int AttachmentImport::executeWithDatabase(QSharedPointer<Database> database, QSh
entry->endUpdate(); entry->endUpdate();
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, false, &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl; err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/AttachmentRemove.cpp
View File

@ -58,7 +58,7 @@ int AttachmentRemove::executeWithDatabase(QSharedPointer<Database> database, QSh
entry->endUpdate(); entry->endUpdate();
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, false, &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl; err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/Create.cpp
View File

@ -165,7 +165,7 @@ int Create::execute(const QStringList& arguments)
} }
QString errorMessage; QString errorMessage;
if (!db->saveAs(databaseFilename, Database::Atomic, QString(), &errorMessage)) { if (!db->saveAs(databaseFilename, Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Failed to save the database: %1.").arg(errorMessage) << endl; err << QObject::tr("Failed to save the database: %1.").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/Edit.cpp
View File

@ -126,7 +126,7 @@ int Edit::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<
entry->endUpdate(); entry->endUpdate();
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, QString(), &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Writing the database failed: %1").arg(errorMessage) << endl; err << QObject::tr("Writing the database failed: %1").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/Import.cpp
View File

@ -75,7 +75,7 @@ int Import::execute(const QStringList& arguments)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!db->saveAs(dbPath, Database::Atomic, QString(), &errorMessage)) { if (!db->saveAs(dbPath, Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Failed to save the database: %1.").arg(errorMessage) << endl; err << QObject::tr("Failed to save the database: %1.").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/Merge.cpp
View File

@ -95,7 +95,7 @@ int Merge::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer
if (!changeList.isEmpty() && !parser->isSet(Merge::DryRunOption)) { if (!changeList.isEmpty() && !parser->isSet(Merge::DryRunOption)) {
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, QString(), &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Unable to save database to file : %1").arg(errorMessage) << endl; err << QObject::tr("Unable to save database to file : %1").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/Move.cpp
View File

@ -65,7 +65,7 @@ int Move::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<
entry->endUpdate(); entry->endUpdate();
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, QString(), &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl; err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/Remove.cpp
View File

@ -53,7 +53,7 @@ int Remove::executeWithDatabase(QSharedPointer<Database> database, QSharedPointe
}; };
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, QString(), &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Unable to save database to file: %1").arg(errorMessage) << endl; err << QObject::tr("Unable to save database to file: %1").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

2
src/cli/RemoveGroup.cpp
View File

@ -63,7 +63,7 @@ int RemoveGroup::executeWithDatabase(QSharedPointer<Database> database, QSharedP
}; };
QString errorMessage; QString errorMessage;
if (!database->save(Database::Atomic, QString(), &errorMessage)) { if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Unable to save database to file: %1").arg(errorMessage) << endl; err << QObject::tr("Unable to save database to file: %1").arg(errorMessage) << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }

4
tests/TestDatabase.cpp
View File

@ -75,7 +75,7 @@ void TestDatabase::testSave()
// Test safe saves // Test safe saves
db->metadata()->setName("test"); db->metadata()->setName("test");
QVERIFY(db->isModified()); QVERIFY(db->isModified());
QVERIFY2(db->save(Database::Atomic, QString(), &error), error.toLatin1()); QVERIFY2(db->save(Database::Atomic, {}, &error), error.toLatin1());
QVERIFY(!db->isModified()); QVERIFY(!db->isModified());
// Test temp-file saves // Test temp-file saves
@ -120,7 +120,7 @@ void TestDatabase::testSignals()
QTRY_COMPARE(spyModified.count(), 1); QTRY_COMPARE(spyModified.count(), 1);
QSignalSpy spySaved(db.data(), SIGNAL(databaseSaved())); QSignalSpy spySaved(db.data(), SIGNAL(databaseSaved()));
QVERIFY(db->save(Database::Atomic, QString(), &error)); QVERIFY(db->save(Database::Atomic, {}, &error));
QCOMPARE(spySaved.count(), 1); QCOMPARE(spySaved.count(), 1);
// Short delay to allow file system settling to reduce test failures // Short delay to allow file system settling to reduce test failures