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

Implement search for reference placeholder based on fields other than ID

Browse source
This commit is contained in:
frostasm 2017-11-12 17:35:54 +02:00
parent 806dd5d783
commit 4c4d8a5e84
7 changed files with 220 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/EntryAttributes.cpp
View file

@ -25,11 +25,17 @@ const QString EntryAttributes::URLKey = "URL";
const QString EntryAttributes::NotesKey = "Notes";
const QStringList EntryAttributes::DefaultAttributes(QStringList() << TitleKey << UserNameKey
<< PasswordKey << URLKey << NotesKey);
const QString EntryAttributes::WantedFieldGroupName = "WantedField";
const QString EntryAttributes::SearchInGroupName = "SearchIn";
const QString EntryAttributes::SearchTextGroupName = "SearchText";
const QString EntryAttributes::RememberCmdExecAttr = "_EXEC_CMD";
EntryAttributes::EntryAttributes(QObject* parent)
: QObject(parent)
, m_referenceRegExp("\\{REF:([TUPAN])@I:([^}]+)\\}", Qt::CaseInsensitive, QRegExp::RegExp2)
, m_referenceRegExp("\\{REF:(?<WantedField>[TUPAN])@(?<SearchIn>[TUPANIO]):(?<SearchText>[^}]+)\\}",
QRegularExpression::CaseInsensitiveOption)
{
clear();
}
@ -66,6 +72,11 @@ bool EntryAttributes::contains(const QString &key) const
return m_attributes.contains(key);
}
bool EntryAttributes::containsValue(const QString &value) const
{
return m_attributes.values().contains(value);
}
bool EntryAttributes::isProtected(const QString& key) const
{
return m_protectedAttributes.contains(key);
@ -78,14 +89,11 @@ bool EntryAttributes::isReference(const QString& key) const
return false;
}
QString data = value(key);
if (m_referenceRegExp.indexIn(data) != -1) {
return true;
}
return false;
const QString data = value(key);
return m_referenceRegExp.match(data).hasMatch();
}
QRegExp* EntryAttributes::referenceRegExp()
QRegularExpression* EntryAttributes::referenceRegExp()
{
return &m_referenceRegExp;
}