Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-25 01:03:35 -05:00
Code Issues Projects Releases Packages Wiki Activity

Small refactoring related to references placeholders

Browse source
This commit is contained in:
frostasm 2017-11-19 21:06:09 +02:00
parent 5c7d34677d
commit d99dee9c40
8 changed files with 78 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/Database.cpp
View file

@ -95,15 +95,15 @@ const Metadata* Database::metadata() const
Entry* Database::resolveEntry(const Uuid& uuid) Entry* Database::resolveEntry(const Uuid& uuid)
{ {
return recFindEntry(uuid, m_rootGroup); return findEntryRecursive(uuid, m_rootGroup);
} }
Entry *Database::resolveEntry(const QString &text, EntryReferenceType referenceType) Entry* Database::resolveEntry(const QString& text, EntryReferenceType referenceType)
{ {
return recFindEntry(text, referenceType, m_rootGroup); return findEntryRecursive(text, referenceType, m_rootGroup);
} }
Entry* Database::recFindEntry(const Uuid& uuid, Group* group) Entry* Database::findEntryRecursive(const Uuid& uuid, Group* group)
{ {
const QList<Entry*> entryList = group->entries(); const QList<Entry*> entryList = group->entries();
for (Entry* entry : entryList) { for (Entry* entry : entryList) {
@ -114,7 +114,7 @@ Entry* Database::recFindEntry(const Uuid& uuid, Group* group)
const QList<Group*> children = group->children(); const QList<Group*> children = group->children();
for (Group* child : children) { for (Group* child : children) {
Entry* result = recFindEntry(uuid, child); Entry* result = findEntryRecursive(uuid, child);
if (result) { if (result) {
return result; return result;
} }
@ -123,9 +123,9 @@ Entry* Database::recFindEntry(const Uuid& uuid, Group* group)
return nullptr; return nullptr;
} }
Entry *Database::recFindEntry(const QString &text, EntryReferenceType referenceType, Group *group) Entry* Database::findEntryRecursive(const QString& text, EntryReferenceType referenceType, Group* group)
{ {
Q_ASSERT_X(referenceType != EntryReferenceType::Unknown, "Database::recFindEntry", Q_ASSERT_X(referenceType != EntryReferenceType::Unknown, "Database::findEntryRecursive",
"Can't search entry with \"referenceType\" parameter equal to \"Unknown\""); "Can't search entry with \"referenceType\" parameter equal to \"Unknown\"");
bool found = false; bool found = false;
@ -164,7 +164,7 @@ Entry *Database::recFindEntry(const QString &text, EntryReferenceType referenceT
const QList<Group*> children = group->children(); const QList<Group*> children = group->children();
for (Group* child : children) { for (Group* child : children) {
Entry* result = recFindEntry(text, referenceType, child); Entry* result = findEntryRecursive(text, referenceType, child);
if (result) { if (result) {
return result; return result;
} }
@ -175,10 +175,10 @@ Entry *Database::recFindEntry(const QString &text, EntryReferenceType referenceT
Group* Database::resolveGroup(const Uuid& uuid) Group* Database::resolveGroup(const Uuid& uuid)
{ {
return recFindGroup(uuid, m_rootGroup); return findGroupRecursive(uuid, m_rootGroup);
} }
Group* Database::recFindGroup(const Uuid& uuid, Group* group) Group* Database::findGroupRecursive(const Uuid& uuid, Group* group)
{ {
if (group->uuid() == uuid) { if (group->uuid() == uuid) {
return group; return group;
@ -186,7 +186,7 @@ Group* Database::recFindGroup(const Uuid& uuid, Group* group)
const QList<Group*> children = group->children(); const QList<Group*> children = group->children();
for (Group* child : children) { for (Group* child : children) {
Group* result = recFindGroup(uuid, child); Group* result = findGroupRecursive(uuid, child);
if (result) { if (result) {
return result; return result;
} }

6
src/core/Database.h
View file

@ -143,9 +143,9 @@ private slots:
void startModifiedTimer(); void startModifiedTimer();
private: private:
Entry* recFindEntry(const Uuid& uuid, Group* group); Entry* findEntryRecursive(const Uuid& uuid, Group* group);
Entry* recFindEntry(const QString& text, EntryReferenceType referenceType, Group* group); Entry* findEntryRecursive(const QString& text, EntryReferenceType referenceType, Group* group);
Group* recFindGroup(const Uuid& uuid, Group* group); Group* findGroupRecursive(const Uuid& uuid, Group* group);
void createRecycleBin(); void createRecycleBin();

15
src/core/Entry.cpp
View file

@ -722,7 +722,7 @@ void Entry::updateModifiedSinceBegin()
m_modifiedSinceBegin = true; m_modifiedSinceBegin = true;
} }
QString Entry::resolveMultiplePlaceholdersRecursive(const QString &str, int maxDepth) const QString Entry::resolveMultiplePlaceholdersRecursive(const QString& str, int maxDepth) const
{ {
if (maxDepth <= 0) { if (maxDepth <= 0) {
qWarning("Maximum depth of replacement has been reached. Entry uuid: %s", qPrintable(uuid().toHex())); qWarning("Maximum depth of replacement has been reached. Entry uuid: %s", qPrintable(uuid().toHex()));
@ -746,7 +746,7 @@ QString Entry::resolveMultiplePlaceholdersRecursive(const QString &str, int maxD
return result; return result;
} }
QString Entry::resolvePlaceholderRecursive(const QString &placeholder, int maxDepth) const QString Entry::resolvePlaceholderRecursive(const QString& placeholder, int maxDepth) const
{ {
const PlaceholderType typeOfPlaceholder = placeholderType(placeholder); const PlaceholderType typeOfPlaceholder = placeholderType(placeholder);
switch (typeOfPlaceholder) { switch (typeOfPlaceholder) {
@ -794,13 +794,12 @@ QString Entry::resolvePlaceholderRecursive(const QString &placeholder, int maxDe
return placeholder; return placeholder;
} }
QString Entry::resolveReferencePlaceholderRecursive(const QString &placeholder, int maxDepth) const QString Entry::resolveReferencePlaceholderRecursive(const QString& placeholder, int maxDepth) const
{ {
// resolving references in format: {REF:<WantedField>@<SearchIn>:<SearchText>} // resolving references in format: {REF:<WantedField>@<SearchIn>:<SearchText>}
// using format from http://keepass.info/help/base/fieldrefs.html at the time of writing // using format from http://keepass.info/help/base/fieldrefs.html at the time of writing
QRegularExpression* referenceRegExp = m_attributes->referenceRegExp(); QRegularExpressionMatch match = EntryAttributes::matchReference(placeholder);
QRegularExpressionMatch match = referenceRegExp->match(placeholder);
if (!match.hasMatch()) { if (!match.hasMatch()) {
return placeholder; return placeholder;
} }
@ -903,7 +902,7 @@ const Database* Entry::database() const
} }
} }
QString Entry::maskPasswordPlaceholders(const QString &str) const QString Entry::maskPasswordPlaceholders(const QString& str) const
{ {
QString result = str; QString result = str;
result.replace(QRegExp("(\\{PASSWORD\\})", Qt::CaseInsensitive, QRegExp::RegExp2), "******"); result.replace(QRegExp("(\\{PASSWORD\\})", Qt::CaseInsensitive, QRegExp::RegExp2), "******");
@ -920,7 +919,7 @@ QString Entry::resolvePlaceholder(const QString& placeholder) const
return resolvePlaceholderRecursive(placeholder, ResolveMaximumDepth); return resolvePlaceholderRecursive(placeholder, ResolveMaximumDepth);
} }
QString Entry::resolveUrlPlaceholder(const QString &str, Entry::PlaceholderType placeholderType) const QString Entry::resolveUrlPlaceholder(const QString& str, Entry::PlaceholderType placeholderType) const
{ {
if (str.isEmpty()) if (str.isEmpty())
return QString(); return QString();
@ -956,7 +955,7 @@ QString Entry::resolveUrlPlaceholder(const QString &str, Entry::PlaceholderType
return QString(); return QString();
} }
Entry::PlaceholderType Entry::placeholderType(const QString &placeholder) const Entry::PlaceholderType Entry::placeholderType(const QString& placeholder) const
{ {
if (!placeholder.startsWith(QLatin1Char('{')) || !placeholder.endsWith(QLatin1Char('}'))) { if (!placeholder.startsWith(QLatin1Char('{')) || !placeholder.endsWith(QLatin1Char('}'))) {
return PlaceholderType::NotPlaceholder; return PlaceholderType::NotPlaceholder;

2
src/core/Entry.h
View file

@ -181,7 +181,7 @@ public:
QString maskPasswordPlaceholders(const QString& str) const; QString maskPasswordPlaceholders(const QString& str) const;
QString resolveMultiplePlaceholders(const QString& str) const; QString resolveMultiplePlaceholders(const QString& str) const;
QString resolvePlaceholder(const QString& str) const; QString resolvePlaceholder(const QString& str) const;
QString resolveUrlPlaceholder(const QString &str, PlaceholderType placeholderType) const; QString resolveUrlPlaceholder(const QString& str, PlaceholderType placeholderType) const;
PlaceholderType placeholderType(const QString& placeholder) const; PlaceholderType placeholderType(const QString& placeholder) const;
QString resolveUrl(const QString& url) const; QString resolveUrl(const QString& url) const;

2
src/core/EntryAttachments.cpp
View file

@ -86,7 +86,7 @@ void EntryAttachments::remove(const QString& key)
emit modified(); emit modified();
} }
void EntryAttachments::remove(const QStringList &keys) void EntryAttachments::remove(const QStringList& keys)
{ {
if (keys.isEmpty()) { if (keys.isEmpty()) {
return; return;

22
src/core/EntryAttributes.cpp
View file

@ -34,8 +34,6 @@ const QString EntryAttributes::RememberCmdExecAttr = "_EXEC_CMD";
EntryAttributes::EntryAttributes(QObject* parent) EntryAttributes::EntryAttributes(QObject* parent)
: QObject(parent) : QObject(parent)
, m_referenceRegExp("\\{REF:(?<WantedField>[TUPANI])@(?<SearchIn>[TUPANIO]):(?<SearchText>[^}]+)\\}",
QRegularExpression::CaseInsensitiveOption)
{ {
clear(); clear();
} }
@ -67,12 +65,12 @@ QString EntryAttributes::value(const QString& key) const
return m_attributes.value(key); return m_attributes.value(key);
} }
bool EntryAttributes::contains(const QString &key) const bool EntryAttributes::contains(const QString& key) const
{ {
return m_attributes.contains(key); return m_attributes.contains(key);
} }
bool EntryAttributes::containsValue(const QString &value) const bool EntryAttributes::containsValue(const QString& value) const
{ {
return m_attributes.values().contains(value); return m_attributes.values().contains(value);
} }
@ -90,12 +88,7 @@ bool EntryAttributes::isReference(const QString& key) const
} }
const QString data = value(key); const QString data = value(key);
return m_referenceRegExp.match(data).hasMatch(); return matchReference(data).hasMatch();
}
QRegularExpression* EntryAttributes::referenceRegExp()
{
return &m_referenceRegExp;
} }
void EntryAttributes::set(const QString& key, const QString& value, bool protect) void EntryAttributes::set(const QString& key, const QString& value, bool protect)
@ -266,6 +259,15 @@ bool EntryAttributes::operator!=(const EntryAttributes& other) const
|| m_protectedAttributes != other.m_protectedAttributes); || m_protectedAttributes != other.m_protectedAttributes);
} }
QRegularExpressionMatch EntryAttributes::matchReference(const QString& text)
{
static QRegularExpression referenceRegExp(
"\\{REF:(?<WantedField>[TUPANI])@(?<SearchIn>[TUPANIO]):(?<SearchText>[^}]+)\\}",
QRegularExpression::CaseInsensitiveOption);
return referenceRegExp.match(text);
}
void EntryAttributes::clear() void EntryAttributes::clear()
{ {
emit aboutToBeReset(); emit aboutToBeReset();

4
src/core/EntryAttributes.h
View file

@ -39,7 +39,6 @@ public:
bool containsValue(const QString& value) const; bool containsValue(const QString& value) const;
bool isProtected(const QString& key) const; bool isProtected(const QString& key) const;
bool isReference(const QString& key) const; bool isReference(const QString& key) const;
QRegularExpression *referenceRegExp();
void set(const QString& key, const QString& value, bool protect = false); void set(const QString& key, const QString& value, bool protect = false);
void remove(const QString& key); void remove(const QString& key);
void rename(const QString& oldKey, const QString& newKey); void rename(const QString& oldKey, const QString& newKey);
@ -51,6 +50,8 @@ public:
bool operator==(const EntryAttributes& other) const; bool operator==(const EntryAttributes& other) const;
bool operator!=(const EntryAttributes& other) const; bool operator!=(const EntryAttributes& other) const;
static QRegularExpressionMatch matchReference(const QString& text);
static const QString TitleKey; static const QString TitleKey;
static const QString UserNameKey; static const QString UserNameKey;
static const QString PasswordKey; static const QString PasswordKey;
@ -80,7 +81,6 @@ signals:
private: private:
QMap<QString, QString> m_attributes; QMap<QString, QString> m_attributes;
QSet<QString> m_protectedAttributes; QSet<QString> m_protectedAttributes;
QRegularExpression m_referenceRegExp;
}; };
#endif // KEEPASSX_ENTRYATTRIBUTES_H #endif // KEEPASSX_ENTRYATTRIBUTES_H

94
tests/TestEntry.cpp
View file

@ -281,7 +281,7 @@ void TestEntry::testResolveReferencePlaceholders()
Group* group = new Group(); Group* group = new Group();
group->setParent(root); group->setParent(root);
Entry* entry2 = new Entry(); Entry* entry2 = new Entry();
entry2->setGroup(root); entry2->setGroup(group);
entry2->setUuid(Uuid::random()); entry2->setUuid(Uuid::random());
entry2->setTitle("Title2"); entry2->setTitle("Title2");
entry2->setUsername("Username2"); entry2->setUsername("Username2");
@ -291,7 +291,7 @@ void TestEntry::testResolveReferencePlaceholders()
entry2->attributes()->set("CustomAttribute2", "CustomAttributeValue2"); entry2->attributes()->set("CustomAttribute2", "CustomAttributeValue2");
Entry* entry3 = new Entry(); Entry* entry3 = new Entry();
entry3->setGroup(root); entry3->setGroup(group);
entry3->setUuid(Uuid::random()); entry3->setUuid(Uuid::random());
entry3->setTitle("{S:AttributeTitle}"); entry3->setTitle("{S:AttributeTitle}");
entry3->setUsername("{S:AttributeUsername}"); entry3->setUsername("{S:AttributeUsername}");
@ -308,51 +308,43 @@ void TestEntry::testResolveReferencePlaceholders()
tstEntry->setGroup(root); tstEntry->setGroup(root);
tstEntry->setUuid(Uuid::random()); tstEntry->setUuid(Uuid::random());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry1->uuid().toHex())), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry1->uuid().toHex())), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@T:%1}").arg(entry1->title())), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@T:%1}").arg(entry1->title())), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@U:%1}").arg(entry1->username())), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@U:%1}").arg(entry1->username())), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@P:%1}").arg(entry1->password())), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@P:%1}").arg(entry1->password())), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@A:%1}").arg(entry1->url())), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@A:%1}").arg(entry1->url())), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@N:%1}").arg(entry1->notes())), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@N:%1}").arg(entry1->notes())), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@O:%1}").arg(entry1->attributes()->value("CustomAttribute1"))), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@O:%1}").arg(entry1->attributes()->value("CustomAttribute1"))), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry1->uuid().toHex())), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry1->uuid().toHex())), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@T:%1}").arg(entry1->title())), QString("Title1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@T:%1}").arg(entry1->title())), entry1->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:U@U:%1}").arg(entry1->username())), QString("Username1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:U@U:%1}").arg(entry1->username())), entry1->username());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:P@P:%1}").arg(entry1->password())), QString("Password1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:P@P:%1}").arg(entry1->password())), entry1->password());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:A@A:%1}").arg(entry1->url())), QString("Url1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:A@A:%1}").arg(entry1->url())), entry1->url());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:N@N:%1}").arg(entry1->notes())), QString("Notes1")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:N@N:%1}").arg(entry1->notes())), entry1->notes());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry2->uuid().toHex())), QString("Title2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry2->uuid().toHex())), entry2->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@T:%1}").arg(entry2->title())), QString("Title2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@T:%1}").arg(entry2->title())), entry2->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@U:%1}").arg(entry2->username())), QString("Title2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@U:%1}").arg(entry2->username())), entry2->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@P:%1}").arg(entry2->password())), QString("Title2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@P:%1}").arg(entry2->password())), entry2->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@A:%1}").arg(entry2->url())), QString("Title2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@A:%1}").arg(entry2->url())), entry2->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@N:%1}").arg(entry2->notes())), QString("Title2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@N:%1}").arg(entry2->notes())), entry2->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@O:%1}").arg(entry2->attributes()->value("CustomAttribute2"))), QString("Title2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@O:%1}").arg(entry2->attributes()->value("CustomAttribute2"))), entry2->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@T:%1}").arg(entry2->title())), QString("Title2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@T:%1}").arg(entry2->title())), entry2->title());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:U@U:%1}").arg(entry2->username())), QString("Username2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:U@U:%1}").arg(entry2->username())), entry2->username());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:P@P:%1}").arg(entry2->password())), QString("Password2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:P@P:%1}").arg(entry2->password())), entry2->password());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:A@A:%1}").arg(entry2->url())), QString("Url2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:A@A:%1}").arg(entry2->url())), entry2->url());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:N@N:%1}").arg(entry2->notes())), QString("Notes2")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:N@N:%1}").arg(entry2->notes())), entry2->notes());
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry3->uuid().toHex())), QString("TitleValue")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry3->uuid().toHex())), entry3->attributes()->value("AttributeTitle"));
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry3->uuid().toHex())), QString("TitleValue")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:T@I:%1}").arg(entry3->uuid().toHex())), entry3->attributes()->value("AttributeTitle"));
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:U@I:%1}").arg(entry3->uuid().toHex())), QString("UsernameValue")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:U@I:%1}").arg(entry3->uuid().toHex())), entry3->attributes()->value("AttributeUsername"));
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:P@I:%1}").arg(entry3->uuid().toHex())), QString("PasswordValue")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:P@I:%1}").arg(entry3->uuid().toHex())), entry3->attributes()->value("AttributePassword"));
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:A@I:%1}").arg(entry3->uuid().toHex())), QString("UrlValue")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:A@I:%1}").arg(entry3->uuid().toHex())), entry3->attributes()->value("AttributeUrl"));
QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:N@I:%1}").arg(entry3->uuid().toHex())), QString("NotesValue")); QCOMPARE(tstEntry->resolveMultiplePlaceholders(QString("{REF:N@I:%1}").arg(entry3->uuid().toHex())), entry3->attributes()->value("AttributeNotes"));
} }
static const char placeholders[] = {
'T',
'U',
'P',
'A',
'N',
};
void TestEntry::testResolveNonIdPlaceholdersToUuid() void TestEntry::testResolveNonIdPlaceholdersToUuid()
{ {
Database db; Database db;
@ -383,35 +375,31 @@ void TestEntry::testResolveNonIdPlaceholdersToUuid()
referencedEntryNotes.setNotes("myNotes"); referencedEntryNotes.setNotes("myNotes");
referencedEntryNotes.setUuid(Uuid::random()); referencedEntryNotes.setUuid(Uuid::random());
for (const auto searchIn : placeholders) { const QList<QChar> placeholders{'T', 'U', 'P', 'A', 'N'};
for (const QChar searchIn : placeholders) {
const Entry* referencedEntry = nullptr; const Entry* referencedEntry = nullptr;
QString newEntryNotesRaw("{REF:I@%1:%2}"); QString newEntryNotesRaw("{REF:I@%1:%2}");
switch(searchIn) { switch(searchIn.toLatin1()) {
case 'T': case 'T':
referencedEntry = &referencedEntryTitle; referencedEntry = &referencedEntryTitle;
newEntryNotesRaw = newEntryNotesRaw.arg( newEntryNotesRaw = newEntryNotesRaw.arg(searchIn, referencedEntry->title());
QString(searchIn), referencedEntry->title());
break; break;
case 'U': case 'U':
referencedEntry = &referencedEntryUsername; referencedEntry = &referencedEntryUsername;
newEntryNotesRaw = newEntryNotesRaw.arg( newEntryNotesRaw = newEntryNotesRaw.arg(searchIn, referencedEntry->username());
QString(searchIn), referencedEntry->username());
break; break;
case 'P': case 'P':
referencedEntry = &referencedEntryPassword; referencedEntry = &referencedEntryPassword;
newEntryNotesRaw = newEntryNotesRaw.arg( newEntryNotesRaw = newEntryNotesRaw.arg(searchIn, referencedEntry->password());
QString(searchIn), referencedEntry->password());
break; break;
case 'A': case 'A':
referencedEntry = &referencedEntryUrl; referencedEntry = &referencedEntryUrl;
newEntryNotesRaw = newEntryNotesRaw.arg( newEntryNotesRaw = newEntryNotesRaw.arg(searchIn, referencedEntry->url());
QString(searchIn), referencedEntry->url());
break; break;
case 'N': case 'N':
referencedEntry = &referencedEntryNotes; referencedEntry = &referencedEntryNotes;
newEntryNotesRaw = newEntryNotesRaw.arg( newEntryNotesRaw = newEntryNotesRaw.arg(searchIn, referencedEntry->notes());
QString(searchIn), referencedEntry->notes());
break; break;
default: default:
break; break;