X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f2474c344a197ed5df886e65fdfce4980767fb59..9aaf3054106311d8ef49174e32f0ad03dcbe3fca:/src/kitemviews/kfileitemmodel.cpp diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 564ac42ea..9464c7e09 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -34,7 +34,7 @@ Q_GLOBAL_STATIC(QRecursiveMutex, s_collatorMutex) // #define KFILEITEMMODEL_DEBUG KFileItemModel::KFileItemModel(QObject *parent) - : KItemModelBase("text", "text", parent) + : KItemModelBase("text", "none", parent) , m_dirLister(nullptr) , m_sortDirsFirst(true) , m_sortHiddenLast(false) @@ -387,7 +387,14 @@ QList> KFileItemModel::groups() const QElapsedTimer timer; timer.start(); #endif - switch (typeForRole(groupRole())) { + QByteArray role = groupRole(); + if (typeForRole(role) == NoRole) { + // Handle extra grouping information + if (m_groupExtraInfo == "followSort") { + role = sortRole(); + } + } + switch (typeForRole(role)) { case NoRole: m_groups.clear(); break; @@ -424,7 +431,7 @@ QList> KFileItemModel::groups() const m_groups = ratingRoleGroups(); break; default: - m_groups = genericStringRoleGroups(groupRole()); + m_groups = genericStringRoleGroups(role); break; } @@ -949,6 +956,13 @@ void KFileItemModel::onSortRoleChanged(const QByteArray ¤t, const QByteArr { Q_UNUSED(previous) m_sortRole = typeForRole(current); + if (m_sortRole == NoRole) { + // Requested role not in list of roles. This could + // be used for indicating non-trivial sorting behavior + m_sortExtraInfo = current; + } else { + m_sortExtraInfo.clear(); + } if (!m_requestRole[m_sortRole]) { QSet newRoles = m_roles; @@ -961,22 +975,25 @@ void KFileItemModel::onSortRoleChanged(const QByteArray ¤t, const QByteArr } } -void KFileItemModel::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous, bool resortItems) +void KFileItemModel::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) { Q_UNUSED(current) Q_UNUSED(previous) - - if (resortItems) { - resortAllItems(); - } } void KFileItemModel::onGroupRoleChanged(const QByteArray ¤t, const QByteArray &previous, bool resortItems) { Q_UNUSED(previous) m_groupRole = typeForRole(current); + if (m_groupRole == NoRole) { + // Requested role not in list of roles. This could + // be used for indicating non-trivial grouping behavior + m_groupExtraInfo = current; + } else { + m_groupExtraInfo.clear(); + } - if (!m_requestRole[m_sortRole]) { + if (!m_requestRole[m_groupRole]) { QSet newRoles = m_roles; newRoles << current; setRoles(newRoles); @@ -987,14 +1004,10 @@ void KFileItemModel::onGroupRoleChanged(const QByteArray ¤t, const QByteAr } } -void KFileItemModel::onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous, bool resortItems) +void KFileItemModel::onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) { Q_UNUSED(current) Q_UNUSED(previous) - - if (resortItems) { - resortAllItems(); - } } void KFileItemModel::loadSortingSettings() @@ -1019,6 +1032,7 @@ void KFileItemModel::loadSortingSettings() // Workaround for bug https://bugreports.qt.io/browse/QTBUG-69361 // Force the clean state of QCollator in single thread to avoid thread safety problems in sort m_collator.compare(QString(), QString()); + m_dirSizeMode = ContentDisplaySettings::directorySizeMode(); } void KFileItemModel::resortAllItems() @@ -1084,7 +1098,8 @@ void KFileItemModel::resortAllItems() } Q_EMIT itemsMoved(KItemRange(firstMovedIndex, movedItemsCount), movedToIndexes); - } else if (groupedSorting()) { + } + if (groupedSorting()) { // The groups might have changed even if the order of the items has not. const QList> oldGroups = m_groups; m_groups.clear(); @@ -1669,7 +1684,7 @@ void KFileItemModel::removeItems(const KItemRangeList &itemRanges, RemoveItemsBe QList KFileItemModel::createItemDataList(const QUrl &parentUrl, const KFileItemList &items) const { - if (m_sortRole == TypeRole) { + if (m_sortRole == TypeRole || m_groupRole == TypeRole) { // Try to resolve the MIME-types synchronously to prevent a reordering of // the items when sorting by type (per default MIME-types are resolved // asynchronously by KFileItemModelRolesUpdater). @@ -1693,9 +1708,9 @@ QList KFileItemModel::createItemDataList(const QUrl return itemDataList; } -void KFileItemModel::prepareItemsForSorting(QList &itemDataList) +void KFileItemModel::prepareItemsWithRole(QList &itemDataList, RoleType roleType) { - switch (m_sortRole) { + switch (roleType) { case ExtensionRole: case PermissionsRole: case OwnerRole: @@ -1734,6 +1749,12 @@ void KFileItemModel::prepareItemsForSorting(QList &itemDataList) } } +void KFileItemModel::prepareItemsForSorting(QList &itemDataList) +{ + prepareItemsWithRole(itemDataList, m_sortRole); + prepareItemsWithRole(itemDataList, m_groupRole); +} + int KFileItemModel::expandedParentsCount(const ItemData *data) { // The hash 'values' is only guaranteed to contain the key "expandedParentsCount" @@ -2079,8 +2100,7 @@ bool KFileItemModel::lessThan(const ItemData *a, const ItemData *b, const QColla return true; } } - if (m_sortDirsFirst - || (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount && m_sortRole == SizeRole)) { + if (m_sortDirsFirst || (m_dirSizeMode == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount && m_sortRole == SizeRole)) { const bool isDirA = a->item.isDir(); const bool isDirB = b->item.isDir(); if (isDirA && !isDirB) { @@ -2134,7 +2154,7 @@ int KFileItemModel::sortRoleCompare(const ItemData *a, const ItemData *b, const break; case SizeRole: { - if (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount && itemA.isDir()) { + if (m_dirSizeMode == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount && itemA.isDir()) { // folders first then // items A and B are folders thanks to lessThan checks auto valueA = a->values.value("count"); @@ -2288,135 +2308,102 @@ int KFileItemModel::sortRoleCompare(const ItemData *a, const ItemData *b, const int KFileItemModel::groupRoleCompare(const ItemData *a, const ItemData *b, const QCollator &collator) const { // Unlike sortRoleCompare, this function can and often will return 0. - const KFileItem &itemA = a->item; - const KFileItem &itemB = b->item; - int result = 0; + ItemGroupInfo groupA, groupB; switch (m_groupRole) { case NoRole: + // Non-trivial grouping behavior might be handled there in the future. + return 0; + case NameRole: + groupA = nameRoleGroup(a, false); + groupB = nameRoleGroup(b, false); break; - case NameRole: { - QChar groupA = getNameRoleGroup(a, false).toChar(); - QChar groupB = getNameRoleGroup(b, false).toChar(); - if (groupA < groupB) { - result = -1; - } else if (groupA > groupB) { - result = 1; - } + case SizeRole: + groupA = sizeRoleGroup(a, false); + groupB = sizeRoleGroup(b, false); break; - } - case SizeRole: { - int groupA = getSizeRoleGroup(a, false).toInt(); - int groupB = getSizeRoleGroup(b, false).toInt(); - if (groupA < groupB) { - result = -1; - } else if (groupA > groupB) { - result = 1; - } + case ModificationTimeRole: + groupA = timeRoleGroup( + [](const ItemData *item) { + return item->item.time(KFileItem::ModificationTime); + }, + a, + false); + groupB = timeRoleGroup( + [](const ItemData *item) { + return item->item.time(KFileItem::ModificationTime); + }, + b, + false); break; - } - case ModificationTimeRole: { - int groupA = getTimeRoleGroup( - [](const ItemData *item) { - return item->item.time(KFileItem::ModificationTime); - }, - a, - false) - .toInt(); - int groupB = getTimeRoleGroup( - [](const ItemData *item) { - return item->item.time(KFileItem::ModificationTime); - }, - b, - false) - .toInt(); - if (groupA < groupB) { - result = -1; - } else if (groupA > groupB) { - result = 1; - } + case CreationTimeRole: + groupA = timeRoleGroup( + [](const ItemData *item) { + return item->item.time(KFileItem::CreationTime); + }, + a, + false); + groupB = timeRoleGroup( + [](const ItemData *item) { + return item->item.time(KFileItem::CreationTime); + }, + b, + false); break; - } - case CreationTimeRole: { - int groupA = getTimeRoleGroup( - [](const ItemData *item) { - return item->item.time(KFileItem::CreationTime); - }, - a, - false) - .toInt(); - int groupB = getTimeRoleGroup( - [](const ItemData *item) { - return item->item.time(KFileItem::CreationTime); - }, - b, - false) - .toInt(); - if (groupA < groupB) { - result = -1; - } else if (groupA > groupB) { - result = 1; - } + case AccessTimeRole: + groupA = timeRoleGroup( + [](const ItemData *item) { + return item->item.time(KFileItem::AccessTime); + }, + a, + false); + groupB = timeRoleGroup( + [](const ItemData *item) { + return item->item.time(KFileItem::AccessTime); + }, + b, + false); break; - } - case AccessTimeRole: { - int groupA = getTimeRoleGroup( - [](const ItemData *item) { - return item->item.time(KFileItem::AccessTime); - }, - a, - false) - .toInt(); - int groupB = getTimeRoleGroup( - [](const ItemData *item) { - return item->item.time(KFileItem::AccessTime); - }, - b, - false) - .toInt(); - if (groupA < groupB) { - result = -1; - } else if (groupA > groupB) { - result = 1; - } + case DeletionTimeRole: + groupA = timeRoleGroup( + [](const ItemData *item) { + return item->values.value("deletiontime").toDateTime(); + }, + a, + false); + groupB = timeRoleGroup( + [](const ItemData *item) { + return item->values.value("deletiontime").toDateTime(); + }, + b, + false); break; - } - case DeletionTimeRole: { - int groupA = getTimeRoleGroup( - [](const ItemData *item) { - return item->values.value("deletiontime").toDateTime(); - }, - a, - false) - .toInt(); - int groupB = getTimeRoleGroup( - [](const ItemData *item) { - return item->values.value("deletiontime").toDateTime(); - }, - b, - false) - .toInt(); - if (groupA < groupB) { - result = -1; - } else if (groupA > groupB) { - result = 1; - } + case PermissionsRole: + groupA = permissionRoleGroup(a, false); + groupB = permissionRoleGroup(b, false); + break; + case RatingRole: + groupA = ratingRoleGroup(a, false); + groupB = ratingRoleGroup(b, false); + break; + case TypeRole: + groupA = typeRoleGroup(a); + groupB = typeRoleGroup(b); break; - } - // case PermissionsRole: - // case RatingRole: default: { - QString groupA = getGenericStringRoleGroup(groupRole(), a); - QString groupB = getGenericStringRoleGroup(groupRole(), b); - if (groupA < groupB) { - result = -1; - } else if (groupA > groupB) { - result = 1; - } + groupA = genericStringRoleGroup(groupRole(), a); + groupB = genericStringRoleGroup(groupRole(), b); break; } } + if (groupA.comparable < groupB.comparable) { + result = -1; + } else if (groupA.comparable > groupB.comparable) { + result = 1; + } else { + result = stringCompare(groupA.text, groupB.text, collator); + } return result; } @@ -2439,19 +2426,28 @@ int KFileItemModel::stringCompare(const QString &a, const QString &b, const QCol return QString::compare(a, b, Qt::CaseSensitive); } -QVariant KFileItemModel::getNameRoleGroup(const ItemData *itemData, bool asString) const +KFileItemModel::ItemGroupInfo KFileItemModel::nameRoleGroup(const ItemData *itemData, bool withString) const { - const KFileItem item = itemData->item; - const QString name = item.text(); - QVariant newGroupValue; + static ItemGroupInfo oldGroupInfo; + static QChar oldFirstChar; + ItemGroupInfo groupInfo; + QChar firstChar; + + const QString name = itemData->item.text(); + + QMutexLocker collatorLock(s_collatorMutex()); + // Use the first character of the name as group indication - QChar newFirstChar = name.at(0).toUpper(); - if (newFirstChar == QLatin1Char('~') && name.length() > 1) { - newFirstChar = name.at(1).toUpper(); - } + firstChar = name.at(0).toUpper(); - if (newFirstChar.isLetter()) { - if (m_collator.compare(newFirstChar, QChar(QLatin1Char('A'))) >= 0 && m_collator.compare(newFirstChar, QChar(QLatin1Char('Z'))) <= 0) { + if (firstChar == oldFirstChar) { + return oldGroupInfo; + } + if (firstChar == QLatin1Char('~') && name.length() > 1) { + firstChar = name.at(1).toUpper(); + } + if (firstChar.isLetter()) { + if (m_collator.compare(firstChar, QChar(QLatin1Char('A'))) >= 0 && m_collator.compare(firstChar, QChar(QLatin1Char('Z'))) <= 0) { // WARNING! Symbols based on latin 'Z' like 'Z' with acute are treated wrong as non Latin and put in a new group. // Try to find a matching group in the range 'A' to 'Z'. @@ -2467,146 +2463,160 @@ QVariant KFileItemModel::getNameRoleGroup(const ItemData *itemData, bool asStrin return m_collator.compare(c1, c2) < 0; }; - std::vector::iterator it = std::lower_bound(lettersAtoZ.begin(), lettersAtoZ.end(), newFirstChar, localeAwareLessThan); + std::vector::iterator it = std::lower_bound(lettersAtoZ.begin(), lettersAtoZ.end(), firstChar, localeAwareLessThan); if (it != lettersAtoZ.end()) { - if (localeAwareLessThan(newFirstChar, *it)) { + if (localeAwareLessThan(firstChar, *it)) { // newFirstChar belongs to the group preceding *it. // Example: for an umlaut 'A' in the German locale, *it would be 'B' now. --it; } - newGroupValue = *it; + if (withString) { + groupInfo.text = *it; + } + groupInfo.comparable = (*it).unicode(); } } else { // Symbols from non Latin-based scripts - newGroupValue = newFirstChar; + if (withString) { + groupInfo.text = firstChar; + } + groupInfo.comparable = firstChar.unicode(); } - } else if (newFirstChar >= QLatin1Char('0') && newFirstChar <= QLatin1Char('9')) { + } else if (firstChar >= QLatin1Char('0') && firstChar <= QLatin1Char('9')) { // Apply group '0 - 9' for any name that starts with a digit - if (asString) { - newGroupValue = i18nc("@title:group Groups that start with a digit", "0 - 9"); - } else { - newGroupValue = QChar('0'); + if (withString) { + groupInfo.text = i18nc("@title:group Groups that start with a digit", "0 - 9"); } + groupInfo.comparable = (int)'0'; } else { - if (asString) { - newGroupValue = i18nc("@title:group", "Others"); - } else { - newGroupValue = QChar('.'); + if (withString) { + groupInfo.text = i18nc("@title:group", "Others"); } + groupInfo.comparable = (int)'.'; } - return newGroupValue; + oldFirstChar = firstChar; + oldGroupInfo = groupInfo; + return groupInfo; } -QVariant KFileItemModel::getSizeRoleGroup(const ItemData *itemData, bool asString) const +KFileItemModel::ItemGroupInfo KFileItemModel::sizeRoleGroup(const ItemData *itemData, bool withString) const { + static ItemGroupInfo oldGroupInfo; + static KIO::filesize_t oldFileSize; + ItemGroupInfo groupInfo; + KIO::filesize_t fileSize; + const KFileItem item = itemData->item; + fileSize = !item.isNull() ? item.size() : ~0U; - KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U; - int newGroupValue = -1; // None + groupInfo.comparable = -1; // None if (!item.isNull() && item.isDir()) { - if (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount || m_sortDirsFirst) { - newGroupValue = 0; // Folders + if (m_dirSizeMode != ContentDisplaySettings::EnumDirectorySizeMode::ContentSize) { + groupInfo.comparable = 0; // Folders } else { fileSize = itemData->values.value("size").toULongLong(); } } - - if (newGroupValue < 0) { + if (fileSize == oldFileSize) { + return oldGroupInfo; + } + if (groupInfo.comparable < 0) { if (fileSize < 5 * 1024 * 1024) { // < 5 MB - newGroupValue = 1; // Small + groupInfo.comparable = 1; // Small } else if (fileSize < 10 * 1024 * 1024) { // < 10 MB - newGroupValue = 2; // Medium + groupInfo.comparable = 2; // Medium } else { - newGroupValue = 3; // Big + groupInfo.comparable = 3; // Big } } - if (asString) { + if (withString) { char const *groupNames[] = {"Folders", "Small", "Medium", "Big"}; - return i18nc("@title:group Size", groupNames[newGroupValue]); - } else { - return newGroupValue; + groupInfo.text = i18nc("@title:group Size", groupNames[groupInfo.comparable]); } + oldFileSize = fileSize; + oldGroupInfo = groupInfo; + return groupInfo; } -QVariant KFileItemModel::getTimeRoleGroup(const std::function &fileTimeCb, const ItemData *itemData, bool asString) const +KFileItemModel::ItemGroupInfo +KFileItemModel::timeRoleGroup(const std::function &fileTimeCb, const ItemData *itemData, bool withString) const { + static ItemGroupInfo oldGroupInfo; + static QDate oldFileDate; + ItemGroupInfo groupInfo; + const QDate currentDate = QDate::currentDate(); const QDateTime fileTime = fileTimeCb(itemData); const QDate fileDate = fileTime.date(); const int daysDistance = fileDate.daysTo(currentDate); - int intGroupValue; - QString strGroupValue; - - if (!asString) { - // Simplified grouping algorithm, preserving dates - // but not taking "pretty printing" into account - if (currentDate.year() == fileDate.year() && currentDate.month() == fileDate.month()) { + // Simplified grouping algorithm, preserving dates + // but not taking "pretty printing" into account + if (currentDate.year() == fileDate.year() && currentDate.month() == fileDate.month()) { + if (daysDistance < 7) { + groupInfo.comparable = daysDistance; // Today, Yesterday and week days + } else if (daysDistance < 14) { + groupInfo.comparable = 10; // One Week Ago + } else if (daysDistance < 21) { + groupInfo.comparable = 20; // Two Weeks Ago + } else if (daysDistance < 28) { + groupInfo.comparable = 30; // Three Weeks Ago + } else { + groupInfo.comparable = 40; // Earlier This Month + } + } else { + const QDate lastMonthDate = currentDate.addMonths(-1); + if (lastMonthDate.year() == fileDate.year() && lastMonthDate.month() == fileDate.month()) { if (daysDistance < 7) { - intGroupValue = daysDistance; // Today, Yesterday and week days + groupInfo.comparable = daysDistance; // Today, Yesterday and week days (Month, Year) } else if (daysDistance < 14) { - intGroupValue = 10; // One Week Ago + groupInfo.comparable = 11; // One Week Ago (Month, Year) } else if (daysDistance < 21) { - intGroupValue = 20; // Two Weeks Ago + groupInfo.comparable = 21; // Two Weeks Ago (Month, Year) } else if (daysDistance < 28) { - intGroupValue = 30; // Three Weeks Ago + groupInfo.comparable = 31; // Three Weeks Ago (Month, Year) } else { - intGroupValue = 40; // Earlier This Month + groupInfo.comparable = 41; // Earlier on Month, Year } } else { - const QDate lastMonthDate = currentDate.addMonths(-1); - if (lastMonthDate.year() == fileDate.year() && lastMonthDate.month() == fileDate.month()) { - if (daysDistance < 7) { - intGroupValue = daysDistance; // Today, Yesterday and week days (Month, Year) - } else if (daysDistance < 14) { - intGroupValue = 9; // One Week Ago (Month, Year) - } else if (daysDistance < 21) { - intGroupValue = 19; // Two Weeks Ago (Month, Year) - } else if (daysDistance < 28) { - intGroupValue = 29; // Three Weeks Ago (Month, Year) - } else { - intGroupValue = 39; // Earlier on Month, Year - } - } else { - // The trick will fail for dates past April, 178956967 or before 1 AD. - intGroupValue = 2147483647 - (fileDate.year() * 12 + fileDate.month() - 1); // Month, Year; newer < older - } + // The trick will fail for dates past April, 178956967 or before 1 AD. + groupInfo.comparable = 2147483647 - (fileDate.year() * 12 + fileDate.month() - 1); // Month, Year; newer < older } - return QVariant(intGroupValue); - } else { + } + if (withString) { if (currentDate.year() == fileDate.year() && currentDate.month() == fileDate.month()) { switch (daysDistance / 7) { case 0: switch (daysDistance) { case 0: - strGroupValue = i18nc("@title:group Date", "Today"); + groupInfo.text = i18nc("@title:group Date", "Today"); break; case 1: - strGroupValue = i18nc("@title:group Date", "Yesterday"); + groupInfo.text = i18nc("@title:group Date", "Yesterday"); break; default: - strGroupValue = fileTime.toString(i18nc("@title:group Date: The week day name: dddd", "dddd")); - strGroupValue = i18nc( + groupInfo.text = fileTime.toString(i18nc("@title:group Date: The week day name: dddd", "dddd")); + groupInfo.text = i18nc( "Can be used to script translation of \"dddd\"" "with context @title:group Date", "%1", - strGroupValue); + groupInfo.text); } break; case 1: - strGroupValue = i18nc("@title:group Date", "One Week Ago"); + groupInfo.text = i18nc("@title:group Date", "One Week Ago"); break; case 2: - strGroupValue = i18nc("@title:group Date", "Two Weeks Ago"); + groupInfo.text = i18nc("@title:group Date", "Two Weeks Ago"); break; case 3: - strGroupValue = i18nc("@title:group Date", "Three Weeks Ago"); + groupInfo.text = i18nc("@title:group Date", "Three Weeks Ago"); break; case 4: case 5: - strGroupValue = i18nc("@title:group Date", "Earlier this Month"); + groupInfo.text = i18nc("@title:group Date", "Earlier this Month"); break; default: Q_ASSERT(false); @@ -2623,30 +2633,30 @@ QVariant KFileItemModel::getTimeRoleGroup(const std::functionitem.url().toLocalFile()); + const QFileDevice::Permissions permissions = info.permissions(); + if (permissions == oldPermissions) { + return oldGroupInfo; + } + groupInfo.comparable = (int)permissions; + + if (withString) { + // Set user string + QString user; + if (permissions & QFile::ReadUser) { + user = i18nc("@item:intext Access permission, concatenated", "Read, "); + } + if (permissions & QFile::WriteUser) { + user += i18nc("@item:intext Access permission, concatenated", "Write, "); + } + if (permissions & QFile::ExeUser) { + user += i18nc("@item:intext Access permission, concatenated", "Execute, "); + } + user = user.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : user.mid(0, user.length() - 2); + + // Set group string + QString group; + if (permissions & QFile::ReadGroup) { + group = i18nc("@item:intext Access permission, concatenated", "Read, "); + } + if (permissions & QFile::WriteGroup) { + group += i18nc("@item:intext Access permission, concatenated", "Write, "); + } + if (permissions & QFile::ExeGroup) { + group += i18nc("@item:intext Access permission, concatenated", "Execute, "); + } + group = group.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : group.mid(0, group.length() - 2); + + // Set others string + QString others; + if (permissions & QFile::ReadOther) { + others = i18nc("@item:intext Access permission, concatenated", "Read, "); + } + if (permissions & QFile::WriteOther) { + others += i18nc("@item:intext Access permission, concatenated", "Write, "); + } + if (permissions & QFile::ExeOther) { + others += i18nc("@item:intext Access permission, concatenated", "Execute, "); + } + others = others.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : others.mid(0, others.length() - 2); + groupInfo.text = i18nc("@title:group Files and folders by permissions", "User: %1 | Group: %2 | Others: %3", user, group, others); + } + oldPermissions = permissions; + oldGroupInfo = groupInfo; + return groupInfo; } -QString KFileItemModel::getGenericStringRoleGroup(const QByteArray &role, const ItemData *itemData) const +KFileItemModel::ItemGroupInfo KFileItemModel::ratingRoleGroup(const ItemData *itemData, bool withString) const { - return itemData->values.value(role).toString(); + ItemGroupInfo groupInfo; + groupInfo.comparable = itemData->values.value("rating", 0).toInt(); + if (withString) { + // Dolphin does not currently use string representation of star rating + // as stars are rendered as graphics in group headers. + groupInfo.text = i18nc("@item:intext Rated N (stars)", "Rated ") + QString::number(groupInfo.comparable); + } + return groupInfo; +} + +KFileItemModel::ItemGroupInfo KFileItemModel::genericStringRoleGroup(const QByteArray &role, const ItemData *itemData) const +{ + return {0, itemData->values.value(role).toString()}; } QList> KFileItemModel::nameRoleGroups() const @@ -2760,21 +2843,18 @@ QList> KFileItemModel::nameRoleGroups() const const int maxIndex = count() - 1; QList> groups; - QString groupValue; - QChar firstChar; + ItemGroupInfo groupInfo; for (int i = 0; i <= maxIndex; ++i) { if (isChildItem(i)) { continue; } - QString newGroupValue = getNameRoleGroup(m_itemData.at(i)).toString(); + ItemGroupInfo newGroupInfo = nameRoleGroup(m_itemData.at(i)); - if (newGroupValue != groupValue) { - groupValue = newGroupValue; - groups.append(QPair(i, newGroupValue)); + if (newGroupInfo != groupInfo) { + groupInfo = newGroupInfo; + groups.append(QPair(i, newGroupInfo.text)); } - - // firstChar = newFirstChar; } return groups; } @@ -2786,23 +2866,36 @@ QList> KFileItemModel::sizeRoleGroups() const const int maxIndex = count() - 1; QList> groups; - QString groupValue; + ItemGroupInfo groupInfo; for (int i = 0; i <= maxIndex; ++i) { if (isChildItem(i)) { continue; } - QString newGroupValue = getSizeRoleGroup(m_itemData.at(i)).toString(); + ItemGroupInfo newGroupInfo = sizeRoleGroup(m_itemData.at(i)); - if (newGroupValue != groupValue) { - groupValue = newGroupValue; - groups.append(QPair(i, newGroupValue)); + if (newGroupInfo != groupInfo) { + groupInfo = newGroupInfo; + groups.append(QPair(i, newGroupInfo.text)); } } - return groups; } +KFileItemModel::ItemGroupInfo KFileItemModel::typeRoleGroup(const ItemData *itemData) const +{ + int priority = 0; + if (itemData->item.isDir() && m_sortDirsFirst) { + // Ensure folders stay first regardless of grouping order + if (groupOrder() == Qt::AscendingOrder) { + priority = -1; + } else { + priority = 1; + } + } + return {priority, itemData->values.value("type").toString()}; +} + QList> KFileItemModel::timeRoleGroups(const std::function &fileTimeCb) const { Q_ASSERT(!m_itemData.isEmpty()); @@ -2810,31 +2903,19 @@ QList> KFileItemModel::timeRoleGroups(const std::function> groups; - const QDate currentDate = QDate::currentDate(); - - QDate previousFileDate; - QString groupValue; + ItemGroupInfo groupInfo; for (int i = 0; i <= maxIndex; ++i) { if (isChildItem(i)) { continue; } - const QDateTime fileTime = fileTimeCb(m_itemData.at(i)); - const QDate fileDate = fileTime.date(); - if (fileDate == previousFileDate) { - // The current item is in the same group as the previous item - continue; - } - previousFileDate = fileDate; - - QString newGroupValue = getTimeRoleGroup(fileTimeCb, m_itemData.at(i)).toString(); + ItemGroupInfo newGroupInfo = timeRoleGroup(fileTimeCb, m_itemData.at(i)); - if (newGroupValue != groupValue) { - groupValue = newGroupValue; - groups.append(QPair(i, newGroupValue)); + if (newGroupInfo != groupInfo) { + groupInfo = newGroupInfo; + groups.append(QPair(i, newGroupInfo.text)); } } - return groups; } @@ -2845,68 +2926,19 @@ QList> KFileItemModel::permissionRoleGroups() const const int maxIndex = count() - 1; QList> groups; - QString permissionsString; - QString groupValue; + ItemGroupInfo groupInfo; for (int i = 0; i <= maxIndex; ++i) { if (isChildItem(i)) { continue; } - const ItemData *itemData = m_itemData.at(i); - const QString newPermissionsString = itemData->values.value("permissions").toString(); - if (newPermissionsString == permissionsString) { - continue; - } - permissionsString = newPermissionsString; - - const QFileInfo info(itemData->item.url().toLocalFile()); - - // Set user string - QString user; - if (info.permission(QFile::ReadUser)) { - user = i18nc("@item:intext Access permission, concatenated", "Read, "); - } - if (info.permission(QFile::WriteUser)) { - user += i18nc("@item:intext Access permission, concatenated", "Write, "); - } - if (info.permission(QFile::ExeUser)) { - user += i18nc("@item:intext Access permission, concatenated", "Execute, "); - } - user = user.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : user.mid(0, user.length() - 2); - - // Set group string - QString group; - if (info.permission(QFile::ReadGroup)) { - group = i18nc("@item:intext Access permission, concatenated", "Read, "); - } - if (info.permission(QFile::WriteGroup)) { - group += i18nc("@item:intext Access permission, concatenated", "Write, "); - } - if (info.permission(QFile::ExeGroup)) { - group += i18nc("@item:intext Access permission, concatenated", "Execute, "); - } - group = group.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : group.mid(0, group.length() - 2); - - // Set others string - QString others; - if (info.permission(QFile::ReadOther)) { - others = i18nc("@item:intext Access permission, concatenated", "Read, "); - } - if (info.permission(QFile::WriteOther)) { - others += i18nc("@item:intext Access permission, concatenated", "Write, "); - } - if (info.permission(QFile::ExeOther)) { - others += i18nc("@item:intext Access permission, concatenated", "Execute, "); - } - others = others.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : others.mid(0, others.length() - 2); + ItemGroupInfo newGroupInfo = permissionRoleGroup(m_itemData.at(i)); - const QString newGroupValue = i18nc("@title:group Files and folders by permissions", "User: %1 | Group: %2 | Others: %3", user, group, others); - if (newGroupValue != groupValue) { - groupValue = newGroupValue; - groups.append(QPair(i, newGroupValue)); + if (newGroupInfo != groupInfo) { + groupInfo = newGroupInfo; + groups.append(QPair(i, newGroupInfo.text)); } } - return groups; } @@ -2917,19 +2949,21 @@ QList> KFileItemModel::ratingRoleGroups() const const int maxIndex = count() - 1; QList> groups; - int groupValue = -1; + ItemGroupInfo groupInfo; for (int i = 0; i <= maxIndex; ++i) { if (isChildItem(i)) { continue; } - const int newGroupValue = m_itemData.at(i)->values.value("rating", 0).toInt(); - if (newGroupValue != groupValue) { - groupValue = newGroupValue; - groups.append(QPair(i, newGroupValue)); + ItemGroupInfo newGroupInfo = ratingRoleGroup(m_itemData.at(i)); + + if (newGroupInfo != groupInfo) { + groupInfo = newGroupInfo; + // Using the numeric representation because Dolphin has a special + // case for drawing stars. + groups.append(QPair(i, newGroupInfo.comparable)); } } - return groups; } @@ -2940,21 +2974,19 @@ QList> KFileItemModel::genericStringRoleGroups(const QByteA const int maxIndex = count() - 1; QList> groups; - bool isFirstGroupValue = true; - QString groupValue; + ItemGroupInfo groupInfo; for (int i = 0; i <= maxIndex; ++i) { if (isChildItem(i)) { continue; } - const QString newGroupValue = getGenericStringRoleGroup(role, m_itemData.at(i)); - if (newGroupValue != groupValue || isFirstGroupValue) { - groupValue = newGroupValue; - groups.append(QPair(i, newGroupValue)); - isFirstGroupValue = false; + ItemGroupInfo newGroupInfo = genericStringRoleGroup(role, m_itemData.at(i)); + + if (newGroupInfo != groupInfo) { + groupInfo = newGroupInfo; + groups.append(QPair(i, newGroupInfo.text)); } } - return groups; }