return m_filter.mimeTypes();
}
-
void KFileItemModel::applyFilters()
{
- // Check which shown items from m_itemData must get
- // hidden and hence moved to m_filteredItems.
- QVector<int> newFilteredIndexes;
+ // ===STEP 1===
+ // Check which previously shown items from m_itemData must now get
+ // hidden and hence moved from m_itemData into m_filteredItems.
- const int itemCount = m_itemData.count();
- for (int index = 0; index < itemCount; ++index) {
- ItemData* itemData = m_itemData.at(index);
-
- // Only filter non-expanded items as child items may never
- // exist without a parent item
- if (!itemData->values.value("isExpanded").toBool()) {
- const KFileItem item = itemData->item;
- if (!m_filter.matches(item)) {
- newFilteredIndexes.append(index);
- m_filteredItems.insert(item, itemData);
- }
+ QList<int> newFilteredIndexes; // This structure is good for prepending. We will want an ascending sorted Container at the end, this will do fine.
+
+ // This pointer will refer to the next confirmed shown item from the point of
+ // view of the current "itemData" in the upcoming "for" loop.
+ ItemData *itemShownBelow = nullptr;
+
+ // We will iterate backwards because it's convenient to know beforehand if the item just below is its child or not.
+ for (int index = m_itemData.count() - 1; index >= 0; --index) {
+ ItemData *itemData = m_itemData.at(index);
+
+ if (m_filter.matches(itemData->item)
+ || (itemShownBelow && itemShownBelow->parent == itemData && itemData->values.value("isExpanded").toBool())) {
+ // We could've entered here for two reasons:
+ // 1. This item passes the filter itself
+ // 2. This is an expanded folder that doesn't pass the filter but sees a filter-passing child just below
+
+ // So this item must remain shown.
+ // Lets register this item as the next shown item from the point of view of the next iteration of this for loop
+ itemShownBelow = itemData;
+ } else {
+ // We hide this item for now, however, for expanded folders this is not final:
+ // if after the next "for" loop we discover that its children must now be shown with the newly applied fliter, we shall re-insert it
+ newFilteredIndexes.prepend(index);
+ m_filteredItems.insert(itemData->item, itemData);
+ // indexShownBelow doesn't get updated since this item will be hidden
}
}
- const KItemRangeList removedRanges = KItemRangeList::fromSortedContainer(newFilteredIndexes);
- removeItems(removedRanges, KeepItemData);
+ // This will remove the newly filtered items from m_itemData
+ removeItems(KItemRangeList::fromSortedContainer(newFilteredIndexes), KeepItemData);
+ // ===STEP 2===
// Check which hidden items from m_filteredItems should
- // get visible again and hence removed from m_filteredItems.
- QList<ItemData*> newVisibleItems;
+ // become visible again and hence moved from m_filteredItems back into m_itemData.
- QHash<KFileItem, ItemData*>::iterator it = m_filteredItems.begin();
+ QList<ItemData *> newVisibleItems;
+
+ QHash<KFileItem, ItemData *> ancestorsOfNewVisibleItems; // We will make sure these also become visible in step 3.
+
+ QHash<KFileItem, ItemData *>::iterator it = m_filteredItems.begin();
while (it != m_filteredItems.end()) {
if (m_filter.matches(it.key())) {
newVisibleItems.append(it.value());
+
+ // If this is a child of an expanded folder, we must make sure that its whole parental chain will also be shown.
+ // We will go up through its parental chain until we either:
+ // 1 - reach the "root item" of the current view, i.e the currently opened folder on Dolphin. Their children have their ItemData::parent set to nullptr.
+ // or
+ // 2 - we reach an unfiltered parent or a previously discovered ancestor.
+ for (ItemData *parent = it.value()->parent; parent && !ancestorsOfNewVisibleItems.contains(parent->item) && m_filteredItems.contains(parent->item);
+ parent = parent->parent) {
+ // We wish we could remove this parent from m_filteredItems right now, but we are iterating over it
+ // and it would mess up the iteration. We will mark it to be removed in step 3.
+ ancestorsOfNewVisibleItems.insert(parent->item, parent);
+ }
+
it = m_filteredItems.erase(it);
} else {
+ // Item remains filtered for now
+ // However, for expanded folders this is not final, we may discover later that it has unfiltered descendants.
++it;
}
}
+ // ===STEP 3===
+ // Handles the ancestorsOfNewVisibleItems.
+ // Now that we are done iterating through m_filteredItems we can safely move the ancestorsOfNewVisibleItems from m_filteredItems to newVisibleItems.
+ for (it = ancestorsOfNewVisibleItems.begin(); it != ancestorsOfNewVisibleItems.end(); it++) {
+ if (m_filteredItems.remove(it.key())) {
+ // m_filteredItems still contained this ancestor until now so we can be sure that we aren't adding a duplicate ancestor to newVisibleItems.
+ newVisibleItems.append(it.value());
+ }
+ }
+
+ // This will insert the newly discovered unfiltered items into m_itemData
insertItems(newVisibleItems);
}
QSet<QByteArray> changedRoles;
KFileItemList changedFiles;
+ // Contains the indexes of the currently visible items
+ // that should get hidden and hence moved to m_filteredItems.
+ QVector<int> newFilteredIndexes;
+
+ // Contains currently hidden items that should
+ // get visible and hence removed from m_filteredItems
+ QList<ItemData*> newVisibleItems;
+
QListIterator<QPair<KFileItem, KFileItem> > it(items);
while (it.hasNext()) {
const QPair<KFileItem, KFileItem>& itemPair = it.next();
const KFileItem& oldItem = itemPair.first;
const KFileItem& newItem = itemPair.second;
const int indexForItem = index(oldItem);
+ const bool newItemMatchesFilter = m_filter.matches(newItem);
if (indexForItem >= 0) {
m_itemData[indexForItem]->item = newItem;
// Keep old values as long as possible if they could not retrieved synchronously yet.
// The update of the values will be done asynchronously by KFileItemModelRolesUpdater.
- QHashIterator<QByteArray, QVariant> it(retrieveData(newItem, m_itemData.at(indexForItem)->parent));
- QHash<QByteArray, QVariant>& values = m_itemData[indexForItem]->values;
+ ItemData * const itemData = m_itemData.at(indexForItem);
+ QHashIterator<QByteArray, QVariant> it(retrieveData(newItem, itemData->parent));
while (it.hasNext()) {
it.next();
const QByteArray& role = it.key();
- if (values.value(role) != it.value()) {
- values.insert(role, it.value());
+ if (itemData->values.value(role) != it.value()) {
+ itemData->values.insert(role, it.value());
changedRoles.insert(role);
}
}
m_items.remove(oldItem.url());
- m_items.insert(newItem.url(), indexForItem);
- changedFiles.append(newItem);
- indexes.append(indexForItem);
+ if (newItemMatchesFilter) {
+ m_items.insert(newItem.url(), indexForItem);
+ changedFiles.append(newItem);
+ indexes.append(indexForItem);
+ } else {
+ newFilteredIndexes.append(indexForItem);
+ m_filteredItems.insert(newItem, itemData);
+ }
} else {
// Check if 'oldItem' is one of the filtered items.
QHash<KFileItem, ItemData*>::iterator it = m_filteredItems.find(oldItem);
itemData->values.clear();
m_filteredItems.erase(it);
- m_filteredItems.insert(newItem, itemData);
+ if (newItemMatchesFilter) {
+ newVisibleItems.append(itemData);
+ } else {
+ m_filteredItems.insert(newItem, itemData);
+ }
}
}
}
+ // Hide items, previously visible that should get hidden
+ const KItemRangeList removedRanges = KItemRangeList::fromSortedContainer(newFilteredIndexes);
+ removeItems(removedRanges, KeepItemData);
+
+ // Show previously hidden items that should get visible
+ insertItems(newVisibleItems);
+
// If the changed items have been created recently, they might not be in m_items yet.
// In that case, the list 'indexes' might be empty.
if (indexes.isEmpty()) {
int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b, const QCollator& collator) const
{
+ // This function must never return 0, because that would break stable
+ // sorting, which leads to all kinds of bugs.
+ // See: https://bugs.kde.org/show_bug.cgi?id=433247
+ // If two items have equal sort values, let the fallbacks at the bottom of
+ // the function handle it.
const KFileItem& itemA = a->item;
const KFileItem& itemB = b->item;
auto valueA = a->values.value("count");
auto valueB = b->values.value("count");
if (valueA.isNull()) {
- if (valueB.isNull()) {
- result = 0;
- break;
- } else {
- result = -1;
- break;
+ if (!valueB.isNull()) {
+ return -1;
}
} else if (valueB.isNull()) {
- result = +1;
- break;
+ return +1;
} else {
if (valueA.toLongLong() < valueB.toLongLong()) {
- result = -1;
- break;
+ return -1;
} else if (valueA.toLongLong() > valueB.toLongLong()) {
- result = +1;
- break;
- } else {
- result = 0;
- break;
+ return +1;
}
}
+ break;
}
+
KIO::filesize_t sizeA = 0;
if (itemA.isDir()) {
sizeA = a->values.value("size").toULongLong();
} else {
sizeB = itemB.size();
}
- if (sizeA > sizeB) {
- result = +1;
- } else if (sizeA < sizeB) {
- result = -1;
- } else {
- result = 0;
+ if (sizeA < sizeB) {
+ return -1;
+ } else if (sizeA > sizeB) {
+ return +1;
}
break;
}
const long long dateTimeA = itemA.entry().numberValue(KIO::UDSEntry::UDS_MODIFICATION_TIME, -1);
const long long dateTimeB = itemB.entry().numberValue(KIO::UDSEntry::UDS_MODIFICATION_TIME, -1);
if (dateTimeA < dateTimeB) {
- result = -1;
+ return -1;
} else if (dateTimeA > dateTimeB) {
- result = +1;
+ return +1;
}
break;
}
const long long dateTimeA = itemA.entry().numberValue(KIO::UDSEntry::UDS_CREATION_TIME, -1);
const long long dateTimeB = itemB.entry().numberValue(KIO::UDSEntry::UDS_CREATION_TIME, -1);
if (dateTimeA < dateTimeB) {
- result = -1;
+ return -1;
} else if (dateTimeA > dateTimeB) {
- result = +1;
+ return +1;
}
break;
}
const QDateTime dateTimeA = a->values.value("deletiontime").toDateTime();
const QDateTime dateTimeB = b->values.value("deletiontime").toDateTime();
if (dateTimeA < dateTimeB) {
- result = -1;
+ return -1;
} else if (dateTimeA > dateTimeB) {
- result = +1;
+ return +1;
}
break;
}
const QString roleValueA = a->values.value(role).toString();
const QString roleValueB = b->values.value(role).toString();
if (!roleValueA.isEmpty() && roleValueB.isEmpty()) {
- result = -1;
+ return -1;
} else if (roleValueA.isEmpty() && !roleValueB.isEmpty()) {
- result = +1;
+ return +1;
} else if (isRoleValueNatural(m_sortRole)) {
result = stringCompare(roleValueA, roleValueB, collator);
} else {
projects / dolphin.git / blobdiff