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

Allow specifing database backup paths. (#7035)

Browse source 
- Default backupFilePath is '{DB_FILENAME}.old.kdbx' to conform to existing standards
- Implement backupPathPattern tests.
- Show tooltip on how to format database backup location text field.
This commit is contained in:
Patrick Klein 2021-11-07 23:41:17 +01:00 • committed by GitHub
parent 8d7e491810
commit 84ff6a13f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 368 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/gui/DatabaseWidget.cpp
View file

@ -27,6 +27,7 @@
#include <QProcess>
#include <QSplitter>
#include <QTextEdit>
#include <core/Tools.h>
#include "autotype/AutoType.h"
#include "core/EntrySearcher.h"
@ -1879,11 +1880,31 @@ bool DatabaseWidget::performSave(QString& errorMessage, const QString& fileName)
}
}
QString backupFilePath;
if (config()->get(Config::BackupBeforeSave).toBool()) {
backupFilePath = config()->get(Config::BackupFilePathPattern).toString();
// Fall back to default
if (backupFilePath.isEmpty()) {
backupFilePath = config()->getDefault(Config::BackupFilePathPattern).toString();
}
QFileInfo dbFileInfo(m_db->filePath());
backupFilePath = Tools::substituteBackupFilePath(backupFilePath, dbFileInfo.canonicalFilePath());
if (!backupFilePath.isNull()) {
// Note that we cannot guarantee that backupFilePath is actually a valid filename. QT currently provides
// no function for this. Moreover, we don't check if backupFilePath is a file and not a directory.
// If this isn't the case, just let the backup fail.
if (QDir::isRelativePath(backupFilePath)) {
backupFilePath = QDir::cleanPath(dbFileInfo.absolutePath() + QDir::separator() + backupFilePath);
}
}
}
bool ok;
if (fileName.isEmpty()) {
ok = m_db->save(saveAction, config()->get(Config::BackupBeforeSave).toBool(), &errorMessage);
ok = m_db->save(saveAction, backupFilePath, &errorMessage);
} else {
ok = m_db->saveAs(fileName, saveAction, config()->get(Config::BackupBeforeSave).toBool(), &errorMessage);
ok = m_db->saveAs(fileName, saveAction, backupFilePath, &errorMessage);
}
// Return control