kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

handle maps with multiple or single entries from Baloo

Browse Source 
Summary:
Handle maps which may contain multiple entries with the same key.
Bumps frameworks to 5.58. Equivalent to D20739.

Reviewers: #dolphin, elvisangelaccio, bruns

Reviewed By: #dolphin, elvisangelaccio, bruns

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D21157
This commit is contained in:
Alexander Stippich 2019-05-21 20:27:29 +02:00
parent c22df71df2
commit 36b61838a2
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -8,7 +8,7 @@ set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATI
project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
set(QT_MIN_VERSION "5.8.0")
set(KF5_MIN_VERSION "5.56.0")
set(KF5_MIN_VERSION "5.58.0")
# ECM setup
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)

30
src/kitemviews/private/kbaloorolesprovider.cpp
View File

@ -56,18 +56,34 @@ QHash<QByteArray, QVariant> KBalooRolesProvider::roleValues(const Baloo::File& f
{
QHash<QByteArray, QVariant> values;
QMapIterator<KFileMetaData::Property::Property, QVariant> it(file.properties());
while (it.hasNext()) {
it.next();
using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>;
const auto& propMap = file.properties();
auto rangeBegin = propMap.constKeyValueBegin();
while (rangeBegin != propMap.constKeyValueEnd()) {
auto key = (*rangeBegin).first;
const KFileMetaData::PropertyInfo propertyInfo(key);
const QByteArray role = roleForProperty(propertyInfo.name());
auto rangeEnd = std::find_if(rangeBegin, propMap.constKeyValueEnd(),
[key](const entry& e) { return e.first != key; });
const KFileMetaData::PropertyInfo pi(it.key());
const QString property = pi.name();
const QByteArray role = roleForProperty(property);
if (role.isEmpty() || !roles.contains(role)) {
rangeBegin = rangeEnd;
continue;
}
values.insert(role, pi.formatAsDisplayString(it.value()));
auto distance = std::distance(rangeBegin, rangeEnd);
if (distance > 1) {
QVariantList list;
list.reserve(static_cast<int>(distance));
std::for_each(rangeBegin, rangeEnd, [&list](const entry& s) { list.append(s.second); });
values.insert(role, propertyInfo.formatAsDisplayString(list));
} else {
values.insert(role, propertyInfo.formatAsDisplayString((*rangeBegin).second));
}
rangeBegin = rangeEnd;
}
KFileMetaData::UserMetaData md(file.path());