From 6f5bbf7ad1048abc3db7e378df654a61954f77e3 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Sun, 7 Nov 2021 17:52:23 -0500 Subject: [PATCH] Fix database save calls in CLI due to backup path --- src/cli/Add.cpp | 2 +- src/cli/AddGroup.cpp | 2 +- src/cli/AttachmentImport.cpp | 2 +- src/cli/AttachmentRemove.cpp | 2 +- src/cli/Create.cpp | 2 +- src/cli/Edit.cpp | 2 +- src/cli/Import.cpp | 2 +- src/cli/Merge.cpp | 2 +- src/cli/Move.cpp | 2 +- src/cli/Remove.cpp | 2 +- src/cli/RemoveGroup.cpp | 2 +- tests/TestDatabase.cpp | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/cli/Add.cpp b/src/cli/Add.cpp index 409d2a0aa..52785097b 100644 --- a/src/cli/Add.cpp +++ b/src/cli/Add.cpp @@ -121,7 +121,7 @@ int Add::executeWithDatabase(QSharedPointer database, QSharedPointersave(Database::Atomic, QString(), &errorMessage)) { + if (!database->save(Database::Atomic, {}, &errorMessage)) { err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl; return EXIT_FAILURE; } diff --git a/src/cli/AddGroup.cpp b/src/cli/AddGroup.cpp index 8fc9ceb39..43431e8dc 100644 --- a/src/cli/AddGroup.cpp +++ b/src/cli/AddGroup.cpp @@ -63,7 +63,7 @@ int AddGroup::executeWithDatabase(QSharedPointer database, QSharedPoin newGroup->setParent(parentGroup); 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; return EXIT_FAILURE; } diff --git a/src/cli/AttachmentImport.cpp b/src/cli/AttachmentImport.cpp index 080f81af0..0700961d7 100644 --- a/src/cli/AttachmentImport.cpp +++ b/src/cli/AttachmentImport.cpp @@ -75,7 +75,7 @@ int AttachmentImport::executeWithDatabase(QSharedPointer database, QSh entry->endUpdate(); 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; return EXIT_FAILURE; } diff --git a/src/cli/AttachmentRemove.cpp b/src/cli/AttachmentRemove.cpp index 6561948b0..a609a8f22 100644 --- a/src/cli/AttachmentRemove.cpp +++ b/src/cli/AttachmentRemove.cpp @@ -58,7 +58,7 @@ int AttachmentRemove::executeWithDatabase(QSharedPointer database, QSh entry->endUpdate(); 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; return EXIT_FAILURE; } diff --git a/src/cli/Create.cpp b/src/cli/Create.cpp index 4f820d000..760bf5368 100644 --- a/src/cli/Create.cpp +++ b/src/cli/Create.cpp @@ -165,7 +165,7 @@ int Create::execute(const QStringList& arguments) } 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; return EXIT_FAILURE; } diff --git a/src/cli/Edit.cpp b/src/cli/Edit.cpp index ad1d701f7..3327d637a 100644 --- a/src/cli/Edit.cpp +++ b/src/cli/Edit.cpp @@ -126,7 +126,7 @@ int Edit::executeWithDatabase(QSharedPointer database, QSharedPointer< entry->endUpdate(); 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; return EXIT_FAILURE; } diff --git a/src/cli/Import.cpp b/src/cli/Import.cpp index 432507d20..3732f0cf6 100644 --- a/src/cli/Import.cpp +++ b/src/cli/Import.cpp @@ -75,7 +75,7 @@ int Import::execute(const QStringList& arguments) 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; return EXIT_FAILURE; } diff --git a/src/cli/Merge.cpp b/src/cli/Merge.cpp index a80f454bb..ade472af1 100644 --- a/src/cli/Merge.cpp +++ b/src/cli/Merge.cpp @@ -95,7 +95,7 @@ int Merge::executeWithDatabase(QSharedPointer database, QSharedPointer if (!changeList.isEmpty() && !parser->isSet(Merge::DryRunOption)) { 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; return EXIT_FAILURE; } diff --git a/src/cli/Move.cpp b/src/cli/Move.cpp index 990f45691..a9ee78614 100644 --- a/src/cli/Move.cpp +++ b/src/cli/Move.cpp @@ -65,7 +65,7 @@ int Move::executeWithDatabase(QSharedPointer database, QSharedPointer< entry->endUpdate(); 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; return EXIT_FAILURE; } diff --git a/src/cli/Remove.cpp b/src/cli/Remove.cpp index ed6a27502..f383d1636 100644 --- a/src/cli/Remove.cpp +++ b/src/cli/Remove.cpp @@ -53,7 +53,7 @@ int Remove::executeWithDatabase(QSharedPointer database, QSharedPointe }; 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; return EXIT_FAILURE; } diff --git a/src/cli/RemoveGroup.cpp b/src/cli/RemoveGroup.cpp index df6bf4cfa..6455af496 100644 --- a/src/cli/RemoveGroup.cpp +++ b/src/cli/RemoveGroup.cpp @@ -63,7 +63,7 @@ int RemoveGroup::executeWithDatabase(QSharedPointer database, QSharedP }; 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; return EXIT_FAILURE; } diff --git a/tests/TestDatabase.cpp b/tests/TestDatabase.cpp index 9fa09d315..8a05fcbfa 100644 --- a/tests/TestDatabase.cpp +++ b/tests/TestDatabase.cpp @@ -75,7 +75,7 @@ void TestDatabase::testSave() // Test safe saves db->metadata()->setName("test"); QVERIFY(db->isModified()); - QVERIFY2(db->save(Database::Atomic, QString(), &error), error.toLatin1()); + QVERIFY2(db->save(Database::Atomic, {}, &error), error.toLatin1()); QVERIFY(!db->isModified()); // Test temp-file saves @@ -120,7 +120,7 @@ void TestDatabase::testSignals() QTRY_COMPARE(spyModified.count(), 1); QSignalSpy spySaved(db.data(), SIGNAL(databaseSaved())); - QVERIFY(db->save(Database::Atomic, QString(), &error)); + QVERIFY(db->save(Database::Atomic, {}, &error)); QCOMPARE(spySaved.count(), 1); // Short delay to allow file system settling to reduce test failures