timer.start();
// Determine the sort role synchronously for as many items as possible.
- if (m_resolvableRoles.contains(m_model->sortRole())) {
+ if (m_resolvableRoles.contains(m_model->sortRole()) || m_resolvableRoles.contains(m_model->groupRole())) {
+ QList<QUrl> dirsWithAddedItems;
int insertedCount = 0;
for (const KItemRange &range : itemRanges) {
const int lastIndex = insertedCount + range.index + range.count - 1;
for (int i = insertedCount + range.index; i <= lastIndex; ++i) {
+ const auto fileItem = m_model->fileItem(i);
+ const auto fileItemParentFolderUrl = fileItem.url().adjusted(QUrl::RemoveFilename);
+ if (!dirsWithAddedItems.contains(fileItemParentFolderUrl)) {
+ dirsWithAddedItems.append(fileItemParentFolderUrl);
+ }
if (timer.elapsed() < MaxBlockTimeout) {
applySortRole(i);
} else {
- m_pendingSortRoleItems.insert(m_model->fileItem(i));
+ m_pendingSortRoleItems.insert(fileItem);
}
}
insertedCount += range.count;
}
+ recountDirectoryItems(dirsWithAddedItems);
+
applySortProgressToModel();
// If there are still items whose sort role is unknown, check if the
m_directoryContentsCounter->stopWorker();
}
} else {
+ QList<QUrl> dirsWithDeletedItems;
// Only remove the items from m_finishedItems. They will be removed
// from the other sets later on.
QSet<KFileItem>::iterator it = m_finishedItems.begin();
while (it != m_finishedItems.end()) {
if (m_model->index(*it) < 0) {
+ // Get the folder path of the file.
+ const auto folderUrl = it->url().adjusted(QUrl::RemoveFilename);
+ if (!dirsWithDeletedItems.contains(folderUrl)) {
+ dirsWithDeletedItems.append(folderUrl);
+ }
it = m_finishedItems.erase(it);
} else {
++it;
}
}
+ recountDirectoryItems(dirsWithDeletedItems);
+
// Removed items won't have hover previews loaded anymore.
for (const KItemRange &itemRange : itemRanges) {
int index = itemRange.index;
}
QHash<QByteArray, QVariant> data = rolesData(item, index);
- data.insert("iconPixmap", transformPreviewPixmap(pixmap, data["iconOverlays"].toStringList()));
+ data.insert("iconPixmap", transformPreviewPixmap(pixmap));
+ data.insert("supportsSequencing", m_previewJob->handlesSequences());
disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);
m_model->setData(index, data);
if (wap < 0.0f || loadedIndex < static_cast<int>(wap)) {
// Add the preview to the model data
- const QPixmap scaledPixmap = transformPreviewPixmap(pixmap, data["iconOverlays"].toStringList());
+ const QPixmap scaledPixmap = transformPreviewPixmap(pixmap);
pixmaps.append(scaledPixmap);
data["hoverSequencePixmaps"] = QVariant::fromValue(pixmaps);
m_previewJob = job;
}
-QPixmap KFileItemModelRolesUpdater::transformPreviewPixmap(const QPixmap &pixmap, const QStringList &overlays)
+QPixmap KFileItemModelRolesUpdater::transformPreviewPixmap(const QPixmap &pixmap)
{
QPixmap scaledPixmap = pixmap;
scaledPixmap.setDevicePixelRatio(m_devicePixelRatio);
}
- if (!overlays.isEmpty()) {
- scaledPixmap = KIconUtils::addOverlays(scaledPixmap, overlays).pixmap(cacheSize(), m_devicePixelRatio);
- }
-
return scaledPixmap;
}
QHash<QByteArray, QVariant> data;
const KFileItem item = m_model->fileItem(index);
- if (m_model->sortRole() == "type") {
+ if (m_model->sortRole() == "type" || m_model->groupRole() == "type") {
if (!item.isMimeTypeKnown()) {
item.determineMimeType();
}
data.insert("type", item.mimeComment());
- } else if (m_model->sortRole() == "size" && item.isLocalFile() && item.isDir()) {
+ } else if ((m_model->sortRole() == "size" || m_model->groupRole() == "size") && item.isLocalFile() && item.isDir()) {
startDirectorySizeCounting(item, index);
return;
} else {
void KFileItemModelRolesUpdater::startDirectorySizeCounting(const KFileItem &item, int index)
{
- if (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::None || !item.isLocalFile()) {
+ if (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::None) {
return;
}
+ // Set any remote files to unknown size (-1).
+ if (!item.isLocalFile()) {
+ resetSizeData(index, -1);
+ return;
+ } else {
+ resetSizeData(index);
+ }
+
if (ContentDisplaySettings::directorySizeMode() == ContentDisplaySettings::EnumDirectorySizeMode::ContentCount || item.isSlow()) {
// fastpath no recursion necessary
-
auto data = m_model->data(index);
if (data.value("size") == -2) {
// means job already started
connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);
auto listJob = KIO::listDir(url, KIO::HideProgressInfo);
- QObject::connect(listJob, &KIO::ListJob::entries, this, [this, item](const KJob * /*job*/, const KIO::UDSEntryList &list) {
+
+ QObject::connect(listJob, &KIO::ListJob::entries, this, [this, item](const KJob *job, const KIO::UDSEntryList &list) {
int index = m_model->index(item);
if (index < 0) {
return;
}
auto data = m_model->data(index);
int origCount = data.value("count").toInt();
- int entryCount = origCount;
+ // Get the amount of processed items...
+ int entryCount = job->processedAmount(KJob::Bytes);
+ // ...and then remove the unwanted items from the amount.
for (const KIO::UDSEntry &entry : list) {
const auto name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
if (name == QStringLiteral("..") || name == QStringLiteral(".")) {
+ --entryCount;
continue;
}
if (!m_model->showHiddenFiles() && name.startsWith(QLatin1Char('.'))) {
+ --entryCount;
continue;
}
if (m_model->showDirectoriesOnly() && !entry.isDir()) {
+ --entryCount;
continue;
}
- ++entryCount;
}
QHash<QByteArray, QVariant> newData;
}
if (origCount != entryCount) {
- // count has changed
newData.insert("count", entryCount);
}
}
}
+void KFileItemModelRolesUpdater::resetSizeData(const int index, const int size)
+{
+ disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);
+ auto data = m_model->data(index);
+ data.insert("size", size);
+ m_model->setData(index, data);
+ connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);
+}
+
+void KFileItemModelRolesUpdater::recountDirectoryItems(const QList<QUrl> directories)
+{
+ for (const auto &dir : directories) {
+ auto index = m_model->index(dir);
+ if (index < 0) {
+ continue;
+ }
+ auto item = m_model->fileItem(index);
+ if (item.isDir()) {
+ startDirectorySizeCounting(item, index);
+ }
+ }
+}
+
#include "moc_kfileitemmodelrolesupdater.cpp"
projects / dolphin.git / blobdiff