Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 10:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kioslave: directory thumbnailer optimization

Browse source 
by collecting sub-directories to possibly propagate later listing of the
directory has to be done only once reducing the overall I/O required for
generating directory thumbnails in case no thumbnail can be created from
the files in the directory

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-09 19:06:58 +03:00
parent 7904557696
commit 1ef80f8af0
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
kioslave/thumbnail/thumbnail.cpp
View file

@ -79,6 +79,8 @@ static const QString thumbExt = QLatin1String(".") + thumbFormat;
// Minimum thumbnail icon ratio
static const qreal s_iconratio = 4.0;
static const int s_maxdirectoryfiles = 500;
static const int s_maxsubdirectories = 50;
int main(int argc, char **argv)
{
@ -407,26 +409,35 @@ QImage ThumbnailProtocol::thumbForDirectory(const KUrl& directory)
int validThumbnails = 0;
QList<QPair<QString,QString>> subDirectoriesToPropagate;
while ((skipped <= skipValidItems) && (yPos <= maxYPos) && validThumbnails == 0) {
QDirIterator dir(localFile, QDir::Files | QDir::Readable);
QDirIterator dir(localFile, QDir::Dirs | QDir::Files | QDir::Readable);
if (!dir.hasNext()) {
break;
}
while (dir.hasNext() && (yPos <= maxYPos)) {
++iterations;
if (iterations > 500) {
if (iterations > s_maxdirectoryfiles) {
skipValidItems = skipped = 0;
break;
}
dir.next();
if (validThumbnails > 0 && hadFirstThumbnail == dir.filePath()) {
break; // Never show the same thumbnail twice
const QFileInfo dirInfo = dir.fileInfo();
if (dirInfo.isDir()) {
// To be propagated later if necessary
subDirectoriesToPropagate.append(qMakePair(dir.filePath(), dir.fileName()));
continue;
}
if (dir.fileInfo().size() > m_maxFileSize) {
if (validThumbnails > 0 && hadFirstThumbnail == dir.filePath()) {
// Never show the same thumbnail twice
break;
}
if (dirInfo.size() > m_maxFileSize) {
// don't create thumbnails for files that exceed
// the maximum set file size
continue;
@ -480,13 +491,10 @@ QImage ThumbnailProtocol::thumbForDirectory(const KUrl& directory)
if (validThumbnails == 0) {
// Eventually propagate the contained items from a sub-directory
QDirIterator dir(localFile, QDir::Dirs);
int max = 50;
while (dir.hasNext() && max > 0) {
--max;
dir.next();
if (m_propagationDirectories.contains(dir.fileName())) {
return thumbForDirectory(KUrl(dir.filePath()));
for (int i = 0; i < s_maxsubdirectories && i < subDirectoriesToPropagate.size(); i++) {
const QPair<QString,QString> subDirectoryPair = subDirectoriesToPropagate.at(i);
if (m_propagationDirectories.contains(subDirectoryPair.second)) {
return thumbForDirectory(KUrl(subDirectoryPair.first));
}
}