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

Adding support for listing a group. (#652)

Browse source 
* Adding support for listing a group.

* added findGroupByPath

* Removing useless asserts.

* Code review.
This commit is contained in:
louib 2017-06-21 17:34:49 -04:00 • committed by GitHub
parent 9d6cf95cf0
commit 48ea024d7e
5 changed files with 133 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/core/Group.cpp
View file

@ -486,7 +486,6 @@ QList<Entry*> Group::entriesRecursive(bool includeHistoryItems) const
Entry* Group::findEntry(QString entryId)
{
Q_ASSERT(!entryId.isEmpty());
Q_ASSERT(!entryId.isNull());
if (Uuid::isUuid(entryId)) {
@ -527,12 +526,11 @@ Entry* Group::findEntryByUuid(const Uuid& uuid)
Entry* Group::findEntryByPath(QString entryPath, QString basePath)
{
Q_ASSERT(!entryPath.isEmpty());
Q_ASSERT(!entryPath.isNull());
for (Entry* entry : asConst(m_entries)) {
QString currentEntryPath = basePath + entry->title();
if (entryPath == currentEntryPath) {
if (entryPath == currentEntryPath || entryPath == QString("/" + currentEntryPath)) {
return entry;
}
}
@ -547,6 +545,39 @@ Entry* Group::findEntryByPath(QString entryPath, QString basePath)
return nullptr;
}
Group* Group::findGroupByPath(QString groupPath, QString basePath)
{
Q_ASSERT(!groupPath.isNull());
QStringList possiblePaths;
possiblePaths << groupPath;
if (!groupPath.startsWith("/")) {
possiblePaths << QString("/" + groupPath);
}
if (!groupPath.endsWith("/")) {
possiblePaths << QString(groupPath + "/");
}
if (!groupPath.endsWith("/") && !groupPath.endsWith("/")) {
possiblePaths << QString("/" + groupPath + "/");
}
if (possiblePaths.contains(basePath)) {
return this;
}
for (Group* innerGroup : children()) {
QString innerBasePath = basePath + innerGroup->name() + "/";
Group* group = innerGroup->findGroupByPath(groupPath, innerBasePath);
if (group != nullptr) {
return group;
}
}
return nullptr;
}
QString Group::print(bool printUuids, QString baseName, int depth)
{