Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-11 16:00:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Prevent opening a database multiple times in the same instance.

Browse source 
Refs #18
This commit is contained in:
Felix Geyer 2012-07-08 10:15:05 +02:00
parent 2e38b01d80
commit ce633b54be
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/gui/DatabaseTabWidget.cpp
View file

@ -102,6 +102,18 @@ void DatabaseTabWidget::openDatabase()
void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw, void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw,
const QString& keyFile) const QString& keyFile)
{ {
QFileInfo fileInfo(fileName);
QString canonicalFilePath = fileInfo.canonicalFilePath();
QHashIterator<Database*, DatabaseManagerStruct> i(m_dbList);
while (i.hasNext()) {
i.next();
if (i.value().canonicalFilePath == canonicalFilePath) {
setCurrentIndex(databaseIndex(i.key()));
return;
}
}
DatabaseManagerStruct dbStruct; DatabaseManagerStruct dbStruct;
// test if we can read/write or read the file // test if we can read/write or read the file
@ -122,18 +134,21 @@ void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw,
Database* db = new Database(); Database* db = new Database();
dbStruct.dbWidget = new DatabaseWidget(db, this); dbStruct.dbWidget = new DatabaseWidget(db, this);
dbStruct.fileName = QFileInfo(fileName).absoluteFilePath();
dbStruct.saveToFilename = !dbStruct.readOnly; dbStruct.saveToFilename = !dbStruct.readOnly;
dbStruct.filePath = fileInfo.absoluteFilePath();
dbStruct.canonicalFilePath = canonicalFilePath;
dbStruct.fileName = fileInfo.fileName();
insertDatabase(db, dbStruct); insertDatabase(db, dbStruct);
updateLastDatabases(dbStruct.fileName); updateLastDatabases(dbStruct.filePath);
if (!pw.isNull() || !keyFile.isEmpty()) { if (!pw.isNull() || !keyFile.isEmpty()) {
dbStruct.dbWidget->switchToOpenDatabase(dbStruct.fileName, pw, keyFile); dbStruct.dbWidget->switchToOpenDatabase(dbStruct.filePath, pw, keyFile);
} }
else { else {
dbStruct.dbWidget->switchToOpenDatabase(dbStruct.fileName); dbStruct.dbWidget->switchToOpenDatabase(dbStruct.filePath);
} }
} }
@ -243,7 +258,7 @@ void DatabaseTabWidget::saveDatabase(Database* db)
if (dbStruct.saveToFilename) { if (dbStruct.saveToFilename) {
bool result = false; bool result = false;
QSaveFile saveFile(dbStruct.fileName); QSaveFile saveFile(dbStruct.filePath);
if (saveFile.open(QIODevice::WriteOnly)) { if (saveFile.open(QIODevice::WriteOnly)) {
m_writer.writeDatabase(&saveFile, db); m_writer.writeDatabase(&saveFile, db);
result = saveFile.commit(); result = saveFile.commit();
@ -268,7 +283,7 @@ void DatabaseTabWidget::saveDatabaseAs(Database* db)
DatabaseManagerStruct& dbStruct = m_dbList[db]; DatabaseManagerStruct& dbStruct = m_dbList[db];
QString oldFileName; QString oldFileName;
if (dbStruct.saveToFilename) { if (dbStruct.saveToFilename) {
oldFileName = dbStruct.fileName; oldFileName = dbStruct.filePath;
} }
QString fileName = fileDialog()->getSaveFileName(m_window, tr("Save database as"), QString fileName = fileDialog()->getSaveFileName(m_window, tr("Save database as"),
oldFileName, tr("KeePass 2 Database").append(" (*.kdbx)")); oldFileName, tr("KeePass 2 Database").append(" (*.kdbx)"));
@ -283,10 +298,13 @@ void DatabaseTabWidget::saveDatabaseAs(Database* db)
if (result) { if (result) {
dbStruct.modified = false; dbStruct.modified = false;
dbStruct.fileName = QFileInfo(fileName).absoluteFilePath();
dbStruct.saveToFilename = true; dbStruct.saveToFilename = true;
QFileInfo fileInfo(fileName);
dbStruct.filePath = fileInfo.absoluteFilePath();
dbStruct.canonicalFilePath = fileInfo.canonicalFilePath();
dbStruct.fileName = fileInfo.fileName();
updateTabName(db); updateTabName(db);
updateLastDatabases(dbStruct.fileName); updateLastDatabases(dbStruct.filePath);
} }
else { else {
QMessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n" QMessageBox::critical(this, tr("Error"), tr("Writing the database failed.") + "\n\n"
@ -412,16 +430,14 @@ void DatabaseTabWidget::updateTabName(Database* db)
QString tabName; QString tabName;
if (dbStruct.saveToFilename) { if (dbStruct.saveToFilename) {
QFileInfo fileInfo(dbStruct.fileName);
if (db->metadata()->name().isEmpty()) { if (db->metadata()->name().isEmpty()) {
tabName = fileInfo.fileName(); tabName = dbStruct.fileName;
} }
else { else {
tabName = db->metadata()->name(); tabName = db->metadata()->name();
} }
setTabToolTip(index, dbStruct.fileName); setTabToolTip(index, dbStruct.filePath);
} }
else { else {
if (db->metadata()->name().isEmpty()) { if (db->metadata()->name().isEmpty()) {

2
src/gui/DatabaseTabWidget.h
View file

@ -33,6 +33,8 @@ struct DatabaseManagerStruct
DatabaseManagerStruct(); DatabaseManagerStruct();
DatabaseWidget* dbWidget; DatabaseWidget* dbWidget;
QString filePath;
QString canonicalFilePath;
QString fileName; QString fileName;
bool saveToFilename; bool saveToFilename;
bool modified; bool modified;